2 5d56da81 2019-01-13 stsp * Copyright (c) 2018, 2019 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 9f7d7167 2018-04-29 stsp #include <stdlib.h>
28 26ed57b2 2018-05-19 stsp #include <stdio.h>
29 9f7d7167 2018-04-29 stsp #include <getopt.h>
30 9f7d7167 2018-04-29 stsp #include <string.h>
31 9f7d7167 2018-04-29 stsp #include <err.h>
32 80ddbec8 2018-04-29 stsp #include <unistd.h>
33 26ed57b2 2018-05-19 stsp #include <util.h>
34 26ed57b2 2018-05-19 stsp #include <limits.h>
35 61e69b96 2018-05-20 stsp #include <wchar.h>
36 788c352e 2018-06-16 stsp #include <time.h>
37 84451b3e 2018-07-10 stsp #include <pthread.h>
38 5036bf37 2018-09-24 stsp #include <libgen.h>
40 9f7d7167 2018-04-29 stsp #include "got_error.h"
41 80ddbec8 2018-04-29 stsp #include "got_object.h"
42 80ddbec8 2018-04-29 stsp #include "got_reference.h"
43 80ddbec8 2018-04-29 stsp #include "got_repository.h"
44 80ddbec8 2018-04-29 stsp #include "got_diff.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
47 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
48 a70480e0 2018-06-23 stsp #include "got_blame.h"
49 c2db6724 2019-01-04 stsp #include "got_privsep.h"
50 1dd54920 2019-05-11 stsp #include "got_path.h"
51 b7165be3 2019-02-05 stsp #include "got_worktree.h"
54 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
58 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
61 a4292ac5 2019-05-12 jcs #define CTRL(x) ((x) & 0x1f)
63 9f7d7167 2018-04-29 stsp #ifndef nitems
64 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
67 9f7d7167 2018-04-29 stsp struct tog_cmd {
68 c2301be8 2018-04-30 stsp const char *name;
69 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
70 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
71 c2301be8 2018-04-30 stsp const char *descr;
74 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
75 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
76 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
77 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
78 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
80 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
81 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
82 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
83 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
85 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
86 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
87 9f7d7167 2018-04-29 stsp "show repository history" },
88 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
89 9f7d7167 2018-04-29 stsp "compare files and directories" },
90 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
91 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
92 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
93 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
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 15a087fe 2019-02-21 stsp struct tog_diff_view_state {
118 15a087fe 2019-02-21 stsp struct got_object_id *id1, *id2;
120 15a087fe 2019-02-21 stsp int first_displayed_line;
121 15a087fe 2019-02-21 stsp int last_displayed_line;
123 15a087fe 2019-02-21 stsp int diff_context;
124 15a087fe 2019-02-21 stsp struct got_repository *repo;
125 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
127 15a087fe 2019-02-21 stsp /* passed from log view; may be NULL */
128 fb872ab2 2019-02-21 stsp struct tog_view *log_view;
131 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
133 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
134 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
135 1a76625f 2018-10-22 stsp int commits_needed;
136 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
137 1a76625f 2018-10-22 stsp struct commit_queue *commits;
138 1a76625f 2018-10-22 stsp const char *in_repo_path;
139 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
140 1a76625f 2018-10-22 stsp struct got_repository *repo;
141 1a76625f 2018-10-22 stsp int log_complete;
142 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
143 1a76625f 2018-10-22 stsp struct tog_view *view;
144 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
145 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
148 1a76625f 2018-10-22 stsp struct tog_log_view_state {
149 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
150 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
151 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
152 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
153 b01e7d3b 2018-08-04 stsp int selected;
154 b01e7d3b 2018-08-04 stsp char *in_repo_path;
155 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
156 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
157 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
158 1a76625f 2018-10-22 stsp sig_atomic_t quit;
159 1a76625f 2018-10-22 stsp pthread_t thread;
160 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
163 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
164 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
165 e9424729 2018-08-04 stsp int nlines;
167 e9424729 2018-08-04 stsp struct tog_view *view;
168 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
172 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
173 e9424729 2018-08-04 stsp const char *path;
174 e9424729 2018-08-04 stsp struct got_repository *repo;
175 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
176 e9424729 2018-08-04 stsp int *complete;
179 e9424729 2018-08-04 stsp struct tog_blame {
181 e9424729 2018-08-04 stsp size_t filesize;
182 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
183 6fcac457 2018-11-19 stsp int nlines;
184 e9424729 2018-08-04 stsp pthread_t thread;
185 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
186 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
187 e9424729 2018-08-04 stsp const char *path;
190 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
191 7cbe629d 2018-08-04 stsp int first_displayed_line;
192 7cbe629d 2018-08-04 stsp int last_displayed_line;
193 7cbe629d 2018-08-04 stsp int selected_line;
194 7cbe629d 2018-08-04 stsp int blame_complete;
197 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
198 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
199 e5a0f69f 2018-08-18 stsp char *path;
200 7cbe629d 2018-08-04 stsp struct got_repository *repo;
201 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
202 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
203 e9424729 2018-08-04 stsp struct tog_blame blame;
206 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
207 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
208 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
209 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
210 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
211 ad80ab7b 2018-08-04 stsp int selected;
214 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
216 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
217 ad80ab7b 2018-08-04 stsp char *tree_label;
218 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
219 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
220 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
221 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
222 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
223 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
224 416a95c5 2019-01-24 stsp int ndisplayed, selected, show_ids;
225 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
226 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
227 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
228 8b473291 2019-02-21 stsp struct got_reflist_head *refs;
232 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
234 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
235 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
236 669b5ffa 2018-10-07 stsp * there is enough screen estate.
238 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
239 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
241 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
242 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
243 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
245 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
246 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
248 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
250 cc3c9aac 2018-08-01 stsp struct tog_view {
251 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
252 26ed57b2 2018-05-19 stsp WINDOW *window;
253 26ed57b2 2018-05-19 stsp PANEL *panel;
254 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
255 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
256 1004088d 2018-09-29 stsp int focussed;
257 669b5ffa 2018-10-07 stsp struct tog_view *parent;
258 669b5ffa 2018-10-07 stsp struct tog_view *child;
259 669b5ffa 2018-10-07 stsp int child_focussed;
261 5dc9f4bc 2018-08-04 stsp /* type-specific state */
262 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
264 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
265 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
266 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
267 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
270 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
271 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
272 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
273 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
276 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
277 fb872ab2 2019-02-21 stsp struct got_object_id *, struct got_object_id *, struct tog_view *,
278 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
279 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
280 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
281 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
282 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
284 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
285 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *,
286 8b473291 2019-02-21 stsp struct got_repository *, const char *, int);
287 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
288 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
289 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
290 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
292 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
293 8b473291 2019-02-21 stsp struct got_object_id *, struct got_reflist_head *, struct got_repository *);
294 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
295 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
296 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
297 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
299 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
300 8b473291 2019-02-21 stsp struct got_tree_object *, struct got_object_id *,
301 8b473291 2019-02-21 stsp struct got_reflist_head *, struct got_repository *);
302 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
303 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
304 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
305 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
307 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
309 25791caa 2018-10-24 stsp static void
310 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
312 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
315 e5a0f69f 2018-08-18 stsp static const struct got_error *
316 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
318 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
320 669b5ffa 2018-10-07 stsp if (view->child) {
321 669b5ffa 2018-10-07 stsp view_close(view->child);
322 669b5ffa 2018-10-07 stsp view->child = NULL;
324 e5a0f69f 2018-08-18 stsp if (view->close)
325 e5a0f69f 2018-08-18 stsp err = view->close(view);
326 ea5e7bb5 2018-08-01 stsp if (view->panel)
327 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
328 ea5e7bb5 2018-08-01 stsp if (view->window)
329 ea5e7bb5 2018-08-01 stsp delwin(view->window);
330 ea5e7bb5 2018-08-01 stsp free(view);
331 e5a0f69f 2018-08-18 stsp return err;
334 ea5e7bb5 2018-08-01 stsp static struct tog_view *
335 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
336 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
338 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
340 ea5e7bb5 2018-08-01 stsp if (view == NULL)
341 ea5e7bb5 2018-08-01 stsp return NULL;
343 d6b05b5b 2018-08-04 stsp view->type = type;
344 f7d12f7e 2018-08-01 stsp view->lines = LINES;
345 f7d12f7e 2018-08-01 stsp view->cols = COLS;
346 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
347 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
348 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
349 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
350 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
351 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
352 96a765a8 2018-08-04 stsp view_close(view);
353 ea5e7bb5 2018-08-01 stsp return NULL;
355 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
356 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
357 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
358 96a765a8 2018-08-04 stsp view_close(view);
359 ea5e7bb5 2018-08-01 stsp return NULL;
362 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
363 ea5e7bb5 2018-08-01 stsp return view;
367 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
369 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
371 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
374 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
376 5c60c32a 2018-10-18 stsp static const struct got_error *
377 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
379 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
381 5c60c32a 2018-10-18 stsp view->begin_y = 0;
382 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
383 5c60c32a 2018-10-18 stsp view->nlines = LINES;
384 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
385 5c60c32a 2018-10-18 stsp view->lines = LINES;
386 5c60c32a 2018-10-18 stsp view->cols = COLS;
387 5c60c32a 2018-10-18 stsp err = view_resize(view);
389 5c60c32a 2018-10-18 stsp return err;
391 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
392 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
394 5c60c32a 2018-10-18 stsp return NULL;
397 5c60c32a 2018-10-18 stsp static const struct got_error *
398 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
400 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
402 5c60c32a 2018-10-18 stsp view->begin_x = 0;
403 5c60c32a 2018-10-18 stsp view->begin_y = 0;
404 5c60c32a 2018-10-18 stsp view->nlines = LINES;
405 5c60c32a 2018-10-18 stsp view->ncols = COLS;
406 5c60c32a 2018-10-18 stsp view->lines = LINES;
407 5c60c32a 2018-10-18 stsp view->cols = COLS;
408 5c60c32a 2018-10-18 stsp err = view_resize(view);
410 5c60c32a 2018-10-18 stsp return err;
412 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
413 638f9024 2019-05-13 stsp return got_error_from_errno("mvwin");
415 5c60c32a 2018-10-18 stsp return NULL;
419 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
421 5c60c32a 2018-10-18 stsp return view->parent == NULL;
424 4d8c2215 2018-08-19 stsp static const struct got_error *
425 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
427 f7d12f7e 2018-08-01 stsp int nlines, ncols;
429 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
430 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
432 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
434 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
435 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
437 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
439 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
440 638f9024 2019-05-13 stsp return got_error_from_errno("wresize");
441 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
442 638f9024 2019-05-13 stsp return got_error_from_errno("replace_panel");
443 25791caa 2018-10-24 stsp wclear(view->window);
445 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
446 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
447 0cf4efb1 2018-09-29 stsp view->lines = LINES;
448 0cf4efb1 2018-09-29 stsp view->cols = COLS;
450 6e3e5d9c 2018-10-18 stsp if (view->child) {
451 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
452 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
453 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
454 5c60c32a 2018-10-18 stsp if (view->child->focussed)
455 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
457 5c60c32a 2018-10-18 stsp show_panel(view->panel);
459 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
460 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
464 5c60c32a 2018-10-18 stsp return NULL;
467 669b5ffa 2018-10-07 stsp static const struct got_error *
468 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
470 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
472 669b5ffa 2018-10-07 stsp if (view->child == NULL)
473 669b5ffa 2018-10-07 stsp return NULL;
475 669b5ffa 2018-10-07 stsp err = view_close(view->child);
476 669b5ffa 2018-10-07 stsp view->child = NULL;
477 669b5ffa 2018-10-07 stsp return err;
480 669b5ffa 2018-10-07 stsp static const struct got_error *
481 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
483 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
485 669b5ffa 2018-10-07 stsp view->child = child;
486 669b5ffa 2018-10-07 stsp child->parent = view;
487 669b5ffa 2018-10-07 stsp return err;
491 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
493 f5215bb9 2019-02-22 stsp return view->begin_x > 0;
496 34bc9ec9 2019-02-22 stsp static void
497 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
499 25791caa 2018-10-24 stsp int cols, lines;
500 25791caa 2018-10-24 stsp struct winsize size;
502 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
503 25791caa 2018-10-24 stsp cols = 80; /* Default */
504 25791caa 2018-10-24 stsp lines = 24;
506 25791caa 2018-10-24 stsp cols = size.ws_col;
507 25791caa 2018-10-24 stsp lines = size.ws_row;
509 25791caa 2018-10-24 stsp resize_term(lines, cols);
512 0cf4efb1 2018-09-29 stsp static const struct got_error *
513 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
514 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
515 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
517 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
518 669b5ffa 2018-10-07 stsp struct tog_view *v;
519 1a76625f 2018-10-22 stsp int ch, errcode;
521 e5a0f69f 2018-08-18 stsp *new = NULL;
522 e5a0f69f 2018-08-18 stsp *dead = NULL;
523 0cf4efb1 2018-09-29 stsp *focus = NULL;
525 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
526 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
527 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
528 1a76625f 2018-10-22 stsp if (errcode)
529 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
530 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
531 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
532 1a76625f 2018-10-22 stsp if (errcode)
533 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
534 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
536 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
537 25791caa 2018-10-24 stsp tog_resizeterm();
538 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
539 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
540 25791caa 2018-10-24 stsp err = view_resize(v);
542 25791caa 2018-10-24 stsp return err;
543 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
545 25791caa 2018-10-24 stsp return err;
549 e5a0f69f 2018-08-18 stsp switch (ch) {
553 1e37a5c2 2019-05-12 jcs if (view->child) {
554 1e37a5c2 2019-05-12 jcs *focus = view->child;
555 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
556 1e37a5c2 2019-05-12 jcs } else if (view->parent) {
557 1e37a5c2 2019-05-12 jcs *focus = view->parent;
558 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 0;
562 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
563 1e37a5c2 2019-05-12 jcs *dead = view;
569 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
570 1e37a5c2 2019-05-12 jcs if (view->child == NULL)
572 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view->child)) {
573 669b5ffa 2018-10-07 stsp *focus = view->child;
574 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
575 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view->child);
577 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view->child);
580 1e37a5c2 2019-05-12 jcs err = view->child->input(new, dead, focus,
581 1e37a5c2 2019-05-12 jcs view->child, KEY_RESIZE);
583 1e37a5c2 2019-05-12 jcs if (view_is_splitscreen(view)) {
584 1e37a5c2 2019-05-12 jcs *focus = view;
585 1e37a5c2 2019-05-12 jcs view->parent->child_focussed = 1;
586 1e37a5c2 2019-05-12 jcs err = view_fullscreen(view);
588 1e37a5c2 2019-05-12 jcs err = view_splitscreen(view);
592 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view,
593 1e37a5c2 2019-05-12 jcs KEY_RESIZE);
596 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
599 1e37a5c2 2019-05-12 jcs err = view->input(new, dead, focus, view, ch);
603 e5a0f69f 2018-08-18 stsp return err;
607 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
609 0cf4efb1 2018-09-29 stsp PANEL *panel;
610 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
612 669b5ffa 2018-10-07 stsp if (view->parent)
613 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
615 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
616 0cf4efb1 2018-09-29 stsp if (panel == NULL)
619 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
620 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
621 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
625 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
627 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
628 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
630 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
632 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
635 669b5ffa 2018-10-07 stsp return view->focussed;
638 bcbd79e2 2018-08-19 stsp static const struct got_error *
639 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
641 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
642 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
643 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
644 fd823528 2018-10-22 stsp int fast_refresh = 10;
645 1a76625f 2018-10-22 stsp int done = 0, errcode;
647 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
648 1a76625f 2018-10-22 stsp if (errcode)
649 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
651 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
652 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
654 a81bf10d 2018-09-29 stsp main_view = view;
655 1004088d 2018-09-29 stsp view->focussed = 1;
656 878940b7 2018-09-29 stsp err = view->show(view);
658 0cf4efb1 2018-09-29 stsp return err;
659 0cf4efb1 2018-09-29 stsp update_panels();
660 0cf4efb1 2018-09-29 stsp doupdate();
661 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
662 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
663 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
664 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
666 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
667 e4197bf9 2018-08-18 stsp view, &views);
670 e5a0f69f 2018-08-18 stsp if (dead_view) {
671 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
673 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
674 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
675 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
676 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
677 669b5ffa 2018-10-07 stsp prev = view->parent;
679 669b5ffa 2018-10-07 stsp if (dead_view->parent)
680 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
682 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
684 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
685 a81bf10d 2018-09-29 stsp if (err || dead_view == main_view)
688 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
689 0cf4efb1 2018-09-29 stsp if (focus_view)
690 0cf4efb1 2018-09-29 stsp view = focus_view;
691 669b5ffa 2018-10-07 stsp else if (prev)
692 669b5ffa 2018-10-07 stsp view = prev;
693 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
694 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
695 0cf4efb1 2018-09-29 stsp tog_view_list_head);
697 0cf4efb1 2018-09-29 stsp view = NULL;
698 669b5ffa 2018-10-07 stsp if (view) {
699 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
700 669b5ffa 2018-10-07 stsp focus_view = view->child;
702 669b5ffa 2018-10-07 stsp focus_view = view;
706 bcbd79e2 2018-08-19 stsp if (new_view) {
707 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
708 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
709 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
710 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
712 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
713 86c66b02 2018-10-18 stsp err = view_close(v);
718 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
719 fed7eaa8 2018-10-24 stsp view = new_view;
720 878940b7 2018-09-29 stsp if (focus_view == NULL)
721 878940b7 2018-09-29 stsp focus_view = new_view;
723 0cf4efb1 2018-09-29 stsp if (focus_view) {
724 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
726 0cf4efb1 2018-09-29 stsp view->focussed = 0;
727 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
728 0cf4efb1 2018-09-29 stsp view = focus_view;
729 878940b7 2018-09-29 stsp if (new_view)
730 878940b7 2018-09-29 stsp show_panel(new_view->panel);
731 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
732 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
734 669b5ffa 2018-10-07 stsp if (view) {
735 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
736 758194b5 2018-10-24 stsp view->focussed = 1;
737 758194b5 2018-10-24 stsp show_panel(view->panel);
738 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
739 758194b5 2018-10-24 stsp show_panel(view->child->panel);
740 1a76625f 2018-10-22 stsp focus_view = view;
742 669b5ffa 2018-10-07 stsp if (view->parent) {
743 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
747 669b5ffa 2018-10-07 stsp err = view->show(view);
750 669b5ffa 2018-10-07 stsp if (view->child) {
751 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
755 1a76625f 2018-10-22 stsp update_panels();
756 1a76625f 2018-10-22 stsp doupdate();
760 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
761 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
762 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
763 e5a0f69f 2018-08-18 stsp view_close(view);
766 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
767 1a76625f 2018-10-22 stsp if (errcode)
768 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_unlock");
770 e5a0f69f 2018-08-18 stsp return err;
773 4ed7e80c 2018-05-20 stsp __dead static void
774 9f7d7167 2018-04-29 stsp usage_log(void)
777 c70c5802 2018-08-01 stsp fprintf(stderr,
778 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
779 9f7d7167 2018-04-29 stsp getprogname());
783 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
784 80ddbec8 2018-04-29 stsp static const struct got_error *
785 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
787 00dfcb92 2018-06-11 stsp char *vis = NULL;
788 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
790 963b370f 2018-05-20 stsp *ws = NULL;
791 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
792 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
793 00dfcb92 2018-06-11 stsp int vislen;
794 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
795 638f9024 2019-05-13 stsp return got_error_from_errno("mbstowcs");
797 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
798 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
800 00dfcb92 2018-06-11 stsp return err;
801 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
802 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
803 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs"); /* give up */
808 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
809 a7f50699 2018-06-11 stsp if (*ws == NULL) {
810 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
814 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
815 638f9024 2019-05-13 stsp err = got_error_from_errno("mbstowcs");
820 963b370f 2018-05-20 stsp *ws = NULL;
823 963b370f 2018-05-20 stsp return err;
826 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
827 963b370f 2018-05-20 stsp static const struct got_error *
828 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
830 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
831 963b370f 2018-05-20 stsp int cols = 0;
832 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
833 963b370f 2018-05-20 stsp size_t wlen;
836 963b370f 2018-05-20 stsp *wlinep = NULL;
837 b700b5d6 2018-07-10 stsp *widthp = 0;
839 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
841 963b370f 2018-05-20 stsp return err;
844 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
845 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
846 963b370f 2018-05-20 stsp switch (width) {
852 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
853 b700b5d6 2018-07-10 stsp cols += width;
857 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
858 67ceb59d 2019-03-03 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
862 638f9024 2019-05-13 stsp err = got_error_from_errno("wcwidth");
866 963b370f 2018-05-20 stsp wline[i] = L'\0';
867 b700b5d6 2018-07-10 stsp if (widthp)
868 b700b5d6 2018-07-10 stsp *widthp = cols;
871 963b370f 2018-05-20 stsp free(wline);
873 963b370f 2018-05-20 stsp *wlinep = wline;
874 963b370f 2018-05-20 stsp return err;
877 8b473291 2019-02-21 stsp static const struct got_error*
878 8b473291 2019-02-21 stsp build_refs_str(char **refs_str, struct got_reflist_head *refs,
879 8b473291 2019-02-21 stsp struct got_object_id *id)
881 8b473291 2019-02-21 stsp static const struct got_error *err = NULL;
882 8b473291 2019-02-21 stsp struct got_reflist_entry *re;
884 8b473291 2019-02-21 stsp const char *name;
886 8b473291 2019-02-21 stsp *refs_str = NULL;
888 8b473291 2019-02-21 stsp SIMPLEQ_FOREACH(re, refs, entry) {
889 8b473291 2019-02-21 stsp if (got_object_id_cmp(re->id, id) != 0)
891 8b473291 2019-02-21 stsp name = got_ref_get_name(re->ref);
892 8b473291 2019-02-21 stsp if (strcmp(name, GOT_REF_HEAD) == 0)
894 8b473291 2019-02-21 stsp if (strncmp(name, "refs/", 5) == 0)
896 7143d404 2019-03-12 stsp if (strncmp(name, "got/", 4) == 0)
898 8b473291 2019-02-21 stsp if (strncmp(name, "heads/", 6) == 0)
900 8b473291 2019-02-21 stsp if (strncmp(name, "remotes/", 8) == 0)
902 8b473291 2019-02-21 stsp s = *refs_str;
903 8b473291 2019-02-21 stsp if (asprintf(refs_str, "%s%s%s", s ? s : "",
904 8b473291 2019-02-21 stsp s ? ", " : "", name) == -1) {
905 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
907 8b473291 2019-02-21 stsp *refs_str = NULL;
913 8b473291 2019-02-21 stsp return err;
916 963b370f 2018-05-20 stsp static const struct got_error *
917 5813d178 2019-03-09 stsp format_author(wchar_t **wauthor, int *author_width, char *author, int limit)
919 5813d178 2019-03-09 stsp char *smallerthan, *at;
921 5813d178 2019-03-09 stsp smallerthan = strchr(author, '<');
922 5813d178 2019-03-09 stsp if (smallerthan && smallerthan[1] != '\0')
923 5813d178 2019-03-09 stsp author = smallerthan + 1;
924 5813d178 2019-03-09 stsp at = strchr(author, '@');
926 5813d178 2019-03-09 stsp *at = '\0';
927 5813d178 2019-03-09 stsp return format_line(wauthor, author_width, author, limit);
930 5813d178 2019-03-09 stsp static const struct got_error *
931 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
932 5813d178 2019-03-09 stsp struct got_object_id *id, struct got_reflist_head *refs,
933 5813d178 2019-03-09 stsp int author_display_cols)
935 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
936 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
937 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
938 5813d178 2019-03-09 stsp char *author = NULL;
939 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
940 bb737323 2018-05-20 stsp int author_width, logmsg_width;
941 5813d178 2019-03-09 stsp char *newline, *line = NULL;
942 bb737323 2018-05-20 stsp int col, limit;
943 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
944 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
945 ccb26ccd 2018-11-05 stsp struct tm tm;
946 45d799e2 2018-12-23 stsp time_t committer_time;
948 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
949 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
950 638f9024 2019-05-13 stsp return got_error_from_errno("localtime_r");
951 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
952 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
953 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
955 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
956 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
958 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
959 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
960 b39d25c7 2018-07-10 stsp col = limit + 1;
961 b39d25c7 2018-07-10 stsp if (col > avail)
964 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(commit));
965 5813d178 2019-03-09 stsp if (author == NULL) {
966 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
969 5813d178 2019-03-09 stsp err = format_author(&wauthor, &author_width, author, avail - col);
972 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
973 bb737323 2018-05-20 stsp col += author_width;
974 5813d178 2019-03-09 stsp while (col <= avail && author_width < author_display_cols + 2) {
975 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
977 bb737323 2018-05-20 stsp author_width++;
979 9c2eaf34 2018-05-20 stsp if (col > avail)
982 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
983 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
984 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
987 bb737323 2018-05-20 stsp logmsg = logmsg0;
988 bb737323 2018-05-20 stsp while (*logmsg == '\n')
990 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
991 bb737323 2018-05-20 stsp if (newline)
992 bb737323 2018-05-20 stsp *newline = '\0';
993 bb737323 2018-05-20 stsp limit = avail - col;
994 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
997 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
998 bb737323 2018-05-20 stsp col += logmsg_width;
999 bb737323 2018-05-20 stsp while (col <= avail) {
1000 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
1004 80ddbec8 2018-04-29 stsp free(logmsg0);
1005 bb737323 2018-05-20 stsp free(wlogmsg);
1006 5813d178 2019-03-09 stsp free(author);
1007 bb737323 2018-05-20 stsp free(wauthor);
1008 80ddbec8 2018-04-29 stsp free(line);
1009 80ddbec8 2018-04-29 stsp return err;
1012 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
1013 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
1014 899d86c2 2018-05-10 stsp struct got_object_id *id)
1016 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
1018 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
1019 80ddbec8 2018-04-29 stsp if (entry == NULL)
1020 899d86c2 2018-05-10 stsp return NULL;
1022 899d86c2 2018-05-10 stsp entry->id = id;
1023 99db9666 2018-05-07 stsp entry->commit = commit;
1024 899d86c2 2018-05-10 stsp return entry;
1027 99db9666 2018-05-07 stsp static void
1028 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
1030 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
1032 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1033 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
1034 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
1035 ecb28ae0 2018-07-16 stsp commits->ncommits--;
1036 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
1037 99db9666 2018-05-07 stsp free(entry);
1040 99db9666 2018-05-07 stsp static void
1041 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
1043 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
1044 99db9666 2018-05-07 stsp pop_commit(commits);
1047 c4972b91 2018-05-07 stsp static const struct got_error *
1048 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
1049 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
1051 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
1052 93e45b7c 2018-09-24 stsp int nqueued = 0;
1055 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
1056 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
1057 1a76625f 2018-10-22 stsp * while updating the display.
1059 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
1060 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1061 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1062 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1063 1a76625f 2018-10-22 stsp int errcode;
1065 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1066 9ba79e04 2018-06-11 stsp if (err) {
1067 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1069 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1070 93e45b7c 2018-09-24 stsp minqueue, repo);
1072 ecb28ae0 2018-07-16 stsp return err;
1076 ecb28ae0 2018-07-16 stsp if (id == NULL)
1079 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1082 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1083 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1084 638f9024 2019-05-13 stsp err = got_error_from_errno("alloc_commit_queue_entry");
1088 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1089 1a76625f 2018-10-22 stsp if (errcode) {
1090 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_lock");
1094 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1095 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1096 ecb28ae0 2018-07-16 stsp nqueued++;
1097 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1099 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1100 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1101 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1102 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1105 9ba79e04 2018-06-11 stsp return err;
1108 99db9666 2018-05-07 stsp static const struct got_error *
1109 19e70ad6 2019-05-14 stsp get_head_commit_id(struct got_object_id **head_id, const char *branch_name,
1110 19e70ad6 2019-05-14 stsp struct got_repository *repo)
1112 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1113 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1115 9ba79e04 2018-06-11 stsp *head_id = NULL;
1117 19e70ad6 2019-05-14 stsp err = got_ref_open(&head_ref, repo, branch_name, 0);
1119 99db9666 2018-05-07 stsp return err;
1121 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1122 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1123 9ba79e04 2018-06-11 stsp if (err) {
1124 9ba79e04 2018-06-11 stsp *head_id = NULL;
1125 99db9666 2018-05-07 stsp return err;
1128 9ba79e04 2018-06-11 stsp return NULL;
1131 0553a4e3 2018-04-30 stsp static const struct got_error *
1132 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1133 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1134 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1135 8b473291 2019-02-21 stsp struct got_reflist_head *refs, const char *path, int commits_needed)
1137 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1138 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1139 ecb28ae0 2018-07-16 stsp int ncommits, width;
1140 5813d178 2019-03-09 stsp int author_cols = 10;
1141 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1142 8b473291 2019-02-21 stsp char *refs_str = NULL;
1143 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1145 e0d42f60 2018-07-22 stsp entry = first;
1146 e0d42f60 2018-07-22 stsp ncommits = 0;
1147 e0d42f60 2018-07-22 stsp while (entry) {
1148 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1149 e0d42f60 2018-07-22 stsp *selected = entry;
1152 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1153 e0d42f60 2018-07-22 stsp ncommits++;
1156 1a76625f 2018-10-22 stsp if (*selected) {
1157 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1159 ecb28ae0 2018-07-16 stsp return err;
1160 8b473291 2019-02-21 stsp if (refs) {
1161 8b473291 2019-02-21 stsp err = build_refs_str(&refs_str, refs, (*selected)->id);
1163 8b473291 2019-02-21 stsp goto done;
1167 359bfafd 2019-02-22 stsp if (commits_needed == 0)
1168 359bfafd 2019-02-22 stsp halfdelay(10); /* disable fast refresh */
1170 8b473291 2019-02-21 stsp if (asprintf(&ncommits_str, " [%d/%d] %s",
1171 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1172 8b473291 2019-02-21 stsp commits_needed > 0 ? "loading... " :
1173 8b473291 2019-02-21 stsp (refs_str ? refs_str : "")) == -1) {
1174 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1175 8b473291 2019-02-21 stsp goto done;
1178 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1179 c1124f18 2018-12-23 stsp if (asprintf(&header, "commit %s %s%s",
1180 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1181 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1182 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1183 1a76625f 2018-10-22 stsp header = NULL;
1184 1a76625f 2018-10-22 stsp goto done;
1186 c1124f18 2018-12-23 stsp } else if (asprintf(&header, "commit %s%s",
1187 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1188 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1189 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
1190 1a76625f 2018-10-22 stsp header = NULL;
1191 1a76625f 2018-10-22 stsp goto done;
1193 1a76625f 2018-10-22 stsp err = format_line(&wline, &width, header, view->ncols);
1195 1a76625f 2018-10-22 stsp goto done;
1197 2814baeb 2018-08-01 stsp werase(view->window);
1199 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1200 a3404814 2018-09-02 stsp wstandout(view->window);
1201 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1202 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1203 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1206 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1207 a3404814 2018-09-02 stsp wstandend(view->window);
1208 ecb28ae0 2018-07-16 stsp free(wline);
1209 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1210 1a76625f 2018-10-22 stsp goto done;
1212 5813d178 2019-03-09 stsp /* Grow author column size if necessary. */
1213 899d86c2 2018-05-10 stsp entry = first;
1214 5813d178 2019-03-09 stsp ncommits = 0;
1215 5813d178 2019-03-09 stsp while (entry) {
1216 5813d178 2019-03-09 stsp char *author;
1217 5813d178 2019-03-09 stsp wchar_t *wauthor;
1218 5813d178 2019-03-09 stsp int width;
1219 5813d178 2019-03-09 stsp if (ncommits >= limit - 1)
1221 5813d178 2019-03-09 stsp author = strdup(got_object_commit_get_author(entry->commit));
1222 5813d178 2019-03-09 stsp if (author == NULL) {
1223 638f9024 2019-05-13 stsp err = got_error_from_errno("strdup");
1224 5813d178 2019-03-09 stsp goto done;
1226 5813d178 2019-03-09 stsp err = format_author(&wauthor, &width, author, COLS);
1227 5813d178 2019-03-09 stsp if (author_cols < width)
1228 5813d178 2019-03-09 stsp author_cols = width;
1229 5813d178 2019-03-09 stsp free(wauthor);
1230 5813d178 2019-03-09 stsp free(author);
1231 5813d178 2019-03-09 stsp entry = TAILQ_NEXT(entry, entry);
1234 5813d178 2019-03-09 stsp entry = first;
1235 899d86c2 2018-05-10 stsp *last = first;
1236 867c6645 2018-07-10 stsp ncommits = 0;
1237 899d86c2 2018-05-10 stsp while (entry) {
1238 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1240 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1241 2814baeb 2018-08-01 stsp wstandout(view->window);
1242 5813d178 2019-03-09 stsp err = draw_commit(view, entry->commit, entry->id, refs,
1243 5813d178 2019-03-09 stsp author_cols);
1244 b51189f7 2019-03-01 stsp if (ncommits == selected_idx)
1245 2814baeb 2018-08-01 stsp wstandend(view->window);
1248 0553a4e3 2018-04-30 stsp ncommits++;
1249 899d86c2 2018-05-10 stsp *last = entry;
1250 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1253 1a57306a 2018-09-02 stsp view_vborder(view);
1255 1a76625f 2018-10-22 stsp free(id_str);
1256 8b473291 2019-02-21 stsp free(refs_str);
1257 1a76625f 2018-10-22 stsp free(ncommits_str);
1258 1a76625f 2018-10-22 stsp free(header);
1259 80ddbec8 2018-04-29 stsp return err;
1262 07b55e75 2018-05-10 stsp static void
1263 34bc9ec9 2019-02-22 stsp scroll_up(struct tog_view *view,
1264 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1265 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1267 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1268 07b55e75 2018-05-10 stsp int nscrolled = 0;
1270 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1271 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == entry)
1274 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1275 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1276 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1277 07b55e75 2018-05-10 stsp if (entry) {
1278 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1279 07b55e75 2018-05-10 stsp nscrolled++;
1284 aa075928 2018-05-10 stsp static const struct got_error *
1285 5e224a3e 2019-02-22 stsp trigger_log_thread(int load_all, int *commits_needed, int *log_complete,
1286 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1288 5e224a3e 2019-02-22 stsp int errcode;
1289 8a42fca8 2019-02-22 stsp int max_wait = 20;
1291 8a42fca8 2019-02-22 stsp halfdelay(1); /* fast refresh while loading commits */
1293 5e224a3e 2019-02-22 stsp while (*commits_needed > 0) {
1294 5e224a3e 2019-02-22 stsp if (*log_complete)
1297 5e224a3e 2019-02-22 stsp /* Wake the log thread. */
1298 7aafa0d1 2019-02-22 stsp errcode = pthread_cond_signal(need_commits);
1299 7aafa0d1 2019-02-22 stsp if (errcode)
1300 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1301 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1302 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1303 7aafa0d1 2019-02-22 stsp if (errcode)
1304 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1305 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1306 7aafa0d1 2019-02-22 stsp pthread_yield();
1307 7aafa0d1 2019-02-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1308 7aafa0d1 2019-02-22 stsp if (errcode)
1309 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1310 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1312 8a42fca8 2019-02-22 stsp if (*commits_needed > 0 && (!load_all || --max_wait <= 0)) {
1314 5e224a3e 2019-02-22 stsp * Thread is not done yet; lose a key press
1315 5e224a3e 2019-02-22 stsp * and let the user retry... this way the GUI
1316 5e224a3e 2019-02-22 stsp * remains interactive while logging deep paths
1317 5e224a3e 2019-02-22 stsp * with few commits in history.
1319 7aafa0d1 2019-02-22 stsp return NULL;
1323 5e224a3e 2019-02-22 stsp return NULL;
1326 5e224a3e 2019-02-22 stsp static const struct got_error *
1327 34bc9ec9 2019-02-22 stsp scroll_down(struct tog_view *view,
1328 34bc9ec9 2019-02-22 stsp struct commit_queue_entry **first_displayed_entry, int maxscroll,
1329 5e224a3e 2019-02-22 stsp struct commit_queue_entry **last_displayed_entry,
1330 5e224a3e 2019-02-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1331 5e224a3e 2019-02-22 stsp pthread_cond_t *need_commits)
1333 5e224a3e 2019-02-22 stsp const struct got_error *err = NULL;
1334 5e224a3e 2019-02-22 stsp struct commit_queue_entry *pentry;
1335 5e224a3e 2019-02-22 stsp int nscrolled = 0;
1337 5e224a3e 2019-02-22 stsp if (*last_displayed_entry == NULL)
1338 5e224a3e 2019-02-22 stsp return NULL;
1340 5e224a3e 2019-02-22 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1341 5e224a3e 2019-02-22 stsp if (pentry == NULL && !*log_complete) {
1343 08ebd0a9 2019-02-22 stsp * Ask the log thread for required amount of commits
1344 08ebd0a9 2019-02-22 stsp * plus some amount of pre-fetching.
1346 08ebd0a9 2019-02-22 stsp (*commits_needed) += maxscroll + 20;
1347 5e224a3e 2019-02-22 stsp err = trigger_log_thread(0, commits_needed, log_complete,
1348 5e224a3e 2019-02-22 stsp need_commits);
1350 5e224a3e 2019-02-22 stsp return err;
1354 7226d972 2019-02-21 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1355 00ba99a7 2019-05-12 jcs if (pentry == NULL)
1358 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1360 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1361 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1363 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1364 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1366 dd0a52c1 2018-05-20 stsp return err;
1369 cd0acaa7 2018-05-20 stsp static const struct got_error *
1370 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1371 fb872ab2 2019-02-21 stsp struct got_commit_object *commit, struct got_object_id *commit_id,
1372 8b473291 2019-02-21 stsp struct tog_view *log_view, struct got_reflist_head *refs,
1373 8b473291 2019-02-21 stsp struct got_repository *repo)
1375 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1376 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1377 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1379 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1380 15a94983 2018-12-23 stsp if (diff_view == NULL)
1381 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1383 4acef5ee 2018-12-24 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1384 4acef5ee 2018-12-24 stsp err = open_diff_view(diff_view, parent_id ? parent_id->id : NULL,
1385 8b473291 2019-02-21 stsp commit_id, log_view, refs, repo);
1386 e5a0f69f 2018-08-18 stsp if (err == NULL)
1387 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1388 cd0acaa7 2018-05-20 stsp return err;
1391 80ddbec8 2018-04-29 stsp static const struct got_error *
1392 941e9f74 2019-05-21 stsp tree_view_visit_subtree(struct got_tree_object *subtree,
1393 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s)
1395 941e9f74 2019-05-21 stsp struct tog_parent_tree *parent;
1397 941e9f74 2019-05-21 stsp parent = calloc(1, sizeof(*parent));
1398 941e9f74 2019-05-21 stsp if (parent == NULL)
1399 941e9f74 2019-05-21 stsp return got_error_from_errno("calloc");
1401 941e9f74 2019-05-21 stsp parent->tree = s->tree;
1402 941e9f74 2019-05-21 stsp parent->first_displayed_entry = s->first_displayed_entry;
1403 941e9f74 2019-05-21 stsp parent->selected_entry = s->selected_entry;
1404 941e9f74 2019-05-21 stsp parent->selected = s->selected;
1405 941e9f74 2019-05-21 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
1406 941e9f74 2019-05-21 stsp s->tree = subtree;
1407 941e9f74 2019-05-21 stsp s->entries = got_object_tree_get_entries(s->tree);
1408 941e9f74 2019-05-21 stsp s->selected = 0;
1409 941e9f74 2019-05-21 stsp s->first_displayed_entry = NULL;
1410 941e9f74 2019-05-21 stsp return NULL;
1414 941e9f74 2019-05-21 stsp static const struct got_error *
1415 941e9f74 2019-05-21 stsp browse_commit_tree(struct tog_view **new_view, int begin_x,
1416 941e9f74 2019-05-21 stsp struct commit_queue_entry *entry, const char *path,
1417 941e9f74 2019-05-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
1419 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1420 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1421 941e9f74 2019-05-21 stsp struct got_tree_entry *te;
1422 941e9f74 2019-05-21 stsp struct tog_tree_view_state *s;
1423 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1424 b03c880f 2019-05-21 stsp char *slash, *subpath = NULL;
1425 941e9f74 2019-05-21 stsp const char *p;
1427 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1428 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1430 9343a5fb 2018-06-23 stsp return err;
1432 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1433 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1434 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
1436 8b473291 2019-02-21 stsp err = open_tree_view(tree_view, tree, entry->id, refs, repo);
1437 941e9f74 2019-05-21 stsp if (err) {
1438 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1439 941e9f74 2019-05-21 stsp return err;
1441 941e9f74 2019-05-21 stsp s = &tree_view->state.tree;
1443 941e9f74 2019-05-21 stsp *new_view = tree_view;
1445 941e9f74 2019-05-21 stsp /* Walk the path and open corresponding tree objects. */
1447 941e9f74 2019-05-21 stsp while (*p) {
1448 941e9f74 2019-05-21 stsp struct got_object_id *tree_id;
1450 941e9f74 2019-05-21 stsp while (p[0] == '/')
1453 941e9f74 2019-05-21 stsp /* Ensure the correct subtree entry is selected. */
1454 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1455 941e9f74 2019-05-21 stsp if (slash == NULL)
1456 941e9f74 2019-05-21 stsp slash = strchr(p, '\0');
1457 941e9f74 2019-05-21 stsp SIMPLEQ_FOREACH(te, &s->entries->head, entry) {
1458 941e9f74 2019-05-21 stsp if (strncmp(p, te->name, slash - p) == 0) {
1459 941e9f74 2019-05-21 stsp s->selected_entry = te;
1462 b03c880f 2019-05-21 stsp s->selected++;
1464 941e9f74 2019-05-21 stsp if (s->selected_entry == NULL) {
1465 941e9f74 2019-05-21 stsp err = got_error(GOT_ERR_NO_TREE_ENTRY);
1468 b03c880f 2019-05-21 stsp if (s->tree != s->root)
1469 b03c880f 2019-05-21 stsp s->selected++; /* skip '..' */
1471 67409a31 2019-05-24 stsp if (!S_ISDIR(s->selected_entry->mode)) {
1472 67409a31 2019-05-24 stsp /* Jump to this file's entry. */
1473 67409a31 2019-05-24 stsp s->first_displayed_entry = s->selected_entry;
1474 67409a31 2019-05-24 stsp s->selected = 0;
1478 941e9f74 2019-05-21 stsp slash = strchr(p, '/');
1479 941e9f74 2019-05-21 stsp if (slash)
1480 941e9f74 2019-05-21 stsp subpath = strndup(path, slash - path);
1482 941e9f74 2019-05-21 stsp subpath = strdup(path);
1483 941e9f74 2019-05-21 stsp if (subpath == NULL) {
1484 941e9f74 2019-05-21 stsp err = got_error_from_errno("strdup");
1488 941e9f74 2019-05-21 stsp err = got_object_id_by_path(&tree_id, repo, entry->id,
1493 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&tree, repo, tree_id);
1494 941e9f74 2019-05-21 stsp free(tree_id);
1498 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(tree, s);
1499 941e9f74 2019-05-21 stsp if (err) {
1500 941e9f74 2019-05-21 stsp got_object_tree_close(tree);
1503 941e9f74 2019-05-21 stsp if (slash == NULL)
1505 941e9f74 2019-05-21 stsp free(subpath);
1506 941e9f74 2019-05-21 stsp subpath = NULL;
1507 941e9f74 2019-05-21 stsp p = slash;
1510 941e9f74 2019-05-21 stsp free(subpath);
1511 1a76625f 2018-10-22 stsp return err;
1514 1a76625f 2018-10-22 stsp static void *
1515 1a76625f 2018-10-22 stsp log_thread(void *arg)
1517 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1518 1a76625f 2018-10-22 stsp int errcode = 0;
1519 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1520 1a76625f 2018-10-22 stsp int done = 0;
1522 1a76625f 2018-10-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1524 1a76625f 2018-10-22 stsp return (void *)err;
1526 1a76625f 2018-10-22 stsp while (!done && !err) {
1527 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1528 1a76625f 2018-10-22 stsp a->in_repo_path);
1529 1a76625f 2018-10-22 stsp if (err) {
1530 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1531 1a76625f 2018-10-22 stsp return (void *)err;
1532 1a76625f 2018-10-22 stsp err = NULL;
1534 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1535 1a76625f 2018-10-22 stsp a->commits_needed--;
1537 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1538 3abe8080 2019-04-10 stsp if (errcode) {
1539 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1540 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1542 3abe8080 2019-04-10 stsp } else if (*a->quit)
1544 3abe8080 2019-04-10 stsp else if (*a->first_displayed_entry == NULL) {
1545 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1546 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1547 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1551 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1552 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1553 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1554 1a76625f 2018-10-22 stsp &tog_mutex);
1555 1a76625f 2018-10-22 stsp if (errcode)
1556 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1557 2af4a041 2019-05-11 jcs "pthread_cond_wait");
1560 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1561 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1562 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode,
1563 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1565 3abe8080 2019-04-10 stsp a->log_complete = 1;
1566 1a76625f 2018-10-22 stsp return (void *)err;
1569 1a76625f 2018-10-22 stsp static const struct got_error *
1570 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1572 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1573 1a76625f 2018-10-22 stsp int errcode;
1575 1a76625f 2018-10-22 stsp if (s->thread) {
1576 1a76625f 2018-10-22 stsp s->quit = 1;
1577 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1578 1a76625f 2018-10-22 stsp if (errcode)
1579 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1580 2af4a041 2019-05-11 jcs "pthread_cond_signal");
1581 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1582 1a76625f 2018-10-22 stsp if (errcode)
1583 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1584 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
1585 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1586 1a76625f 2018-10-22 stsp if (errcode)
1587 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
1588 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1589 1a76625f 2018-10-22 stsp if (errcode)
1590 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
1591 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
1592 1a76625f 2018-10-22 stsp s->thread = NULL;
1595 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1596 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1597 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_destroy");
1599 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1600 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1601 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1604 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1605 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1606 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1609 9343a5fb 2018-06-23 stsp return err;
1612 9343a5fb 2018-06-23 stsp static const struct got_error *
1613 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1615 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1616 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1618 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1619 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1620 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1621 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1622 1a76625f 2018-10-22 stsp free(s->start_id);
1623 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1624 1a76625f 2018-10-22 stsp return err;
1627 1a76625f 2018-10-22 stsp static const struct got_error *
1628 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1629 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo,
1630 8b473291 2019-02-21 stsp const char *path, int check_disk)
1632 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1633 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1634 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1635 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1636 1a76625f 2018-10-22 stsp int errcode;
1638 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1639 ecb28ae0 2018-07-16 stsp if (err != NULL)
1640 ecb28ae0 2018-07-16 stsp goto done;
1642 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1643 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1644 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1646 8b473291 2019-02-21 stsp s->refs = refs;
1647 fb2756b9 2018-08-04 stsp s->repo = repo;
1648 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1649 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1650 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
1651 5036bf37 2018-09-24 stsp goto done;
1654 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1655 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1656 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1658 1a76625f 2018-10-22 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1660 1a76625f 2018-10-22 stsp goto done;
1661 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1662 1a76625f 2018-10-22 stsp 0, thread_repo);
1664 1a76625f 2018-10-22 stsp goto done;
1666 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1667 1a76625f 2018-10-22 stsp if (errcode) {
1668 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_cond_init");
1669 1a76625f 2018-10-22 stsp goto done;
1672 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1673 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1674 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1675 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1676 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1677 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1678 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1679 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1680 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1681 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1682 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1685 1a76625f 2018-10-22 stsp close_log_view(view);
1686 ba4f502b 2018-08-04 stsp return err;
1689 e5a0f69f 2018-08-18 stsp static const struct got_error *
1690 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1692 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1694 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1695 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1696 2b380cc8 2018-10-24 stsp &s->thread_args);
1697 2b380cc8 2018-10-24 stsp if (errcode)
1698 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
1701 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1702 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1703 8b473291 2019-02-21 stsp &s->commits, s->selected, view->nlines, s->refs,
1704 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1707 e5a0f69f 2018-08-18 stsp static const struct got_error *
1708 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1709 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1711 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1712 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1713 5036bf37 2018-09-24 stsp char *parent_path;
1714 669b5ffa 2018-10-07 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
1715 669b5ffa 2018-10-07 stsp int begin_x = 0;
1717 e5a0f69f 2018-08-18 stsp switch (ch) {
1719 1e37a5c2 2019-05-12 jcs s->quit = 1;
1722 1e37a5c2 2019-05-12 jcs case KEY_UP:
1725 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1727 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
1728 1e37a5c2 2019-05-12 jcs s->selected--;
1729 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
1731 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry, 1,
1732 1e37a5c2 2019-05-12 jcs &s->commits);
1734 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
1735 a4292ac5 2019-05-12 jcs case CTRL('b'):
1736 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1738 1e37a5c2 2019-05-12 jcs if (TAILQ_FIRST(&s->commits.head) ==
1739 1e37a5c2 2019-05-12 jcs s->first_displayed_entry) {
1740 1e37a5c2 2019-05-12 jcs s->selected = 0;
1743 1e37a5c2 2019-05-12 jcs scroll_up(view, &s->first_displayed_entry,
1744 1e37a5c2 2019-05-12 jcs view->nlines, &s->commits);
1747 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
1750 1e37a5c2 2019-05-12 jcs if (s->first_displayed_entry == NULL)
1752 1e37a5c2 2019-05-12 jcs if (s->selected < MIN(view->nlines - 2,
1753 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
1754 1e37a5c2 2019-05-12 jcs s->selected++;
1757 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry, 1,
1758 1e37a5c2 2019-05-12 jcs &s->last_displayed_entry, &s->commits,
1759 1e37a5c2 2019-05-12 jcs &s->thread_args.log_complete,
1760 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
1761 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
1763 a4292ac5 2019-05-12 jcs case KEY_NPAGE:
1764 a4292ac5 2019-05-12 jcs case CTRL('f'): {
1765 1e37a5c2 2019-05-12 jcs struct commit_queue_entry *first;
1766 1e37a5c2 2019-05-12 jcs first = s->first_displayed_entry;
1767 1e37a5c2 2019-05-12 jcs if (first == NULL)
1769 1e37a5c2 2019-05-12 jcs err = scroll_down(view, &s->first_displayed_entry,
1770 1e37a5c2 2019-05-12 jcs view->nlines, &s->last_displayed_entry,
1771 1e37a5c2 2019-05-12 jcs &s->commits, &s->thread_args.log_complete,
1772 1e37a5c2 2019-05-12 jcs &s->thread_args.commits_needed,
1773 1e37a5c2 2019-05-12 jcs &s->thread_args.need_commits);
1774 1e37a5c2 2019-05-12 jcs if (first == s->first_displayed_entry &&
1775 1e37a5c2 2019-05-12 jcs s->selected < MIN(view->nlines - 2,
1776 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1)) {
1777 1e37a5c2 2019-05-12 jcs /* can't scroll further down */
1778 1e37a5c2 2019-05-12 jcs s->selected = MIN(view->nlines - 2,
1779 1e37a5c2 2019-05-12 jcs s->commits.ncommits - 1);
1781 1e37a5c2 2019-05-12 jcs err = NULL;
1784 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
1785 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines - 2)
1786 1e37a5c2 2019-05-12 jcs s->selected = view->nlines - 2;
1787 1e37a5c2 2019-05-12 jcs if (s->selected > s->commits.ncommits - 1)
1788 1e37a5c2 2019-05-12 jcs s->selected = s->commits.ncommits - 1;
1790 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
1793 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
1795 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
1796 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
1797 1e37a5c2 2019-05-12 jcs err = open_diff_view_for_commit(&diff_view, begin_x,
1798 1e37a5c2 2019-05-12 jcs s->selected_entry->commit, s->selected_entry->id,
1799 1e37a5c2 2019-05-12 jcs view, s->refs, s->repo);
1802 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
1803 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
1805 1e37a5c2 2019-05-12 jcs return err;
1806 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
1808 1e37a5c2 2019-05-12 jcs view_close(diff_view);
1811 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
1812 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
1814 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
1817 1e37a5c2 2019-05-12 jcs if (s->selected_entry == NULL)
1819 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
1820 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
1821 941e9f74 2019-05-21 stsp err = browse_commit_tree(&tree_view, begin_x,
1822 941e9f74 2019-05-21 stsp s->selected_entry, s->in_repo_path, s->refs, s->repo);
1825 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
1826 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
1828 1e37a5c2 2019-05-12 jcs return err;
1829 1e37a5c2 2019-05-12 jcs err = view_set_child(view, tree_view);
1831 1e37a5c2 2019-05-12 jcs view_close(tree_view);
1834 1e37a5c2 2019-05-12 jcs *focus_view = tree_view;
1835 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
1837 1e37a5c2 2019-05-12 jcs *new_view = tree_view;
1839 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
1840 1e37a5c2 2019-05-12 jcs if (strcmp(s->in_repo_path, "/") == 0)
1842 1e37a5c2 2019-05-12 jcs parent_path = dirname(s->in_repo_path);
1843 1e37a5c2 2019-05-12 jcs if (parent_path && strcmp(parent_path, ".") != 0) {
1844 1e37a5c2 2019-05-12 jcs struct tog_view *lv;
1845 1e37a5c2 2019-05-12 jcs err = stop_log_thread(s);
1847 1e37a5c2 2019-05-12 jcs return err;
1848 1e37a5c2 2019-05-12 jcs lv = view_open(view->nlines, view->ncols,
1849 1e37a5c2 2019-05-12 jcs view->begin_y, view->begin_x, TOG_VIEW_LOG);
1850 1e37a5c2 2019-05-12 jcs if (lv == NULL)
1851 638f9024 2019-05-13 stsp return got_error_from_errno(
1852 1e37a5c2 2019-05-12 jcs "view_open");
1853 1e37a5c2 2019-05-12 jcs err = open_log_view(lv, s->start_id, s->refs,
1854 1e37a5c2 2019-05-12 jcs s->repo, parent_path, 0);
1856 1e37a5c2 2019-05-12 jcs return err;;
1857 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
1858 1e37a5c2 2019-05-12 jcs *new_view = lv;
1860 1e37a5c2 2019-05-12 jcs view_set_child(view->parent, lv);
1861 1e37a5c2 2019-05-12 jcs *focus_view = lv;
1863 1e37a5c2 2019-05-12 jcs return NULL;
1870 80ddbec8 2018-04-29 stsp return err;
1873 4ed7e80c 2018-05-20 stsp static const struct got_error *
1874 c2db6724 2019-01-04 stsp apply_unveil(const char *repo_path, const char *worktree_path)
1876 c2db6724 2019-01-04 stsp const struct got_error *error;
1878 c2db6724 2019-01-04 stsp if (repo_path && unveil(repo_path, "r") != 0)
1879 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", repo_path);
1881 c2db6724 2019-01-04 stsp if (worktree_path && unveil(worktree_path, "rwc") != 0)
1882 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", worktree_path);
1884 f12d0dbe 2019-01-04 stsp if (unveil("/tmp", "rwc") != 0)
1885 638f9024 2019-05-13 stsp return got_error_from_errno2("unveil", "/tmp");
1887 c2db6724 2019-01-04 stsp error = got_privsep_unveil_exec_helpers();
1888 c2db6724 2019-01-04 stsp if (error != NULL)
1889 c2db6724 2019-01-04 stsp return error;
1891 c2db6724 2019-01-04 stsp if (unveil(NULL, NULL) != 0)
1892 638f9024 2019-05-13 stsp return got_error_from_errno("unveil");
1894 c2db6724 2019-01-04 stsp return NULL;
1897 a915003a 2019-02-05 stsp static void
1898 a915003a 2019-02-05 stsp init_curses(void)
1900 a915003a 2019-02-05 stsp initscr();
1902 a915003a 2019-02-05 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
1905 a915003a 2019-02-05 stsp intrflush(stdscr, FALSE);
1906 a915003a 2019-02-05 stsp keypad(stdscr, TRUE);
1907 a915003a 2019-02-05 stsp curs_set(0);
1908 a915003a 2019-02-05 stsp signal(SIGWINCH, tog_sigwinch);
1911 c2db6724 2019-01-04 stsp static const struct got_error *
1912 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1914 80ddbec8 2018-04-29 stsp const struct got_error *error;
1915 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1916 ec142235 2019-03-07 stsp struct got_worktree *worktree = NULL;
1917 8b473291 2019-02-21 stsp struct got_reflist_head refs;
1918 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1919 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1920 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1922 04cc582a 2018-08-01 stsp struct tog_view *view;
1924 a55555f2 2019-03-28 stsp SIMPLEQ_INIT(&refs);
1926 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1927 c2db6724 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
1928 c2db6724 2019-01-04 stsp NULL) == -1)
1929 80ddbec8 2018-04-29 stsp err(1, "pledge");
1932 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1933 80ddbec8 2018-04-29 stsp switch (ch) {
1935 80ddbec8 2018-04-29 stsp start_commit = optarg;
1938 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1939 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1940 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1943 17020d27 2019-03-07 stsp usage_log();
1944 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1948 80ddbec8 2018-04-29 stsp argc -= optind;
1949 80ddbec8 2018-04-29 stsp argv += optind;
1951 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1952 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1953 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
1954 ecb28ae0 2018-07-16 stsp goto done;
1956 963f97a1 2019-03-18 stsp error = got_worktree_open(&worktree, cwd);
1957 963f97a1 2019-03-18 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
1958 963f97a1 2019-03-18 stsp goto done;
1959 963f97a1 2019-03-18 stsp error = NULL;
1961 963f97a1 2019-03-18 stsp if (argc == 0) {
1962 963f97a1 2019-03-18 stsp path = strdup("");
1963 963f97a1 2019-03-18 stsp if (path == NULL) {
1964 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1965 ecb28ae0 2018-07-16 stsp goto done;
1967 963f97a1 2019-03-18 stsp } else if (argc == 1) {
1968 963f97a1 2019-03-18 stsp if (worktree) {
1969 963f97a1 2019-03-18 stsp error = got_worktree_resolve_path(&path, worktree,
1971 963f97a1 2019-03-18 stsp if (error)
1972 963f97a1 2019-03-18 stsp goto done;
1974 963f97a1 2019-03-18 stsp path = strdup(argv[0]);
1975 963f97a1 2019-03-18 stsp if (path == NULL) {
1976 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1977 963f97a1 2019-03-18 stsp goto done;
1981 963f97a1 2019-03-18 stsp usage_log();
1983 963f97a1 2019-03-18 stsp repo_path = worktree ?
1984 963f97a1 2019-03-18 stsp strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1985 963f97a1 2019-03-18 stsp if (repo_path == NULL) {
1986 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
1987 963f97a1 2019-03-18 stsp goto done;
1990 a915003a 2019-02-05 stsp init_curses();
1992 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1993 80ddbec8 2018-04-29 stsp if (error != NULL)
1994 ecb28ae0 2018-07-16 stsp goto done;
1996 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo),
1997 c02c541e 2019-03-29 stsp worktree ? got_worktree_get_root_path(worktree) : NULL);
1998 c02c541e 2019-03-29 stsp if (error)
1999 c02c541e 2019-03-29 stsp goto done;
2001 15a94983 2018-12-23 stsp if (start_commit == NULL)
2002 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&start_id, worktree ?
2003 19e70ad6 2019-05-14 stsp got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD,
2006 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&start_id, repo,
2007 15a94983 2018-12-23 stsp start_commit);
2008 80ddbec8 2018-04-29 stsp if (error != NULL)
2009 8b473291 2019-02-21 stsp goto done;
2011 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
2012 8b473291 2019-02-21 stsp if (error)
2013 ecb28ae0 2018-07-16 stsp goto done;
2015 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
2016 04cc582a 2018-08-01 stsp if (view == NULL) {
2017 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2018 04cc582a 2018-08-01 stsp goto done;
2020 8b473291 2019-02-21 stsp error = open_log_view(view, start_id, &refs, repo, path, 1);
2021 ba4f502b 2018-08-04 stsp if (error)
2022 ba4f502b 2018-08-04 stsp goto done;
2023 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2025 ecb28ae0 2018-07-16 stsp free(repo_path);
2026 ecb28ae0 2018-07-16 stsp free(cwd);
2027 ecb28ae0 2018-07-16 stsp free(path);
2028 899d86c2 2018-05-10 stsp free(start_id);
2030 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
2031 ec142235 2019-03-07 stsp if (worktree)
2032 ec142235 2019-03-07 stsp got_worktree_close(worktree);
2033 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2034 80ddbec8 2018-04-29 stsp return error;
2037 4ed7e80c 2018-05-20 stsp __dead static void
2038 9f7d7167 2018-04-29 stsp usage_diff(void)
2041 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
2042 9f7d7167 2018-04-29 stsp getprogname());
2046 b304db33 2018-05-20 stsp static char *
2047 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
2049 b304db33 2018-05-20 stsp char *line;
2050 b304db33 2018-05-20 stsp size_t linelen;
2051 b304db33 2018-05-20 stsp size_t lineno;
2052 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
2054 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
2056 b304db33 2018-05-20 stsp *len = linelen;
2057 b304db33 2018-05-20 stsp return line;
2060 4ed7e80c 2018-05-20 stsp static const struct got_error *
2061 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
2062 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
2063 c3e9aa98 2019-05-13 jcs char *header)
2065 61e69b96 2018-05-20 stsp const struct got_error *err;
2066 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
2067 b304db33 2018-05-20 stsp char *line;
2068 b304db33 2018-05-20 stsp size_t len;
2069 61e69b96 2018-05-20 stsp wchar_t *wline;
2070 e0b650dd 2018-05-20 stsp int width;
2072 26ed57b2 2018-05-19 stsp rewind(f);
2073 f7d12f7e 2018-08-01 stsp werase(view->window);
2075 a3404814 2018-09-02 stsp if (header) {
2076 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
2077 a3404814 2018-09-02 stsp if (err) {
2078 a3404814 2018-09-02 stsp return err;
2081 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2082 a3404814 2018-09-02 stsp wstandout(view->window);
2083 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
2084 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2085 a3404814 2018-09-02 stsp wstandend(view->window);
2086 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2087 a3404814 2018-09-02 stsp waddch(view->window, '\n');
2089 a3404814 2018-09-02 stsp if (max_lines <= 1)
2090 a3404814 2018-09-02 stsp return NULL;
2091 a3404814 2018-09-02 stsp max_lines--;
2095 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
2096 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
2097 26ed57b2 2018-05-19 stsp if (line == NULL) {
2101 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
2102 26ed57b2 2018-05-19 stsp free(line);
2106 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2107 61e69b96 2018-05-20 stsp if (err) {
2108 61e69b96 2018-05-20 stsp free(line);
2109 61e69b96 2018-05-20 stsp return err;
2111 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2112 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2113 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2114 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
2115 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
2116 26ed57b2 2018-05-19 stsp free(line);
2117 2550e4c3 2018-07-13 stsp free(wline);
2118 2550e4c3 2018-07-13 stsp wline = NULL;
2120 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
2122 1a57306a 2018-09-02 stsp view_vborder(view);
2124 c3e9aa98 2019-05-13 jcs if (*eof) {
2125 c3e9aa98 2019-05-13 jcs while (nprinted < view->nlines) {
2126 c3e9aa98 2019-05-13 jcs waddch(view->window, '\n');
2127 c3e9aa98 2019-05-13 jcs nprinted++;
2130 c3e9aa98 2019-05-13 jcs err = format_line(&wline, &width, TOG_EOF_STRING, view->ncols);
2132 c3e9aa98 2019-05-13 jcs return err;
2135 c3e9aa98 2019-05-13 jcs wstandout(view->window);
2136 c3e9aa98 2019-05-13 jcs waddwstr(view->window, wline);
2137 c3e9aa98 2019-05-13 jcs wstandend(view->window);
2140 26ed57b2 2018-05-19 stsp return NULL;
2143 abd2672a 2018-12-23 stsp static char *
2144 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
2146 abd2672a 2018-12-23 stsp char *p, *s = ctime_r(time, datebuf);
2147 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
2149 abd2672a 2018-12-23 stsp *p = '\0';
2153 4ed7e80c 2018-05-20 stsp static const struct got_error *
2154 8b473291 2019-02-21 stsp write_commit_info(struct got_object_id *commit_id,
2155 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo, FILE *outfile)
2157 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
2158 abd2672a 2018-12-23 stsp char datebuf[26];
2159 15a94983 2018-12-23 stsp struct got_commit_object *commit;
2160 15a94983 2018-12-23 stsp char *id_str = NULL;
2161 45d799e2 2018-12-23 stsp time_t committer_time;
2162 45d799e2 2018-12-23 stsp const char *author, *committer;
2163 8b473291 2019-02-21 stsp char *refs_str = NULL;
2165 8b473291 2019-02-21 stsp if (refs) {
2166 8b473291 2019-02-21 stsp err = build_refs_str(&refs_str, refs, commit_id);
2168 8b473291 2019-02-21 stsp return err;
2171 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit, repo, commit_id);
2173 abd2672a 2018-12-23 stsp return err;
2175 15a94983 2018-12-23 stsp err = got_object_id_str(&id_str, commit_id);
2176 15a94983 2018-12-23 stsp if (err) {
2177 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_str");
2178 15a94983 2018-12-23 stsp goto done;
2181 8b473291 2019-02-21 stsp if (fprintf(outfile, "commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2182 8b473291 2019-02-21 stsp refs_str ? refs_str : "", refs_str ? ")" : "") < 0) {
2183 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2184 abd2672a 2018-12-23 stsp goto done;
2186 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
2187 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
2188 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2189 abd2672a 2018-12-23 stsp goto done;
2191 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
2192 abd2672a 2018-12-23 stsp if (fprintf(outfile, "date: %s UTC\n",
2193 45d799e2 2018-12-23 stsp get_datestr(&committer_time, datebuf)) < 0) {
2194 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2195 abd2672a 2018-12-23 stsp goto done;
2197 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
2198 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
2199 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
2200 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
2201 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2202 abd2672a 2018-12-23 stsp goto done;
2204 45d799e2 2018-12-23 stsp if (fprintf(outfile, "%s\n",
2205 45d799e2 2018-12-23 stsp got_object_commit_get_logmsg(commit)) < 0) {
2206 638f9024 2019-05-13 stsp err = got_error_from_errno("fprintf");
2207 abd2672a 2018-12-23 stsp goto done;
2210 abd2672a 2018-12-23 stsp free(id_str);
2211 8b473291 2019-02-21 stsp free(refs_str);
2212 15a94983 2018-12-23 stsp got_object_commit_close(commit);
2213 abd2672a 2018-12-23 stsp return err;
2216 abd2672a 2018-12-23 stsp static const struct got_error *
2217 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
2219 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
2220 48ae06ee 2018-10-18 stsp FILE *f = NULL;
2221 15a94983 2018-12-23 stsp int obj_type;
2223 511a516b 2018-05-19 stsp f = got_opentemp();
2224 48ae06ee 2018-10-18 stsp if (f == NULL) {
2225 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
2226 48ae06ee 2018-10-18 stsp goto done;
2228 fb43ecf1 2019-02-11 stsp if (s->f && fclose(s->f) != 0) {
2229 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2230 fb43ecf1 2019-02-11 stsp goto done;
2234 15a94983 2018-12-23 stsp if (s->id1)
2235 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id1);
2237 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, s->repo, s->id2);
2239 15a94983 2018-12-23 stsp goto done;
2241 15a94983 2018-12-23 stsp switch (obj_type) {
2242 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
2243 15a94983 2018-12-23 stsp err = got_diff_objects_as_blobs(s->id1, s->id2, NULL, NULL,
2244 54156555 2018-12-24 stsp s->diff_context, s->repo, f);
2246 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
2247 54156555 2018-12-24 stsp err = got_diff_objects_as_trees(s->id1, s->id2, "", "",
2248 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
2250 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
2251 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
2252 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
2253 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
2255 15a94983 2018-12-23 stsp err = got_object_open_as_commit(&commit2, s->repo, s->id2);
2258 15a087fe 2019-02-21 stsp /* Show commit info if we're diffing to a parent/root commit. */
2259 15a087fe 2019-02-21 stsp if (s->id1 == NULL)
2260 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs, s->repo, f);
2262 15a087fe 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
2263 15a087fe 2019-02-21 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
2264 15a087fe 2019-02-21 stsp if (got_object_id_cmp(s->id1, pid->id) == 0) {
2265 8b473291 2019-02-21 stsp write_commit_info(s->id2, s->refs,
2266 8b473291 2019-02-21 stsp s->repo, f);
2271 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
2273 15a94983 2018-12-23 stsp err = got_diff_objects_as_commits(s->id1, s->id2,
2274 15a94983 2018-12-23 stsp s->diff_context, s->repo, f);
2278 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2282 cbe7f848 2019-02-11 stsp if (f && fflush(f) != 0 && err == NULL)
2283 638f9024 2019-05-13 stsp err = got_error_from_errno("fflush");
2284 48ae06ee 2018-10-18 stsp return err;
2287 f5215bb9 2019-02-22 stsp static void
2288 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(struct tog_view *view)
2290 baf4288f 2019-05-13 stsp mvwaddstr(view->window, 0, 0, "diffing...");
2291 f5215bb9 2019-02-22 stsp update_panels();
2292 f5215bb9 2019-02-22 stsp doupdate();
2295 48ae06ee 2018-10-18 stsp static const struct got_error *
2296 15a94983 2018-12-23 stsp open_diff_view(struct tog_view *view, struct got_object_id *id1,
2297 fb872ab2 2019-02-21 stsp struct got_object_id *id2, struct tog_view *log_view,
2298 8b473291 2019-02-21 stsp struct got_reflist_head *refs, struct got_repository *repo)
2300 48ae06ee 2018-10-18 stsp const struct got_error *err;
2302 15a94983 2018-12-23 stsp if (id1 != NULL && id2 != NULL) {
2303 15a94983 2018-12-23 stsp int type1, type2;
2304 15a94983 2018-12-23 stsp err = got_object_get_type(&type1, repo, id1);
2306 15a94983 2018-12-23 stsp return err;
2307 15a94983 2018-12-23 stsp err = got_object_get_type(&type2, repo, id2);
2309 15a94983 2018-12-23 stsp return err;
2311 15a94983 2018-12-23 stsp if (type1 != type2)
2312 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
2315 15a94983 2018-12-23 stsp if (id1) {
2316 15a94983 2018-12-23 stsp view->state.diff.id1 = got_object_id_dup(id1);
2317 15a94983 2018-12-23 stsp if (view->state.diff.id1 == NULL)
2318 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2320 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2322 15a94983 2018-12-23 stsp view->state.diff.id2 = got_object_id_dup(id2);
2323 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
2324 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2325 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2326 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2328 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
2329 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
2330 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
2331 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
2332 fb872ab2 2019-02-21 stsp view->state.diff.log_view = log_view;
2333 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
2334 8b473291 2019-02-21 stsp view->state.diff.refs = refs;
2336 f5215bb9 2019-02-22 stsp if (log_view && view_is_splitscreen(view))
2337 f5215bb9 2019-02-22 stsp show_log_view(log_view); /* draw vborder */
2338 f5215bb9 2019-02-22 stsp diff_view_indicate_progress(view);
2340 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
2341 48ae06ee 2018-10-18 stsp if (err) {
2342 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2343 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2344 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2345 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2346 48ae06ee 2018-10-18 stsp return err;
2349 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
2350 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
2351 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
2353 5dc9f4bc 2018-08-04 stsp return NULL;
2356 e5a0f69f 2018-08-18 stsp static const struct got_error *
2357 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2359 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2361 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2362 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2363 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2364 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2365 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2366 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2367 e5a0f69f 2018-08-18 stsp return err;
2370 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2371 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2373 a3404814 2018-09-02 stsp const struct got_error *err;
2374 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2375 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2377 a3404814 2018-09-02 stsp if (s->id1) {
2378 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2380 a3404814 2018-09-02 stsp return err;
2382 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2384 a3404814 2018-09-02 stsp return err;
2386 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2387 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2388 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2389 a3404814 2018-09-02 stsp free(id_str1);
2390 a3404814 2018-09-02 stsp free(id_str2);
2391 a3404814 2018-09-02 stsp return err;
2393 a3404814 2018-09-02 stsp free(id_str1);
2394 a3404814 2018-09-02 stsp free(id_str2);
2396 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2397 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2401 15a087fe 2019-02-21 stsp static const struct got_error *
2402 15a087fe 2019-02-21 stsp set_selected_commit(struct tog_diff_view_state *s,
2403 15a087fe 2019-02-21 stsp struct commit_queue_entry *entry)
2405 d7a04538 2019-02-21 stsp const struct got_error *err;
2406 d7a04538 2019-02-21 stsp const struct got_object_id_queue *parent_ids;
2407 d7a04538 2019-02-21 stsp struct got_commit_object *selected_commit;
2408 d7a04538 2019-02-21 stsp struct got_object_qid *pid;
2410 15a087fe 2019-02-21 stsp free(s->id2);
2411 15a087fe 2019-02-21 stsp s->id2 = got_object_id_dup(entry->id);
2412 15a087fe 2019-02-21 stsp if (s->id2 == NULL)
2413 638f9024 2019-05-13 stsp return got_error_from_errno("got_object_id_dup");
2415 d7a04538 2019-02-21 stsp err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
2417 d7a04538 2019-02-21 stsp return err;
2418 d7a04538 2019-02-21 stsp parent_ids = got_object_commit_get_parent_ids(selected_commit);
2419 15a087fe 2019-02-21 stsp free(s->id1);
2420 d7a04538 2019-02-21 stsp pid = SIMPLEQ_FIRST(parent_ids);
2421 d7a04538 2019-02-21 stsp s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
2422 0311546b 2019-02-21 stsp got_object_commit_close(selected_commit);
2423 15a087fe 2019-02-21 stsp return NULL;
2426 0cf4efb1 2018-09-29 stsp static const struct got_error *
2427 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2428 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2430 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2431 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2432 fb872ab2 2019-02-21 stsp struct tog_log_view_state *ls;
2433 fb872ab2 2019-02-21 stsp struct commit_queue_entry *entry;
2436 e5a0f69f 2018-08-18 stsp switch (ch) {
2438 1e37a5c2 2019-05-12 jcs case KEY_UP:
2439 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > 1)
2440 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2442 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
2443 a60a9dc4 2019-05-13 jcs case CTRL('b'):
2444 00ba99a7 2019-05-12 jcs if (s->first_displayed_line == 1)
2447 1e37a5c2 2019-05-12 jcs while (i++ < view->nlines - 1 &&
2448 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
2449 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
2452 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
2453 1e37a5c2 2019-05-12 jcs if (!s->eof)
2454 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2456 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
2457 a60a9dc4 2019-05-13 jcs case CTRL('f'):
2459 00ba99a7 2019-05-12 jcs if (s->eof)
2462 1e37a5c2 2019-05-12 jcs while (!s->eof && i++ < view->nlines - 1) {
2463 1e37a5c2 2019-05-12 jcs char *line;
2464 1e37a5c2 2019-05-12 jcs line = parse_next_line(s->f, NULL);
2465 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
2466 1e37a5c2 2019-05-12 jcs if (line == NULL)
2471 1e37a5c2 2019-05-12 jcs if (s->diff_context > 0) {
2472 1e37a5c2 2019-05-12 jcs s->diff_context--;
2473 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2474 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2478 1e37a5c2 2019-05-12 jcs if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2479 1e37a5c2 2019-05-12 jcs s->diff_context++;
2480 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2481 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2486 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2488 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2489 1e37a5c2 2019-05-12 jcs entry = TAILQ_PREV(ls->selected_entry,
2490 1e37a5c2 2019-05-12 jcs commit_queue_head, entry);
2491 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2494 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2499 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2503 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2504 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2506 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2507 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2511 1e37a5c2 2019-05-12 jcs if (s->log_view == NULL)
2513 1e37a5c2 2019-05-12 jcs ls = &s->log_view->state.log;
2515 1e37a5c2 2019-05-12 jcs if (TAILQ_NEXT(ls->selected_entry, entry) == NULL) {
2516 1e37a5c2 2019-05-12 jcs ls->thread_args.commits_needed++;
2518 1e37a5c2 2019-05-12 jcs /* Display "loading..." in log view. */
2519 1e37a5c2 2019-05-12 jcs show_log_view(s->log_view);
2520 1e37a5c2 2019-05-12 jcs update_panels();
2521 1e37a5c2 2019-05-12 jcs doupdate();
2523 1e37a5c2 2019-05-12 jcs err = trigger_log_thread(1 /* load_all */,
2524 1e37a5c2 2019-05-12 jcs &ls->thread_args.commits_needed,
2525 1e37a5c2 2019-05-12 jcs &ls->thread_args.log_complete,
2526 1e37a5c2 2019-05-12 jcs &ls->thread_args.need_commits);
2530 1e37a5c2 2019-05-12 jcs err = input_log_view(NULL, NULL, NULL, s->log_view,
2535 1e37a5c2 2019-05-12 jcs entry = TAILQ_NEXT(ls->selected_entry, entry);
2536 1e37a5c2 2019-05-12 jcs if (entry == NULL)
2539 1e37a5c2 2019-05-12 jcs err = set_selected_commit(s, entry);
2543 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
2544 1e37a5c2 2019-05-12 jcs s->last_displayed_line = view->nlines;
2546 1e37a5c2 2019-05-12 jcs diff_view_indicate_progress(view);
2547 1e37a5c2 2019-05-12 jcs err = create_diff(s);
2553 bcbd79e2 2018-08-19 stsp return err;
2556 4ed7e80c 2018-05-20 stsp static const struct got_error *
2557 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2559 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2560 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2561 8b473291 2019-02-21 stsp struct got_reflist_head refs;
2562 15a94983 2018-12-23 stsp struct got_object_id *id1 = NULL, *id2 = NULL;
2563 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2564 15a94983 2018-12-23 stsp char *id_str1 = NULL, *id_str2 = NULL;
2566 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2568 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
2570 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2571 eb6600df 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
2572 eb6600df 2019-01-04 stsp NULL) == -1)
2573 26ed57b2 2018-05-19 stsp err(1, "pledge");
2576 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2577 26ed57b2 2018-05-19 stsp switch (ch) {
2579 17020d27 2019-03-07 stsp usage_diff();
2580 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2584 26ed57b2 2018-05-19 stsp argc -= optind;
2585 26ed57b2 2018-05-19 stsp argv += optind;
2587 26ed57b2 2018-05-19 stsp if (argc == 0) {
2588 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2589 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2590 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2591 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2592 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
2593 15a94983 2018-12-23 stsp id_str1 = argv[0];
2594 15a94983 2018-12-23 stsp id_str2 = argv[1];
2595 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2596 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2597 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2598 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
2599 15a94983 2018-12-23 stsp id_str1 = argv[1];
2600 15a94983 2018-12-23 stsp id_str2 = argv[2];
2602 26ed57b2 2018-05-19 stsp usage_diff();
2604 a915003a 2019-02-05 stsp init_curses();
2606 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
2607 eb6600df 2019-01-04 stsp if (error)
2608 eb6600df 2019-01-04 stsp goto done;
2610 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
2611 26ed57b2 2018-05-19 stsp if (error)
2612 26ed57b2 2018-05-19 stsp goto done;
2614 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id1, repo, id_str1);
2615 26ed57b2 2018-05-19 stsp if (error)
2616 26ed57b2 2018-05-19 stsp goto done;
2618 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&id2, repo, id_str2);
2619 26ed57b2 2018-05-19 stsp if (error)
2620 26ed57b2 2018-05-19 stsp goto done;
2622 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
2623 8b473291 2019-02-21 stsp if (error)
2624 8b473291 2019-02-21 stsp goto done;
2626 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2627 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2628 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
2629 ea5e7bb5 2018-08-01 stsp goto done;
2631 8b473291 2019-02-21 stsp error = open_diff_view(view, id1, id2, NULL, &refs, repo);
2632 5dc9f4bc 2018-08-04 stsp if (error)
2633 5dc9f4bc 2018-08-04 stsp goto done;
2634 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2636 c02c541e 2019-03-29 stsp free(repo_path);
2637 26ed57b2 2018-05-19 stsp got_repo_close(repo);
2638 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
2639 26ed57b2 2018-05-19 stsp return error;
2642 4ed7e80c 2018-05-20 stsp __dead static void
2643 9f7d7167 2018-04-29 stsp usage_blame(void)
2646 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2647 9f7d7167 2018-04-29 stsp getprogname());
2651 84451b3e 2018-07-10 stsp struct tog_blame_line {
2652 84451b3e 2018-07-10 stsp int annotated;
2653 84451b3e 2018-07-10 stsp struct got_object_id *id;
2656 4ed7e80c 2018-05-20 stsp static const struct got_error *
2657 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2658 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
2659 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
2660 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
2662 84451b3e 2018-07-10 stsp const struct got_error *err;
2663 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
2664 84451b3e 2018-07-10 stsp char *line;
2665 84451b3e 2018-07-10 stsp size_t len;
2666 84451b3e 2018-07-10 stsp wchar_t *wline;
2667 b700b5d6 2018-07-10 stsp int width, wlimit;
2668 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
2669 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
2670 ab089a2a 2018-07-12 stsp char *id_str;
2672 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
2674 ab089a2a 2018-07-12 stsp return err;
2676 84451b3e 2018-07-10 stsp rewind(f);
2677 f7d12f7e 2018-08-01 stsp werase(view->window);
2679 c1124f18 2018-12-23 stsp if (asprintf(&line, "commit %s", id_str) == -1) {
2680 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
2681 ab089a2a 2018-07-12 stsp free(id_str);
2682 ab089a2a 2018-07-12 stsp return err;
2685 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2686 ab089a2a 2018-07-12 stsp free(line);
2687 2550e4c3 2018-07-13 stsp line = NULL;
2688 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2689 a3404814 2018-09-02 stsp wstandout(view->window);
2690 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2691 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2692 a3404814 2018-09-02 stsp wstandend(view->window);
2693 2550e4c3 2018-07-13 stsp free(wline);
2694 2550e4c3 2018-07-13 stsp wline = NULL;
2695 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2696 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2698 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
2699 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
2700 512d0df1 2019-02-22 stsp blame_complete ? "" : "annotating... ", path) == -1) {
2701 ab089a2a 2018-07-12 stsp free(id_str);
2702 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
2704 ab089a2a 2018-07-12 stsp free(id_str);
2705 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2706 3f60a8ef 2018-07-10 stsp free(line);
2707 2550e4c3 2018-07-13 stsp line = NULL;
2709 3f60a8ef 2018-07-10 stsp return err;
2710 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2711 2550e4c3 2018-07-13 stsp free(wline);
2712 2550e4c3 2018-07-13 stsp wline = NULL;
2713 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
2714 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2717 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
2718 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
2719 84451b3e 2018-07-10 stsp if (line == NULL) {
2723 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
2724 84451b3e 2018-07-10 stsp free(line);
2728 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2729 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
2730 84451b3e 2018-07-10 stsp if (err) {
2731 84451b3e 2018-07-10 stsp free(line);
2732 84451b3e 2018-07-10 stsp return err;
2735 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2736 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2738 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
2739 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
2740 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
2741 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
2742 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
2743 84451b3e 2018-07-10 stsp char *id_str;
2744 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
2745 84451b3e 2018-07-10 stsp if (err) {
2746 84451b3e 2018-07-10 stsp free(line);
2747 2550e4c3 2018-07-13 stsp free(wline);
2748 84451b3e 2018-07-10 stsp return err;
2750 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
2751 84451b3e 2018-07-10 stsp free(id_str);
2752 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
2754 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
2755 ee41ec32 2018-07-10 stsp prev_id = NULL;
2758 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2759 b700b5d6 2018-07-10 stsp while (width < wlimit) {
2760 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
2763 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2764 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2765 84451b3e 2018-07-10 stsp if (++nprinted == 1)
2766 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
2767 84451b3e 2018-07-10 stsp free(line);
2768 2550e4c3 2018-07-13 stsp free(wline);
2769 2550e4c3 2018-07-13 stsp wline = NULL;
2771 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
2773 1a57306a 2018-09-02 stsp view_vborder(view);
2775 84451b3e 2018-07-10 stsp return NULL;
2778 84451b3e 2018-07-10 stsp static const struct got_error *
2779 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2781 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
2782 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
2783 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
2784 1a76625f 2018-10-22 stsp int errcode;
2786 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
2787 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2788 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
2790 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2791 1a76625f 2018-10-22 stsp if (errcode)
2792 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_mutex_lock");
2794 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
2795 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
2796 d68a0a7d 2018-07-10 stsp goto done;
2799 d68a0a7d 2018-07-10 stsp if (lineno == -1)
2800 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
2802 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
2803 d68a0a7d 2018-07-10 stsp if (line->annotated)
2804 d68a0a7d 2018-07-10 stsp goto done;
2806 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
2807 84451b3e 2018-07-10 stsp if (line->id == NULL) {
2808 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2809 84451b3e 2018-07-10 stsp goto done;
2811 84451b3e 2018-07-10 stsp line->annotated = 1;
2813 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2814 1a76625f 2018-10-22 stsp if (errcode)
2815 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
2816 84451b3e 2018-07-10 stsp return err;
2819 84451b3e 2018-07-10 stsp static void *
2820 84451b3e 2018-07-10 stsp blame_thread(void *arg)
2822 18430de3 2018-07-10 stsp const struct got_error *err;
2823 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
2824 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
2825 1a76625f 2018-10-22 stsp int errcode;
2827 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2828 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
2830 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2831 1a76625f 2018-10-22 stsp if (errcode)
2832 2af4a041 2019-05-11 jcs return (void *)got_error_set_errno(errcode,
2833 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2835 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
2836 c9beca56 2018-07-22 stsp ta->repo = NULL;
2837 c9beca56 2018-07-22 stsp *ta->complete = 1;
2839 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2840 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2841 2af4a041 2019-05-11 jcs err = got_error_set_errno(errcode, "pthread_mutex_unlock");
2843 18430de3 2018-07-10 stsp return (void *)err;
2846 245d91c1 2018-07-12 stsp static struct got_object_id *
2847 15a94983 2018-12-23 stsp get_selected_commit_id(struct tog_blame_line *lines, int first_displayed_line,
2848 15a94983 2018-12-23 stsp int selected_line)
2850 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
2852 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
2853 245d91c1 2018-07-12 stsp if (!line->annotated)
2854 245d91c1 2018-07-12 stsp return NULL;
2856 245d91c1 2018-07-12 stsp return line->id;
2859 b880a918 2018-07-10 stsp static const struct got_error *
2860 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
2862 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
2865 245d91c1 2018-07-12 stsp if (blame->thread) {
2866 1a76625f 2018-10-22 stsp int errcode;
2867 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2868 1a76625f 2018-10-22 stsp if (errcode)
2869 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2870 2af4a041 2019-05-11 jcs "pthread_mutex_unlock");
2871 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
2872 1a76625f 2018-10-22 stsp if (errcode)
2873 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_join");
2874 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2875 1a76625f 2018-10-22 stsp if (errcode)
2876 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode,
2877 2af4a041 2019-05-11 jcs "pthread_mutex_lock");
2878 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
2879 245d91c1 2018-07-12 stsp err = NULL;
2880 245d91c1 2018-07-12 stsp blame->thread = NULL;
2882 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
2883 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
2884 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
2886 245d91c1 2018-07-12 stsp if (blame->f) {
2887 fb43ecf1 2019-02-11 stsp if (fclose(blame->f) != 0 && err == NULL)
2888 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
2889 245d91c1 2018-07-12 stsp blame->f = NULL;
2891 57670559 2018-12-23 stsp if (blame->lines) {
2892 57670559 2018-12-23 stsp for (i = 0; i < blame->nlines; i++)
2893 57670559 2018-12-23 stsp free(blame->lines[i].id);
2894 57670559 2018-12-23 stsp free(blame->lines);
2895 57670559 2018-12-23 stsp blame->lines = NULL;
2897 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
2898 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
2900 245d91c1 2018-07-12 stsp return err;
2903 245d91c1 2018-07-12 stsp static const struct got_error *
2904 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2905 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
2906 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
2907 245d91c1 2018-07-12 stsp struct got_repository *repo)
2909 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
2910 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
2911 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
2912 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
2913 15a94983 2018-12-23 stsp int obj_type;
2915 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2917 15a94983 2018-12-23 stsp return err;
2918 15a94983 2018-12-23 stsp if (obj_id == NULL)
2919 15a94983 2018-12-23 stsp return got_error(GOT_ERR_NO_OBJ);
2921 15a94983 2018-12-23 stsp err = got_object_get_type(&obj_type, repo, obj_id);
2923 84451b3e 2018-07-10 stsp goto done;
2925 15a94983 2018-12-23 stsp if (obj_type != GOT_OBJ_TYPE_BLOB) {
2926 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2927 84451b3e 2018-07-10 stsp goto done;
2930 15a94983 2018-12-23 stsp err = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2932 a70480e0 2018-06-23 stsp goto done;
2933 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
2934 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
2935 638f9024 2019-05-13 stsp err = got_error_from_errno("got_opentemp");
2936 84451b3e 2018-07-10 stsp goto done;
2938 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2939 245d91c1 2018-07-12 stsp blame->f, blob);
2941 84451b3e 2018-07-10 stsp goto done;
2943 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2944 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
2945 638f9024 2019-05-13 stsp err = got_error_from_errno("calloc");
2946 84451b3e 2018-07-10 stsp goto done;
2949 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2951 bd24772e 2018-07-11 stsp goto done;
2953 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
2954 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
2955 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
2956 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
2957 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
2958 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
2959 245d91c1 2018-07-12 stsp goto done;
2961 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
2963 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
2964 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
2965 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
2966 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
2967 245d91c1 2018-07-12 stsp *blame_complete = 0;
2971 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
2972 27d434c2 2018-09-15 stsp free(obj_id);
2974 245d91c1 2018-07-12 stsp stop_blame(blame);
2975 245d91c1 2018-07-12 stsp return err;
2978 245d91c1 2018-07-12 stsp static const struct got_error *
2979 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
2980 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
2981 8b473291 2019-02-21 stsp struct got_repository *repo)
2983 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
2984 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2986 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
2988 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2990 7cbe629d 2018-08-04 stsp return err;
2992 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2993 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
2994 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
2995 fb2756b9 2018-08-04 stsp s->selected_line = 1;
2996 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
2997 fb2756b9 2018-08-04 stsp s->path = path;
2998 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
2999 638f9024 2019-05-13 stsp return got_error_from_errno("open_blame_view");
3000 fb2756b9 2018-08-04 stsp s->repo = repo;
3001 8b473291 2019-02-21 stsp s->refs = refs;
3002 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
3003 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
3005 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
3006 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
3007 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
3009 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
3010 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
3011 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
3012 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
3015 e5a0f69f 2018-08-18 stsp static const struct got_error *
3016 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
3018 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3019 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3021 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
3022 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
3024 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
3025 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
3026 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
3027 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3028 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
3031 e5a0f69f 2018-08-18 stsp free(s->path);
3033 e5a0f69f 2018-08-18 stsp return err;
3036 7cbe629d 2018-08-04 stsp static const struct got_error *
3037 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
3039 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3040 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
3041 2b380cc8 2018-10-24 stsp int errcode;
3043 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
3044 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
3045 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
3046 2b380cc8 2018-10-24 stsp if (errcode)
3047 2af4a041 2019-05-11 jcs return got_error_set_errno(errcode, "pthread_create");
3050 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
3051 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
3052 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
3053 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
3055 669b5ffa 2018-10-07 stsp view_vborder(view);
3056 e5a0f69f 2018-08-18 stsp return err;
3059 e5a0f69f 2018-08-18 stsp static const struct got_error *
3060 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
3061 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3063 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
3064 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
3065 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
3066 669b5ffa 2018-10-07 stsp int begin_x = 0;
3068 e5a0f69f 2018-08-18 stsp switch (ch) {
3070 1e37a5c2 2019-05-12 jcs s->done = 1;
3073 1e37a5c2 2019-05-12 jcs case KEY_UP:
3074 1e37a5c2 2019-05-12 jcs if (s->selected_line > 1)
3075 1e37a5c2 2019-05-12 jcs s->selected_line--;
3076 1e37a5c2 2019-05-12 jcs else if (s->selected_line == 1 &&
3077 1e37a5c2 2019-05-12 jcs s->first_displayed_line > 1)
3078 1e37a5c2 2019-05-12 jcs s->first_displayed_line--;
3080 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3081 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line == 1) {
3082 1e37a5c2 2019-05-12 jcs s->selected_line = 1;
3085 1e37a5c2 2019-05-12 jcs if (s->first_displayed_line > view->nlines - 2)
3086 1e37a5c2 2019-05-12 jcs s->first_displayed_line -=
3087 1e37a5c2 2019-05-12 jcs (view->nlines - 2);
3089 1e37a5c2 2019-05-12 jcs s->first_displayed_line = 1;
3092 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3093 1e37a5c2 2019-05-12 jcs if (s->selected_line < view->nlines - 2 &&
3094 1e37a5c2 2019-05-12 jcs s->first_displayed_line +
3095 1e37a5c2 2019-05-12 jcs s->selected_line <= s->blame.nlines)
3096 1e37a5c2 2019-05-12 jcs s->selected_line++;
3097 1e37a5c2 2019-05-12 jcs else if (s->last_displayed_line <
3098 1e37a5c2 2019-05-12 jcs s->blame.nlines)
3099 1e37a5c2 2019-05-12 jcs s->first_displayed_line++;
3102 1e37a5c2 2019-05-12 jcs case 'p': {
3103 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3104 1e37a5c2 2019-05-12 jcs id = get_selected_commit_id(s->blame.lines,
3105 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3106 1e37a5c2 2019-05-12 jcs if (id == NULL)
3108 1e37a5c2 2019-05-12 jcs if (ch == 'p') {
3109 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit;
3110 15a94983 2018-12-23 stsp struct got_object_qid *pid;
3111 1e37a5c2 2019-05-12 jcs struct got_object_id *blob_id = NULL;
3112 1e37a5c2 2019-05-12 jcs int obj_type;
3113 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit,
3114 1e37a5c2 2019-05-12 jcs s->repo, id);
3117 15a94983 2018-12-23 stsp pid = SIMPLEQ_FIRST(
3118 15a94983 2018-12-23 stsp got_object_commit_get_parent_ids(commit));
3119 1e37a5c2 2019-05-12 jcs if (pid == NULL) {
3120 15a94983 2018-12-23 stsp got_object_commit_close(commit);
3123 1e37a5c2 2019-05-12 jcs /* Check if path history ends here. */
3124 1e37a5c2 2019-05-12 jcs err = got_object_id_by_path(&blob_id, s->repo,
3125 1e37a5c2 2019-05-12 jcs pid->id, s->path);
3126 e5a0f69f 2018-08-18 stsp if (err) {
3127 1e37a5c2 2019-05-12 jcs if (err->code == GOT_ERR_NO_TREE_ENTRY)
3128 1e37a5c2 2019-05-12 jcs err = NULL;
3129 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3132 1e37a5c2 2019-05-12 jcs err = got_object_get_type(&obj_type, s->repo,
3134 1e37a5c2 2019-05-12 jcs free(blob_id);
3135 1e37a5c2 2019-05-12 jcs /* Can't blame non-blob type objects. */
3136 1e37a5c2 2019-05-12 jcs if (obj_type != GOT_OBJ_TYPE_BLOB) {
3137 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3140 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3142 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3144 1e37a5c2 2019-05-12 jcs if (got_object_id_cmp(id,
3145 1e37a5c2 2019-05-12 jcs s->blamed_commit->id) == 0)
3147 1e37a5c2 2019-05-12 jcs err = got_object_qid_alloc(&s->blamed_commit,
3152 1e37a5c2 2019-05-12 jcs s->done = 1;
3153 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3154 1e37a5c2 2019-05-12 jcs s->done = 0;
3155 1e37a5c2 2019-05-12 jcs if (thread_err)
3157 1e37a5c2 2019-05-12 jcs SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
3158 1e37a5c2 2019-05-12 jcs s->blamed_commit, entry);
3159 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3160 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3161 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof,
3162 1e37a5c2 2019-05-12 jcs s->path, s->blamed_commit->id, s->repo);
3167 1e37a5c2 2019-05-12 jcs case 'B': {
3168 1e37a5c2 2019-05-12 jcs struct got_object_qid *first;
3169 1e37a5c2 2019-05-12 jcs first = SIMPLEQ_FIRST(&s->blamed_commits);
3170 1e37a5c2 2019-05-12 jcs if (!got_object_id_cmp(first->id, s->commit_id))
3172 1e37a5c2 2019-05-12 jcs s->done = 1;
3173 1e37a5c2 2019-05-12 jcs thread_err = stop_blame(&s->blame);
3174 1e37a5c2 2019-05-12 jcs s->done = 0;
3175 1e37a5c2 2019-05-12 jcs if (thread_err)
3177 1e37a5c2 2019-05-12 jcs SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
3178 1e37a5c2 2019-05-12 jcs got_object_qid_free(s->blamed_commit);
3179 1e37a5c2 2019-05-12 jcs s->blamed_commit =
3180 1e37a5c2 2019-05-12 jcs SIMPLEQ_FIRST(&s->blamed_commits);
3181 1e37a5c2 2019-05-12 jcs err = run_blame(&s->blame, view, &s->blame_complete,
3182 1e37a5c2 2019-05-12 jcs &s->first_displayed_line, &s->last_displayed_line,
3183 1e37a5c2 2019-05-12 jcs &s->selected_line, &s->done, &s->eof, s->path,
3184 1e37a5c2 2019-05-12 jcs s->blamed_commit->id, s->repo);
3189 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
3190 1e37a5c2 2019-05-12 jcs case '\r': {
3191 1e37a5c2 2019-05-12 jcs struct got_object_id *id = NULL;
3192 1e37a5c2 2019-05-12 jcs struct got_object_qid *pid;
3193 1e37a5c2 2019-05-12 jcs struct got_commit_object *commit = NULL;
3194 1e37a5c2 2019-05-12 jcs id = get_selected_commit_id(s->blame.lines,
3195 1e37a5c2 2019-05-12 jcs s->first_displayed_line, s->selected_line);
3196 1e37a5c2 2019-05-12 jcs if (id == NULL)
3198 1e37a5c2 2019-05-12 jcs err = got_object_open_as_commit(&commit, s->repo, id);
3201 1e37a5c2 2019-05-12 jcs pid = SIMPLEQ_FIRST(
3202 1e37a5c2 2019-05-12 jcs got_object_commit_get_parent_ids(commit));
3203 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
3204 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
3205 1e37a5c2 2019-05-12 jcs diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
3206 1e37a5c2 2019-05-12 jcs if (diff_view == NULL) {
3207 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3208 638f9024 2019-05-13 stsp err = got_error_from_errno("view_open");
3211 1e37a5c2 2019-05-12 jcs err = open_diff_view(diff_view, pid ? pid->id : NULL,
3212 1e37a5c2 2019-05-12 jcs id, NULL, s->refs, s->repo);
3213 1e37a5c2 2019-05-12 jcs got_object_commit_close(commit);
3215 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3218 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
3219 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
3222 1e37a5c2 2019-05-12 jcs err = view_set_child(view, diff_view);
3224 1e37a5c2 2019-05-12 jcs view_close(diff_view);
3227 1e37a5c2 2019-05-12 jcs *focus_view = diff_view;
3228 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
3230 1e37a5c2 2019-05-12 jcs *new_view = diff_view;
3235 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3237 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3238 1e37a5c2 2019-05-12 jcs s->selected_line >= MIN(s->blame.nlines,
3239 00ba99a7 2019-05-12 jcs view->nlines - 2)) {
3242 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line >= s->blame.nlines &&
3243 1e37a5c2 2019-05-12 jcs s->selected_line < view->nlines - 2) {
3244 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3245 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3248 1e37a5c2 2019-05-12 jcs if (s->last_displayed_line + view->nlines - 2
3249 1e37a5c2 2019-05-12 jcs <= s->blame.nlines)
3250 1e37a5c2 2019-05-12 jcs s->first_displayed_line +=
3251 1e37a5c2 2019-05-12 jcs view->nlines - 2;
3253 1e37a5c2 2019-05-12 jcs s->first_displayed_line =
3254 1e37a5c2 2019-05-12 jcs s->blame.nlines -
3255 1e37a5c2 2019-05-12 jcs (view->nlines - 3);
3257 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
3258 1e37a5c2 2019-05-12 jcs if (s->selected_line > view->nlines - 2) {
3259 1e37a5c2 2019-05-12 jcs s->selected_line = MIN(s->blame.nlines,
3260 1e37a5c2 2019-05-12 jcs view->nlines - 2);
3266 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
3269 a70480e0 2018-06-23 stsp static const struct got_error *
3270 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
3272 a70480e0 2018-06-23 stsp const struct got_error *error;
3273 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
3274 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3275 eb41ed75 2019-02-05 stsp struct got_worktree *worktree = NULL;
3276 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3277 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3278 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
3280 e1cd8fed 2018-08-01 stsp struct tog_view *view;
3282 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3284 a70480e0 2018-06-23 stsp #ifndef PROFILE
3285 8e94dd5b 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3286 8e94dd5b 2019-01-04 stsp NULL) == -1)
3287 a70480e0 2018-06-23 stsp err(1, "pledge");
3290 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3291 a70480e0 2018-06-23 stsp switch (ch) {
3293 a70480e0 2018-06-23 stsp commit_id_str = optarg;
3296 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
3297 69069811 2018-08-02 stsp if (repo_path == NULL)
3298 69069811 2018-08-02 stsp err(1, "-r option");
3301 17020d27 2019-03-07 stsp usage_blame();
3302 a70480e0 2018-06-23 stsp /* NOTREACHED */
3306 a70480e0 2018-06-23 stsp argc -= optind;
3307 a70480e0 2018-06-23 stsp argv += optind;
3309 69069811 2018-08-02 stsp if (argc == 1)
3310 69069811 2018-08-02 stsp path = argv[0];
3312 a70480e0 2018-06-23 stsp usage_blame();
3314 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
3315 69069811 2018-08-02 stsp if (cwd == NULL) {
3316 638f9024 2019-05-13 stsp error = got_error_from_errno("getcwd");
3317 69069811 2018-08-02 stsp goto done;
3319 69069811 2018-08-02 stsp if (repo_path == NULL) {
3320 eb41ed75 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3321 eb41ed75 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3322 69069811 2018-08-02 stsp goto done;
3324 eb41ed75 2019-02-05 stsp error = NULL;
3325 eb41ed75 2019-02-05 stsp if (worktree) {
3326 eb41ed75 2019-02-05 stsp repo_path =
3327 eb41ed75 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3328 eb41ed75 2019-02-05 stsp if (repo_path == NULL)
3329 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3330 eb41ed75 2019-02-05 stsp if (error)
3331 eb41ed75 2019-02-05 stsp goto done;
3333 eb41ed75 2019-02-05 stsp repo_path = strdup(cwd);
3334 eb41ed75 2019-02-05 stsp if (repo_path == NULL) {
3335 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3336 eb41ed75 2019-02-05 stsp goto done;
3341 a915003a 2019-02-05 stsp init_curses();
3343 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
3344 c02c541e 2019-03-29 stsp if (error != NULL)
3345 8e94dd5b 2019-01-04 stsp goto done;
3347 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3348 c02c541e 2019-03-29 stsp if (error)
3349 92205607 2019-01-04 stsp goto done;
3351 eb41ed75 2019-02-05 stsp if (worktree) {
3352 eb41ed75 2019-02-05 stsp const char *prefix = got_worktree_get_path_prefix(worktree);
3353 eb41ed75 2019-02-05 stsp char *p, *worktree_subdir = cwd +
3354 eb41ed75 2019-02-05 stsp strlen(got_worktree_get_root_path(worktree));
3355 eb41ed75 2019-02-05 stsp if (asprintf(&p, "%s%s%s%s%s",
3356 eb41ed75 2019-02-05 stsp prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3357 eb41ed75 2019-02-05 stsp worktree_subdir, worktree_subdir[0] ? "/" : "",
3358 eb41ed75 2019-02-05 stsp path) == -1) {
3359 638f9024 2019-05-13 stsp error = got_error_from_errno("asprintf");
3360 eb41ed75 2019-02-05 stsp goto done;
3362 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, p, 0);
3365 eb41ed75 2019-02-05 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
3367 eb41ed75 2019-02-05 stsp if (error)
3368 69069811 2018-08-02 stsp goto done;
3370 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
3371 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
3372 2f17228e 2019-05-12 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
3373 a70480e0 2018-06-23 stsp if (error != NULL)
3374 66b4983c 2018-06-23 stsp goto done;
3375 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
3376 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
3378 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
3379 15a94983 2018-12-23 stsp commit_id_str);
3381 a19e88aa 2018-06-23 stsp if (error != NULL)
3382 8b473291 2019-02-21 stsp goto done;
3384 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
3385 8b473291 2019-02-21 stsp if (error)
3386 a19e88aa 2018-06-23 stsp goto done;
3388 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
3389 e1cd8fed 2018-08-01 stsp if (view == NULL) {
3390 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
3391 e1cd8fed 2018-08-01 stsp goto done;
3393 8b473291 2019-02-21 stsp error = open_blame_view(view, in_repo_path, commit_id, &refs, repo);
3394 7cbe629d 2018-08-04 stsp if (error)
3395 7cbe629d 2018-08-04 stsp goto done;
3396 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3398 69069811 2018-08-02 stsp free(repo_path);
3399 69069811 2018-08-02 stsp free(cwd);
3400 a70480e0 2018-06-23 stsp free(commit_id);
3401 eb41ed75 2019-02-05 stsp if (worktree)
3402 eb41ed75 2019-02-05 stsp got_worktree_close(worktree);
3404 a70480e0 2018-06-23 stsp got_repo_close(repo);
3405 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
3406 a70480e0 2018-06-23 stsp return error;
3409 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3410 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
3411 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
3412 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
3413 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
3414 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
3415 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
3417 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3418 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
3419 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
3420 ffd1d5e5 2018-06-23 stsp int width, n;
3422 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
3424 f7d12f7e 2018-08-01 stsp werase(view->window);
3426 ffd1d5e5 2018-06-23 stsp if (limit == 0)
3427 ffd1d5e5 2018-06-23 stsp return NULL;
3429 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
3431 ffd1d5e5 2018-06-23 stsp return err;
3432 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3433 a3404814 2018-09-02 stsp wstandout(view->window);
3434 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3435 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
3436 a3404814 2018-09-02 stsp wstandend(view->window);
3437 2550e4c3 2018-07-13 stsp free(wline);
3438 2550e4c3 2018-07-13 stsp wline = NULL;
3439 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3440 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3441 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3442 ffd1d5e5 2018-06-23 stsp return NULL;
3443 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
3445 ce52c690 2018-06-23 stsp return err;
3446 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3447 2550e4c3 2018-07-13 stsp free(wline);
3448 2550e4c3 2018-07-13 stsp wline = NULL;
3449 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3450 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3451 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3452 ffd1d5e5 2018-06-23 stsp return NULL;
3453 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3454 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
3455 a1eca9bb 2018-06-23 stsp return NULL;
3457 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3458 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
3459 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
3460 0cf4efb1 2018-09-29 stsp if (view->focussed)
3461 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3462 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
3464 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
3465 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
3466 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3467 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3468 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3469 ffd1d5e5 2018-06-23 stsp return NULL;
3473 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
3474 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3477 ffd1d5e5 2018-06-23 stsp while (te) {
3478 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
3480 1d13200f 2018-07-12 stsp if (show_ids) {
3481 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
3483 638f9024 2019-05-13 stsp return got_error_from_errno(
3484 230a42bd 2019-05-11 jcs "got_object_id_str");
3486 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
3487 d8355ef1 2019-02-10 stsp te->name, S_ISDIR(te->mode) ? "/" :
3488 d8355ef1 2019-02-10 stsp ((te->mode & S_IXUSR) ? "*" : "")) == -1) {
3489 1d13200f 2018-07-12 stsp free(id_str);
3490 638f9024 2019-05-13 stsp return got_error_from_errno("asprintf");
3492 1d13200f 2018-07-12 stsp free(id_str);
3493 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
3494 ffd1d5e5 2018-06-23 stsp if (err) {
3495 ffd1d5e5 2018-06-23 stsp free(line);
3498 ffd1d5e5 2018-06-23 stsp if (n == selected) {
3499 0cf4efb1 2018-09-29 stsp if (view->focussed)
3500 0cf4efb1 2018-09-29 stsp wstandout(view->window);
3501 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
3503 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
3504 30f8fd5e 2019-06-04 stsp if (width < view->ncols - 1)
3505 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
3506 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
3507 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3508 ffd1d5e5 2018-06-23 stsp free(line);
3509 2550e4c3 2018-07-13 stsp free(wline);
3510 2550e4c3 2018-07-13 stsp wline = NULL;
3512 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3513 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
3514 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3516 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3519 ffd1d5e5 2018-06-23 stsp return err;
3522 ffd1d5e5 2018-06-23 stsp static void
3523 34bc9ec9 2019-02-22 stsp tree_scroll_up(struct tog_view *view,
3524 34bc9ec9 2019-02-22 stsp struct got_tree_entry **first_displayed_entry, int maxscroll,
3525 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
3527 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
3530 00ba99a7 2019-05-12 jcs if (*first_displayed_entry == NULL)
3533 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3534 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
3535 ffd1d5e5 2018-06-23 stsp if (!isroot)
3536 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3540 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
3541 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
3542 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
3543 ffd1d5e5 2018-06-23 stsp prev = te;
3544 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3546 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
3547 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3549 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3550 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3553 768394f3 2019-01-24 stsp static int
3554 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3555 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
3556 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
3558 768394f3 2019-01-24 stsp struct got_tree_entry *next, *last;
3559 ffd1d5e5 2018-06-23 stsp int n = 0;
3561 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
3562 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3564 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
3565 768394f3 2019-01-24 stsp last = last_displayed_entry;
3566 768394f3 2019-01-24 stsp while (next && last && n++ < maxscroll) {
3567 768394f3 2019-01-24 stsp last = SIMPLEQ_NEXT(last, entry);
3568 768394f3 2019-01-24 stsp if (last) {
3569 768394f3 2019-01-24 stsp *first_displayed_entry = next;
3570 768394f3 2019-01-24 stsp next = SIMPLEQ_NEXT(next, entry);
3576 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3577 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
3578 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
3580 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
3581 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
3582 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
3584 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
3585 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
3587 ce52c690 2018-06-23 stsp len += strlen(te->name);
3589 ce52c690 2018-06-23 stsp *path = calloc(1, len);
3590 ffd1d5e5 2018-06-23 stsp if (path == NULL)
3591 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
3593 ce52c690 2018-06-23 stsp (*path)[0] = '/';
3594 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
3595 d9765a41 2018-06-23 stsp while (pt) {
3596 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3597 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3598 cb2ebc8a 2018-06-23 stsp goto done;
3600 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
3601 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3602 cb2ebc8a 2018-06-23 stsp goto done;
3604 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3607 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
3608 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3609 ce52c690 2018-06-23 stsp goto done;
3613 ce52c690 2018-06-23 stsp if (err) {
3614 ce52c690 2018-06-23 stsp free(*path);
3615 ce52c690 2018-06-23 stsp *path = NULL;
3617 ce52c690 2018-06-23 stsp return err;
3620 ce52c690 2018-06-23 stsp static const struct got_error *
3621 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
3622 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3623 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3624 8b473291 2019-02-21 stsp struct got_repository *repo)
3626 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
3627 ce52c690 2018-06-23 stsp char *path;
3628 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
3630 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
3632 ce52c690 2018-06-23 stsp return err;
3634 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3635 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
3636 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
3638 8b473291 2019-02-21 stsp err = open_blame_view(blame_view, path, commit_id, refs, repo);
3639 e5a0f69f 2018-08-18 stsp if (err) {
3640 e5a0f69f 2018-08-18 stsp view_close(blame_view);
3641 e5a0f69f 2018-08-18 stsp free(path);
3643 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
3644 69efd4c4 2018-07-18 stsp return err;
3647 69efd4c4 2018-07-18 stsp static const struct got_error *
3648 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
3649 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3650 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3651 8b473291 2019-02-21 stsp struct got_repository *repo)
3653 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
3654 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
3655 69efd4c4 2018-07-18 stsp char *path;
3657 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3658 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
3659 638f9024 2019-05-13 stsp return got_error_from_errno("view_open");
3661 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
3663 69efd4c4 2018-07-18 stsp return err;
3665 8b473291 2019-02-21 stsp err = open_log_view(log_view, commit_id, refs, repo, path, 0);
3667 e5a0f69f 2018-08-18 stsp view_close(log_view);
3669 e5a0f69f 2018-08-18 stsp *new_view = log_view;
3670 cb2ebc8a 2018-06-23 stsp free(path);
3671 cb2ebc8a 2018-06-23 stsp return err;
3674 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3675 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
3676 8b473291 2019-02-21 stsp struct got_object_id *commit_id, struct got_reflist_head *refs,
3677 8b473291 2019-02-21 stsp struct got_repository *repo)
3679 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3680 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
3681 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3683 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
3685 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
3686 ffd1d5e5 2018-06-23 stsp if (err != NULL)
3687 ffd1d5e5 2018-06-23 stsp goto done;
3689 c1124f18 2018-12-23 stsp if (asprintf(&s->tree_label, "commit %s", commit_id_str) == -1) {
3690 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
3691 ffd1d5e5 2018-06-23 stsp goto done;
3694 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
3695 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
3696 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3697 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
3698 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
3699 638f9024 2019-05-13 stsp err = got_error_from_errno("got_object_id_dup");
3700 6484ec90 2018-09-29 stsp goto done;
3702 8b473291 2019-02-21 stsp s->refs = refs;
3703 fb2756b9 2018-08-04 stsp s->repo = repo;
3705 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
3706 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
3707 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
3709 ad80ab7b 2018-08-04 stsp free(commit_id_str);
3710 6484ec90 2018-09-29 stsp if (err) {
3711 fb2756b9 2018-08-04 stsp free(s->tree_label);
3712 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3714 ad80ab7b 2018-08-04 stsp return err;
3717 e5a0f69f 2018-08-18 stsp static const struct got_error *
3718 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
3720 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3722 fb2756b9 2018-08-04 stsp free(s->tree_label);
3723 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3724 6484ec90 2018-09-29 stsp free(s->commit_id);
3725 6484ec90 2018-09-29 stsp s->commit_id = NULL;
3726 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
3727 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
3728 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
3729 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
3730 ad80ab7b 2018-08-04 stsp free(parent);
3733 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
3734 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
3735 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
3737 e5a0f69f 2018-08-18 stsp return NULL;
3740 ad80ab7b 2018-08-04 stsp static const struct got_error *
3741 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
3743 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
3744 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3745 e5a0f69f 2018-08-18 stsp char *parent_path;
3747 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
3749 e5a0f69f 2018-08-18 stsp return err;
3751 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
3752 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
3753 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3754 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
3755 e5a0f69f 2018-08-18 stsp free(parent_path);
3757 669b5ffa 2018-10-07 stsp view_vborder(view);
3758 e5a0f69f 2018-08-18 stsp return err;
3761 e5a0f69f 2018-08-18 stsp static const struct got_error *
3762 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3763 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3765 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3766 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
3767 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
3768 768394f3 2019-01-24 stsp int begin_x = 0, nscrolled;
3770 e5a0f69f 2018-08-18 stsp switch (ch) {
3772 1e37a5c2 2019-05-12 jcs s->show_ids = !s->show_ids;
3775 1e37a5c2 2019-05-12 jcs if (!s->selected_entry)
3777 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view))
3778 1e37a5c2 2019-05-12 jcs begin_x = view_split_begin_x(view->begin_x);
3779 1e37a5c2 2019-05-12 jcs err = log_tree_entry(&log_view, begin_x,
3780 1e37a5c2 2019-05-12 jcs s->selected_entry, &s->parents,
3781 1e37a5c2 2019-05-12 jcs s->commit_id, s->refs, s->repo);
3782 1e37a5c2 2019-05-12 jcs if (view_is_parent_view(view)) {
3783 1e37a5c2 2019-05-12 jcs err = view_close_child(view);
3785 1e37a5c2 2019-05-12 jcs return err;
3786 1e37a5c2 2019-05-12 jcs err = view_set_child(view, log_view);
3788 1e37a5c2 2019-05-12 jcs view_close(log_view);
3791 1e37a5c2 2019-05-12 jcs *focus_view = log_view;
3792 1e37a5c2 2019-05-12 jcs view->child_focussed = 1;
3794 1e37a5c2 2019-05-12 jcs *new_view = log_view;
3797 1e37a5c2 2019-05-12 jcs case KEY_UP:
3798 1e37a5c2 2019-05-12 jcs if (s->selected > 0) {
3799 1e37a5c2 2019-05-12 jcs s->selected--;
3800 1e37a5c2 2019-05-12 jcs if (s->selected == 0)
3803 1e37a5c2 2019-05-12 jcs if (s->selected > 0)
3805 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry, 1,
3806 1e37a5c2 2019-05-12 jcs s->entries, s->tree == s->root);
3808 1e37a5c2 2019-05-12 jcs case KEY_PPAGE:
3809 1e37a5c2 2019-05-12 jcs tree_scroll_up(view, &s->first_displayed_entry,
3810 1e37a5c2 2019-05-12 jcs MAX(0, view->nlines - 4 - s->selected), s->entries,
3811 1e37a5c2 2019-05-12 jcs s->tree == s->root);
3812 1e37a5c2 2019-05-12 jcs s->selected = 0;
3813 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_FIRST(&s->entries->head) ==
3814 1e37a5c2 2019-05-12 jcs s->first_displayed_entry && s->tree != s->root)
3815 1e37a5c2 2019-05-12 jcs s->first_displayed_entry = NULL;
3818 1e37a5c2 2019-05-12 jcs case KEY_DOWN:
3819 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1) {
3820 1e37a5c2 2019-05-12 jcs s->selected++;
3823 00ba99a7 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry) == NULL)
3824 1e37a5c2 2019-05-12 jcs /* can't scroll any further */
3826 1e37a5c2 2019-05-12 jcs tree_scroll_down(&s->first_displayed_entry, 1,
3827 1e37a5c2 2019-05-12 jcs s->last_displayed_entry, s->entries);
3829 1e37a5c2 2019-05-12 jcs case KEY_NPAGE:
3830 1e37a5c2 2019-05-12 jcs if (SIMPLEQ_NEXT(s->last_displayed_entry, entry)
3832 1e37a5c2 2019-05-12 jcs /* can't scroll any further; move cursor down */
3833 1e37a5c2 2019-05-12 jcs if (s->selected < s->ndisplayed - 1)
3834 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
3837 1e37a5c2 2019-05-12 jcs nscrolled = tree_scroll_down(&s->first_displayed_entry,
3838 1e37a5c2 2019-05-12 jcs view->nlines, s->last_displayed_entry, s->entries);
3839 1e37a5c2 2019-05-12 jcs if (nscrolled < view->nlines) {
3840 1e37a5c2 2019-05-12 jcs int ndisplayed = 0;
3841 1e37a5c2 2019-05-12 jcs struct got_tree_entry *te;
3842 1e37a5c2 2019-05-12 jcs te = s->first_displayed_entry;
3844 1e37a5c2 2019-05-12 jcs ndisplayed++;
3845 1e37a5c2 2019-05-12 jcs te = SIMPLEQ_NEXT(te, entry);
3846 1e37a5c2 2019-05-12 jcs } while (te);
3847 1e37a5c2 2019-05-12 jcs s->selected = ndisplayed - 1;
3850 1e37a5c2 2019-05-12 jcs case KEY_ENTER:
3852 1e37a5c2 2019-05-12 jcs case KEY_BACKSPACE:
3853 6f10d58e 2019-05-12 stsp if (s->selected_entry == NULL || ch == KEY_BACKSPACE) {
3854 6f10d58e 2019-05-12 stsp struct tog_parent_tree *parent;
3855 1e37a5c2 2019-05-12 jcs /* user selected '..' */
3856 1e37a5c2 2019-05-12 jcs if (s->tree == s->root)
3858 1e37a5c2 2019-05-12 jcs parent = TAILQ_FIRST(&s->parents);
3859 1e37a5c2 2019-05-12 jcs TAILQ_REMOVE(&s->parents, parent,
3861 1e37a5c2 2019-05-12 jcs got_object_tree_close(s->tree);
3862 1e37a5c2 2019-05-12 jcs s->tree = parent->tree;
3863 1e37a5c2 2019-05-12 jcs s->entries =
3864 1e37a5c2 2019-05-12 jcs got_object_tree_get_entries(s->tree);
3865 1e37a5c2 2019-05-12 jcs s->first_displayed_entry =
3866 1e37a5c2 2019-05-12 jcs parent->first_displayed_entry;
3867 1e37a5c2 2019-05-12 jcs s->selected_entry =
3868 1e37a5c2 2019-05-12 jcs parent->selected_entry;
3869 1e37a5c2 2019-05-12 jcs s->selected = parent->selected;
3870 1e37a5c2 2019-05-12 jcs free(parent);
3871 1e37a5c2 2019-05-12 jcs } else if (S_ISDIR(s->selected_entry->mode)) {
3872 941e9f74 2019-05-21 stsp struct got_tree_object *subtree;
3873 941e9f74 2019-05-21 stsp err = got_object_open_as_tree(&subtree,
3874 1e37a5c2 2019-05-12 jcs s->repo, s->selected_entry->id);
3877 941e9f74 2019-05-21 stsp err = tree_view_visit_subtree(subtree, s);
3878 941e9f74 2019-05-21 stsp if (err) {
3879 941e9f74 2019-05-21 stsp got_object_tree_close(subtree);
3882 1e37a5c2 2019-05-12 jcs } else if (S_ISREG(s->selected_entry->mode)) {
3883 1e37a5c2 2019-05-12 jcs struct tog_view *blame_view;
3884 1e37a5c2 2019-05-12 jcs int begin_x = view_is_parent_view(view) ?
3885 1e37a5c2 2019-05-12 jcs view_split_begin_x(view->begin_x) : 0;
3887 1e37a5c2 2019-05-12 jcs err = blame_tree_entry(&blame_view, begin_x,
3888 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
3889 8b473291 2019-02-21 stsp s->commit_id, s->refs, s->repo);
3892 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3893 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3895 669b5ffa 2018-10-07 stsp return err;
3896 1e37a5c2 2019-05-12 jcs err = view_set_child(view, blame_view);
3897 669b5ffa 2018-10-07 stsp if (err) {
3898 1e37a5c2 2019-05-12 jcs view_close(blame_view);
3901 1e37a5c2 2019-05-12 jcs *focus_view = blame_view;
3902 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3904 1e37a5c2 2019-05-12 jcs *new_view = blame_view;
3907 1e37a5c2 2019-05-12 jcs case KEY_RESIZE:
3908 1e37a5c2 2019-05-12 jcs if (s->selected > view->nlines)
3909 1e37a5c2 2019-05-12 jcs s->selected = s->ndisplayed - 1;
3915 ffd1d5e5 2018-06-23 stsp return err;
3918 ffd1d5e5 2018-06-23 stsp __dead static void
3919 ffd1d5e5 2018-06-23 stsp usage_tree(void)
3922 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3923 ffd1d5e5 2018-06-23 stsp getprogname());
3927 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3928 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
3930 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
3931 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
3932 8b473291 2019-02-21 stsp struct got_reflist_head refs;
3933 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
3934 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3935 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
3936 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
3937 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
3939 5221c383 2018-08-01 stsp struct tog_view *view;
3941 70ac5f84 2019-03-28 stsp SIMPLEQ_INIT(&refs);
3943 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
3944 d188b9a6 2019-01-04 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd unveil",
3945 d188b9a6 2019-01-04 stsp NULL) == -1)
3946 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
3949 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
3950 ffd1d5e5 2018-06-23 stsp switch (ch) {
3952 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
3955 17020d27 2019-03-07 stsp usage_tree();
3956 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
3960 ffd1d5e5 2018-06-23 stsp argc -= optind;
3961 ffd1d5e5 2018-06-23 stsp argv += optind;
3963 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
3964 52185f70 2019-02-05 stsp struct got_worktree *worktree;
3965 52185f70 2019-02-05 stsp char *cwd = getcwd(NULL, 0);
3966 52185f70 2019-02-05 stsp if (cwd == NULL)
3967 638f9024 2019-05-13 stsp return got_error_from_errno("getcwd");
3968 52185f70 2019-02-05 stsp error = got_worktree_open(&worktree, cwd);
3969 52185f70 2019-02-05 stsp if (error && error->code != GOT_ERR_NOT_WORKTREE)
3970 52185f70 2019-02-05 stsp goto done;
3971 52185f70 2019-02-05 stsp if (worktree) {
3972 52185f70 2019-02-05 stsp free(cwd);
3973 52185f70 2019-02-05 stsp repo_path =
3974 52185f70 2019-02-05 stsp strdup(got_worktree_get_repo_path(worktree));
3975 52185f70 2019-02-05 stsp got_worktree_close(worktree);
3977 52185f70 2019-02-05 stsp repo_path = cwd;
3978 52185f70 2019-02-05 stsp if (repo_path == NULL) {
3979 638f9024 2019-05-13 stsp error = got_error_from_errno("strdup");
3980 52185f70 2019-02-05 stsp goto done;
3982 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
3983 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
3984 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3985 638f9024 2019-05-13 stsp return got_error_from_errno2("realpath", argv[0]);
3987 ffd1d5e5 2018-06-23 stsp usage_log();
3989 a915003a 2019-02-05 stsp init_curses();
3991 c02c541e 2019-03-29 stsp error = got_repo_open(&repo, repo_path);
3992 c02c541e 2019-03-29 stsp if (error != NULL)
3993 52185f70 2019-02-05 stsp goto done;
3995 c02c541e 2019-03-29 stsp error = apply_unveil(got_repo_get_path(repo), NULL);
3996 c02c541e 2019-03-29 stsp if (error)
3997 52185f70 2019-02-05 stsp goto done;
3999 15a94983 2018-12-23 stsp if (commit_id_arg == NULL)
4000 19e70ad6 2019-05-14 stsp error = get_head_commit_id(&commit_id, GOT_REF_HEAD, repo);
4002 15a94983 2018-12-23 stsp error = got_object_resolve_id_str(&commit_id, repo,
4003 15a94983 2018-12-23 stsp commit_id_arg);
4004 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4005 ffd1d5e5 2018-06-23 stsp goto done;
4007 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
4008 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4009 ffd1d5e5 2018-06-23 stsp goto done;
4011 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
4012 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
4013 ffd1d5e5 2018-06-23 stsp if (error != NULL)
4014 8b473291 2019-02-21 stsp goto done;
4016 8b473291 2019-02-21 stsp error = got_ref_list(&refs, repo);
4017 8b473291 2019-02-21 stsp if (error)
4018 ffd1d5e5 2018-06-23 stsp goto done;
4020 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
4021 5221c383 2018-08-01 stsp if (view == NULL) {
4022 638f9024 2019-05-13 stsp error = got_error_from_errno("view_open");
4023 5221c383 2018-08-01 stsp goto done;
4025 8b473291 2019-02-21 stsp error = open_tree_view(view, tree, commit_id, &refs, repo);
4026 ad80ab7b 2018-08-04 stsp if (error)
4027 ad80ab7b 2018-08-04 stsp goto done;
4028 e5a0f69f 2018-08-18 stsp error = view_loop(view);
4030 52185f70 2019-02-05 stsp free(repo_path);
4031 ffd1d5e5 2018-06-23 stsp free(commit_id);
4032 ffd1d5e5 2018-06-23 stsp if (commit)
4033 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
4035 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
4037 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
4038 e2e879a0 2019-03-11 stsp got_ref_list_free(&refs);
4039 ffd1d5e5 2018-06-23 stsp return error;
4042 4ed7e80c 2018-05-20 stsp __dead static void
4043 9f7d7167 2018-04-29 stsp usage(void)
4047 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
4048 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
4049 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
4050 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
4051 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
4056 c2301be8 2018-04-30 stsp static char **
4057 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
4059 c2301be8 2018-04-30 stsp char **argv;
4060 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
4062 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
4063 c2301be8 2018-04-30 stsp if (argv == NULL)
4064 c2301be8 2018-04-30 stsp err(1, "calloc");
4065 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
4066 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
4067 c2301be8 2018-04-30 stsp err(1, "calloc");
4068 c2301be8 2018-04-30 stsp if (arg1) {
4069 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
4070 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
4071 c2301be8 2018-04-30 stsp err(1, "calloc");
4074 c2301be8 2018-04-30 stsp return argv;
4078 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
4080 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
4081 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
4082 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
4083 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
4085 289e3cbf 2019-02-04 stsp setlocale(LC_CTYPE, "");
4087 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
4088 9f7d7167 2018-04-29 stsp switch (ch) {
4090 9f7d7167 2018-04-29 stsp hflag = 1;
4094 9f7d7167 2018-04-29 stsp /* NOTREACHED */
4098 9f7d7167 2018-04-29 stsp argc -= optind;
4099 9f7d7167 2018-04-29 stsp argv += optind;
4100 9f7d7167 2018-04-29 stsp optind = 0;
4101 c2301be8 2018-04-30 stsp optreset = 1;
4103 c2301be8 2018-04-30 stsp if (argc == 0) {
4104 f29d3e89 2018-06-23 stsp if (hflag)
4106 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
4107 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
4108 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
4113 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
4114 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
4115 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
4116 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
4117 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
4118 9f7d7167 2018-04-29 stsp if (hflag)
4119 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
4123 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
4124 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
4125 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
4126 c2301be8 2018-04-30 stsp if (repo_path) {
4127 c2301be8 2018-04-30 stsp struct got_repository *repo;
4128 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
4129 c2301be8 2018-04-30 stsp if (error == NULL)
4130 c2301be8 2018-04-30 stsp got_repo_close(repo);
4132 638f9024 2019-05-13 stsp error = got_error_from_errno2("realpath",
4134 c2301be8 2018-04-30 stsp if (error) {
4135 f29d3e89 2018-06-23 stsp if (hflag) {
4136 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
4137 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
4141 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
4142 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
4143 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
4144 ad7de8d9 2018-04-30 stsp free(repo_path);
4147 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
4148 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
4150 c2301be8 2018-04-30 stsp free(repo_path);
4154 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
4155 9f7d7167 2018-04-29 stsp if (error)
4156 9f7d7167 2018-04-29 stsp goto done;
4159 c2301be8 2018-04-30 stsp free(cmd_argv);
4160 9f7d7167 2018-04-29 stsp if (error)
4161 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
