2 9f7d7167 2018-04-29 stsp * Copyright (c) 2018 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"
51 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
55 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
59 9f7d7167 2018-04-29 stsp #ifndef nitems
60 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 9f7d7167 2018-04-29 stsp struct tog_cmd {
64 c2301be8 2018-04-30 stsp const char *name;
65 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
66 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
67 c2301be8 2018-04-30 stsp const char *descr;
70 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
71 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
72 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
73 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
74 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
76 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
77 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
78 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
79 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
81 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
82 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
83 9f7d7167 2018-04-29 stsp "show repository history" },
84 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
85 9f7d7167 2018-04-29 stsp "compare files and directories" },
86 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
87 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
88 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
89 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
92 d6b05b5b 2018-08-04 stsp enum tog_view_type {
93 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
94 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
95 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
96 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
99 ad80ab7b 2018-08-04 stsp struct tog_diff_view_state {
100 a3404814 2018-09-02 stsp struct got_object_id *id1, *id2;
102 ad80ab7b 2018-08-04 stsp int first_displayed_line;
103 ad80ab7b 2018-08-04 stsp int last_displayed_line;
105 48ae06ee 2018-10-18 stsp int diff_context;
106 48ae06ee 2018-10-18 stsp struct got_repository *repo;
109 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
110 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
111 ba4f502b 2018-08-04 stsp struct got_object_id *id;
112 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
115 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
116 ba4f502b 2018-08-04 stsp struct commit_queue {
117 ba4f502b 2018-08-04 stsp int ncommits;
118 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
121 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
123 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
124 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
125 1a76625f 2018-10-22 stsp int commits_needed;
126 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
127 1a76625f 2018-10-22 stsp struct commit_queue *commits;
128 1a76625f 2018-10-22 stsp const char *in_repo_path;
129 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
130 1a76625f 2018-10-22 stsp struct got_repository *repo;
131 1a76625f 2018-10-22 stsp int log_complete;
132 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
133 1a76625f 2018-10-22 stsp struct tog_view *view;
134 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
135 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
138 1a76625f 2018-10-22 stsp struct tog_log_view_state {
139 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
140 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
141 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
142 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
143 b01e7d3b 2018-08-04 stsp int selected;
144 b01e7d3b 2018-08-04 stsp char *in_repo_path;
145 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
146 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
147 1a76625f 2018-10-22 stsp sig_atomic_t quit;
148 1a76625f 2018-10-22 stsp pthread_t thread;
149 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
152 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
153 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
154 e9424729 2018-08-04 stsp int nlines;
156 e9424729 2018-08-04 stsp struct tog_view *view;
157 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
161 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
162 e9424729 2018-08-04 stsp const char *path;
163 e9424729 2018-08-04 stsp struct got_repository *repo;
164 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
165 e9424729 2018-08-04 stsp int *complete;
168 e9424729 2018-08-04 stsp struct tog_blame {
170 e9424729 2018-08-04 stsp size_t filesize;
171 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
172 e9424729 2018-08-04 stsp size_t nlines;
173 e9424729 2018-08-04 stsp pthread_t thread;
174 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
175 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
176 e9424729 2018-08-04 stsp const char *path;
179 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
180 7cbe629d 2018-08-04 stsp int first_displayed_line;
181 7cbe629d 2018-08-04 stsp int last_displayed_line;
182 7cbe629d 2018-08-04 stsp int selected_line;
183 7cbe629d 2018-08-04 stsp int blame_complete;
186 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
187 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
188 e5a0f69f 2018-08-18 stsp char *path;
189 7cbe629d 2018-08-04 stsp struct got_repository *repo;
190 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
191 e9424729 2018-08-04 stsp struct tog_blame blame;
194 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
195 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
196 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
197 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
198 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
199 ad80ab7b 2018-08-04 stsp int selected;
202 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
204 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
205 ad80ab7b 2018-08-04 stsp char *tree_label;
206 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
207 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
208 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
209 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
210 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
211 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
212 ad80ab7b 2018-08-04 stsp int nentries, ndisplayed, selected, show_ids;
213 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
214 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
215 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
219 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
221 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
222 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
223 669b5ffa 2018-10-07 stsp * there is enough screen estate.
225 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
226 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
228 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
229 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
230 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
232 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
233 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
235 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
237 cc3c9aac 2018-08-01 stsp struct tog_view {
238 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
239 26ed57b2 2018-05-19 stsp WINDOW *window;
240 26ed57b2 2018-05-19 stsp PANEL *panel;
241 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
242 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
243 1004088d 2018-09-29 stsp int focussed;
244 669b5ffa 2018-10-07 stsp struct tog_view *parent;
245 669b5ffa 2018-10-07 stsp struct tog_view *child;
246 669b5ffa 2018-10-07 stsp int child_focussed;
248 5dc9f4bc 2018-08-04 stsp /* type-specific state */
249 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
251 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
252 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
253 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
254 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
257 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
258 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
259 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
260 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
263 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
264 ba4f502b 2018-08-04 stsp struct got_object *, struct got_object *, struct got_repository *);
265 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
266 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
267 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
268 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
270 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
271 23721109 2018-10-22 stsp struct got_object_id *, struct got_repository *, const char *, int);
272 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
273 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
274 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
275 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
277 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
278 5221c383 2018-08-01 stsp struct got_object_id *, struct got_repository *);
279 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
280 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_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_blame_view(struct tog_view *);
284 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
285 4fc679ca 2018-08-04 stsp struct got_tree_object *, struct got_object_id *, struct got_repository *);
286 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
287 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
288 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
289 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
291 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
293 25791caa 2018-10-24 stsp static void
294 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
296 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
299 e5a0f69f 2018-08-18 stsp static const struct got_error *
300 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
302 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
304 669b5ffa 2018-10-07 stsp if (view->child) {
305 669b5ffa 2018-10-07 stsp view_close(view->child);
306 669b5ffa 2018-10-07 stsp view->child = NULL;
308 e5a0f69f 2018-08-18 stsp if (view->close)
309 e5a0f69f 2018-08-18 stsp err = view->close(view);
310 ea5e7bb5 2018-08-01 stsp if (view->panel)
311 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
312 ea5e7bb5 2018-08-01 stsp if (view->window)
313 ea5e7bb5 2018-08-01 stsp delwin(view->window);
314 ea5e7bb5 2018-08-01 stsp free(view);
315 e5a0f69f 2018-08-18 stsp return err;
318 ea5e7bb5 2018-08-01 stsp static struct tog_view *
319 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
320 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
322 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
324 ea5e7bb5 2018-08-01 stsp if (view == NULL)
325 ea5e7bb5 2018-08-01 stsp return NULL;
327 d6b05b5b 2018-08-04 stsp view->type = type;
328 f7d12f7e 2018-08-01 stsp view->lines = LINES;
329 f7d12f7e 2018-08-01 stsp view->cols = COLS;
330 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
331 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
332 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
333 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
334 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
335 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
336 96a765a8 2018-08-04 stsp view_close(view);
337 ea5e7bb5 2018-08-01 stsp return NULL;
339 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
340 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
341 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
342 96a765a8 2018-08-04 stsp view_close(view);
343 ea5e7bb5 2018-08-01 stsp return NULL;
346 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
347 ea5e7bb5 2018-08-01 stsp return view;
351 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
353 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
355 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
358 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
360 5c60c32a 2018-10-18 stsp static const struct got_error *
361 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
363 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
365 5c60c32a 2018-10-18 stsp view->begin_y = 0;
366 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
367 5c60c32a 2018-10-18 stsp view->nlines = LINES;
368 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
369 5c60c32a 2018-10-18 stsp view->lines = LINES;
370 5c60c32a 2018-10-18 stsp view->cols = COLS;
371 5c60c32a 2018-10-18 stsp err = view_resize(view);
373 5c60c32a 2018-10-18 stsp return err;
375 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
376 5c60c32a 2018-10-18 stsp return got_error_from_errno();
378 5c60c32a 2018-10-18 stsp return NULL;
381 5c60c32a 2018-10-18 stsp static const struct got_error *
382 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
384 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
386 5c60c32a 2018-10-18 stsp view->begin_x = 0;
387 5c60c32a 2018-10-18 stsp view->begin_y = 0;
388 5c60c32a 2018-10-18 stsp view->nlines = LINES;
389 5c60c32a 2018-10-18 stsp view->ncols = COLS;
390 5c60c32a 2018-10-18 stsp view->lines = LINES;
391 5c60c32a 2018-10-18 stsp view->cols = COLS;
392 5c60c32a 2018-10-18 stsp err = view_resize(view);
394 5c60c32a 2018-10-18 stsp return err;
396 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
397 5c60c32a 2018-10-18 stsp return got_error_from_errno();
399 5c60c32a 2018-10-18 stsp return NULL;
403 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
405 5c60c32a 2018-10-18 stsp return view->parent == NULL;
408 4d8c2215 2018-08-19 stsp static const struct got_error *
409 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
411 f7d12f7e 2018-08-01 stsp int nlines, ncols;
413 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
414 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
416 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
418 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
419 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
421 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
423 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
424 0cf4efb1 2018-09-29 stsp return got_error_from_errno();
425 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
426 a6d7eb8d 2018-10-24 stsp return got_error_from_errno();
427 25791caa 2018-10-24 stsp wclear(view->window);
429 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
430 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
431 0cf4efb1 2018-09-29 stsp view->lines = LINES;
432 0cf4efb1 2018-09-29 stsp view->cols = COLS;
434 6e3e5d9c 2018-10-18 stsp if (view->child) {
435 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
436 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
437 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
438 5c60c32a 2018-10-18 stsp if (view->child->focussed)
439 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
441 5c60c32a 2018-10-18 stsp show_panel(view->panel);
443 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
444 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
448 5c60c32a 2018-10-18 stsp return NULL;
451 669b5ffa 2018-10-07 stsp static const struct got_error *
452 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
454 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
456 669b5ffa 2018-10-07 stsp if (view->child == NULL)
457 669b5ffa 2018-10-07 stsp return NULL;
459 669b5ffa 2018-10-07 stsp err = view_close(view->child);
460 669b5ffa 2018-10-07 stsp view->child = NULL;
461 669b5ffa 2018-10-07 stsp return err;
464 669b5ffa 2018-10-07 stsp static const struct got_error *
465 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
467 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
469 669b5ffa 2018-10-07 stsp view->child = child;
470 669b5ffa 2018-10-07 stsp child->parent = view;
471 669b5ffa 2018-10-07 stsp return err;
475 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
477 669b5ffa 2018-10-07 stsp return !view_is_parent_view(view) && view->begin_x > 0;
480 25791caa 2018-10-24 stsp static void
481 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
483 25791caa 2018-10-24 stsp int cols, lines;
484 25791caa 2018-10-24 stsp struct winsize size;
486 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
487 25791caa 2018-10-24 stsp cols = 80; /* Default */
488 25791caa 2018-10-24 stsp lines = 24;
490 25791caa 2018-10-24 stsp cols = size.ws_col;
491 25791caa 2018-10-24 stsp lines = size.ws_row;
493 25791caa 2018-10-24 stsp resize_term(lines, cols);
496 0cf4efb1 2018-09-29 stsp static const struct got_error *
497 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
498 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
499 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
501 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
502 669b5ffa 2018-10-07 stsp struct tog_view *v;
503 1a76625f 2018-10-22 stsp int ch, errcode;
505 e5a0f69f 2018-08-18 stsp *new = NULL;
506 e5a0f69f 2018-08-18 stsp *dead = NULL;
507 0cf4efb1 2018-09-29 stsp *focus = NULL;
509 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
510 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
511 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
512 1a76625f 2018-10-22 stsp if (errcode)
513 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
514 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
515 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
516 1a76625f 2018-10-22 stsp if (errcode)
517 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
518 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
520 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
521 25791caa 2018-10-24 stsp tog_resizeterm();
522 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
523 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
524 25791caa 2018-10-24 stsp err = view_resize(v);
526 25791caa 2018-10-24 stsp return err;
527 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
529 25791caa 2018-10-24 stsp return err;
533 e5a0f69f 2018-08-18 stsp switch (ch) {
537 669b5ffa 2018-10-07 stsp if (view->child) {
538 669b5ffa 2018-10-07 stsp *focus = view->child;
539 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
540 669b5ffa 2018-10-07 stsp } else if (view->parent) {
541 669b5ffa 2018-10-07 stsp *focus = view->parent;
542 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 0;
546 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
547 e5a0f69f 2018-08-18 stsp *dead = view;
553 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
554 669b5ffa 2018-10-07 stsp if (view->child == NULL)
556 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view->child)) {
557 669b5ffa 2018-10-07 stsp *focus = view->child;
558 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
559 669b5ffa 2018-10-07 stsp err = view_fullscreen(view->child);
561 669b5ffa 2018-10-07 stsp err = view_splitscreen(view->child);
564 669b5ffa 2018-10-07 stsp err = view->child->input(new, dead, focus,
565 669b5ffa 2018-10-07 stsp view->child, KEY_RESIZE);
567 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view)) {
568 669b5ffa 2018-10-07 stsp *focus = view;
569 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 1;
570 669b5ffa 2018-10-07 stsp err = view_fullscreen(view);
572 669b5ffa 2018-10-07 stsp err = view_splitscreen(view);
576 669b5ffa 2018-10-07 stsp err = view->input(new, dead, focus, view,
577 669b5ffa 2018-10-07 stsp KEY_RESIZE);
580 0cf4efb1 2018-09-29 stsp case KEY_RESIZE:
583 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
587 e5a0f69f 2018-08-18 stsp return err;
591 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
593 0cf4efb1 2018-09-29 stsp PANEL *panel;
594 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
596 669b5ffa 2018-10-07 stsp if (view->parent)
597 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
599 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
600 0cf4efb1 2018-09-29 stsp if (panel == NULL)
603 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
604 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
605 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
609 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
611 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
612 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
614 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
616 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
619 669b5ffa 2018-10-07 stsp return view->focussed;
622 bcbd79e2 2018-08-19 stsp static const struct got_error *
623 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
625 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
626 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
627 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
628 fd823528 2018-10-22 stsp int fast_refresh = 10;
629 1a76625f 2018-10-22 stsp int done = 0, errcode;
631 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
632 1a76625f 2018-10-22 stsp if (errcode)
633 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
635 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
636 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
638 a81bf10d 2018-09-29 stsp main_view = view;
639 1004088d 2018-09-29 stsp view->focussed = 1;
640 878940b7 2018-09-29 stsp err = view->show(view);
642 0cf4efb1 2018-09-29 stsp return err;
643 0cf4efb1 2018-09-29 stsp update_panels();
644 0cf4efb1 2018-09-29 stsp doupdate();
645 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
646 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
647 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
648 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
650 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
651 e4197bf9 2018-08-18 stsp view, &views);
654 e5a0f69f 2018-08-18 stsp if (dead_view) {
655 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
657 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
658 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
659 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
660 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
661 669b5ffa 2018-10-07 stsp prev = view->parent;
663 669b5ffa 2018-10-07 stsp if (dead_view->parent)
664 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
666 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
668 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
669 a81bf10d 2018-09-29 stsp if (err || dead_view == main_view)
672 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
673 0cf4efb1 2018-09-29 stsp if (focus_view)
674 0cf4efb1 2018-09-29 stsp view = focus_view;
675 669b5ffa 2018-10-07 stsp else if (prev)
676 669b5ffa 2018-10-07 stsp view = prev;
677 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
678 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
679 0cf4efb1 2018-09-29 stsp tog_view_list_head);
681 0cf4efb1 2018-09-29 stsp view = NULL;
682 669b5ffa 2018-10-07 stsp if (view) {
683 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
684 669b5ffa 2018-10-07 stsp focus_view = view->child;
686 669b5ffa 2018-10-07 stsp focus_view = view;
690 bcbd79e2 2018-08-19 stsp if (new_view) {
691 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
692 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
693 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
694 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
696 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
697 86c66b02 2018-10-18 stsp err = view_close(v);
702 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
703 fed7eaa8 2018-10-24 stsp view = new_view;
704 878940b7 2018-09-29 stsp if (focus_view == NULL)
705 878940b7 2018-09-29 stsp focus_view = new_view;
707 0cf4efb1 2018-09-29 stsp if (focus_view) {
708 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
710 0cf4efb1 2018-09-29 stsp view->focussed = 0;
711 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
712 0cf4efb1 2018-09-29 stsp view = focus_view;
713 878940b7 2018-09-29 stsp if (new_view)
714 878940b7 2018-09-29 stsp show_panel(new_view->panel);
715 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
716 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
718 669b5ffa 2018-10-07 stsp if (view) {
719 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
720 758194b5 2018-10-24 stsp view->focussed = 1;
721 758194b5 2018-10-24 stsp show_panel(view->panel);
722 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
723 758194b5 2018-10-24 stsp show_panel(view->child->panel);
724 1a76625f 2018-10-22 stsp focus_view = view;
726 669b5ffa 2018-10-07 stsp if (view->parent) {
727 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
731 669b5ffa 2018-10-07 stsp err = view->show(view);
734 669b5ffa 2018-10-07 stsp if (view->child) {
735 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
739 1a76625f 2018-10-22 stsp update_panels();
740 1a76625f 2018-10-22 stsp doupdate();
744 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
745 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
746 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
747 e5a0f69f 2018-08-18 stsp view_close(view);
750 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
751 1a76625f 2018-10-22 stsp if (errcode)
752 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
754 e5a0f69f 2018-08-18 stsp return err;
757 4ed7e80c 2018-05-20 stsp __dead static void
758 9f7d7167 2018-04-29 stsp usage_log(void)
761 c70c5802 2018-08-01 stsp fprintf(stderr,
762 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
763 9f7d7167 2018-04-29 stsp getprogname());
767 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
768 80ddbec8 2018-04-29 stsp static const struct got_error *
769 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
771 00dfcb92 2018-06-11 stsp char *vis = NULL;
772 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
774 963b370f 2018-05-20 stsp *ws = NULL;
775 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
776 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
777 00dfcb92 2018-06-11 stsp int vislen;
778 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
779 00dfcb92 2018-06-11 stsp return got_error_from_errno();
781 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
782 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
784 00dfcb92 2018-06-11 stsp return err;
785 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
786 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
787 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
792 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
793 a7f50699 2018-06-11 stsp if (*ws == NULL) {
794 a7f50699 2018-06-11 stsp err = got_error_from_errno();
798 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
799 963b370f 2018-05-20 stsp err = got_error_from_errno();
804 963b370f 2018-05-20 stsp *ws = NULL;
807 963b370f 2018-05-20 stsp return err;
810 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
811 963b370f 2018-05-20 stsp static const struct got_error *
812 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
814 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
815 963b370f 2018-05-20 stsp int cols = 0;
816 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
817 963b370f 2018-05-20 stsp size_t wlen;
820 963b370f 2018-05-20 stsp *wlinep = NULL;
821 b700b5d6 2018-07-10 stsp *widthp = 0;
823 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
825 963b370f 2018-05-20 stsp return err;
828 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
829 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
830 963b370f 2018-05-20 stsp switch (width) {
836 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
837 b700b5d6 2018-07-10 stsp cols += width;
841 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
842 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
846 963b370f 2018-05-20 stsp err = got_error_from_errno();
850 963b370f 2018-05-20 stsp wline[i] = L'\0';
851 b700b5d6 2018-07-10 stsp if (widthp)
852 b700b5d6 2018-07-10 stsp *widthp = cols;
855 963b370f 2018-05-20 stsp free(wline);
857 963b370f 2018-05-20 stsp *wlinep = wline;
858 963b370f 2018-05-20 stsp return err;
861 963b370f 2018-05-20 stsp static const struct got_error *
862 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
863 2814baeb 2018-08-01 stsp struct got_object_id *id)
865 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
866 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
867 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
868 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
869 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
870 bb737323 2018-05-20 stsp int author_width, logmsg_width;
871 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
872 80ddbec8 2018-04-29 stsp char *line = NULL;
873 bb737323 2018-05-20 stsp int col, limit;
874 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
875 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
876 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
878 c70c5802 2018-08-01 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ",
879 c70c5802 2018-08-01 stsp &commit->tm_committer) >= sizeof(datebuf))
880 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
882 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
883 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
885 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
886 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
887 b39d25c7 2018-07-10 stsp col = limit + 1;
888 b39d25c7 2018-07-10 stsp if (col > avail)
891 6d9fbc00 2018-04-29 stsp author0 = strdup(commit->author);
892 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
893 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
896 6d9fbc00 2018-04-29 stsp author = author0;
897 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
898 6d9fbc00 2018-04-29 stsp if (smallerthan)
899 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
901 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
903 6d9fbc00 2018-04-29 stsp *at = '\0';
905 b39d25c7 2018-07-10 stsp limit = avail - col;
906 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
909 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
910 bb737323 2018-05-20 stsp col += author_width;
911 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
912 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
914 bb737323 2018-05-20 stsp author_width++;
916 9c2eaf34 2018-05-20 stsp if (col > avail)
919 bb737323 2018-05-20 stsp logmsg0 = strdup(commit->logmsg);
920 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
921 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
924 bb737323 2018-05-20 stsp logmsg = logmsg0;
925 bb737323 2018-05-20 stsp while (*logmsg == '\n')
927 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
928 bb737323 2018-05-20 stsp if (newline)
929 bb737323 2018-05-20 stsp *newline = '\0';
930 bb737323 2018-05-20 stsp limit = avail - col;
931 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
934 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
935 bb737323 2018-05-20 stsp col += logmsg_width;
936 bb737323 2018-05-20 stsp while (col <= avail) {
937 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
941 80ddbec8 2018-04-29 stsp free(logmsg0);
942 bb737323 2018-05-20 stsp free(wlogmsg);
943 6d9fbc00 2018-04-29 stsp free(author0);
944 bb737323 2018-05-20 stsp free(wauthor);
945 80ddbec8 2018-04-29 stsp free(line);
946 80ddbec8 2018-04-29 stsp return err;
949 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
950 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
951 899d86c2 2018-05-10 stsp struct got_object_id *id)
953 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
955 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
956 80ddbec8 2018-04-29 stsp if (entry == NULL)
957 899d86c2 2018-05-10 stsp return NULL;
959 899d86c2 2018-05-10 stsp entry->id = id;
960 99db9666 2018-05-07 stsp entry->commit = commit;
961 899d86c2 2018-05-10 stsp return entry;
964 99db9666 2018-05-07 stsp static void
965 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
967 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
969 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
970 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
971 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
972 ecb28ae0 2018-07-16 stsp commits->ncommits--;
973 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
974 99db9666 2018-05-07 stsp free(entry);
977 99db9666 2018-05-07 stsp static void
978 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
980 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
981 99db9666 2018-05-07 stsp pop_commit(commits);
984 c4972b91 2018-05-07 stsp static const struct got_error *
985 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
986 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
988 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
989 93e45b7c 2018-09-24 stsp int nqueued = 0;
992 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
993 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
994 1a76625f 2018-10-22 stsp * while updating the display.
996 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
997 93e45b7c 2018-09-24 stsp struct got_object_id *id;
998 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
999 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1000 1a76625f 2018-10-22 stsp int errcode;
1002 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1003 9ba79e04 2018-06-11 stsp if (err) {
1004 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1006 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1007 93e45b7c 2018-09-24 stsp minqueue, repo);
1009 ecb28ae0 2018-07-16 stsp return err;
1013 ecb28ae0 2018-07-16 stsp if (id == NULL)
1016 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1019 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1020 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1021 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
1025 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1026 1a76625f 2018-10-22 stsp if (errcode) {
1027 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1031 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1032 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1033 ecb28ae0 2018-07-16 stsp nqueued++;
1034 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1036 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1037 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1038 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1041 9ba79e04 2018-06-11 stsp return err;
1044 99db9666 2018-05-07 stsp static const struct got_error *
1045 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1047 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1048 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1050 9ba79e04 2018-06-11 stsp *head_id = NULL;
1052 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1054 99db9666 2018-05-07 stsp return err;
1056 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1057 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1058 9ba79e04 2018-06-11 stsp if (err) {
1059 9ba79e04 2018-06-11 stsp *head_id = NULL;
1060 99db9666 2018-05-07 stsp return err;
1063 9ba79e04 2018-06-11 stsp return NULL;
1066 0553a4e3 2018-04-30 stsp static const struct got_error *
1067 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1068 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1069 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1070 1a76625f 2018-10-22 stsp const char *path, int commits_needed)
1072 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1073 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1074 ecb28ae0 2018-07-16 stsp int ncommits, width;
1075 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1076 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1078 e0d42f60 2018-07-22 stsp entry = first;
1079 e0d42f60 2018-07-22 stsp ncommits = 0;
1080 e0d42f60 2018-07-22 stsp while (entry) {
1081 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1082 e0d42f60 2018-07-22 stsp *selected = entry;
1085 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1086 e0d42f60 2018-07-22 stsp ncommits++;
1089 1a76625f 2018-10-22 stsp if (*selected) {
1090 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1092 ecb28ae0 2018-07-16 stsp return err;
1095 1a76625f 2018-10-22 stsp if (asprintf(&ncommits_str, " [%d/%d]%s ",
1096 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1097 1a76625f 2018-10-22 stsp commits_needed == 0 ? "" : " loading...") == -1)
1098 1a76625f 2018-10-22 stsp return got_error_from_errno();
1100 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1101 1a76625f 2018-10-22 stsp if (asprintf(&header, "commit: %s %s%s",
1102 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1103 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1104 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1105 1a76625f 2018-10-22 stsp header = NULL;
1106 1a76625f 2018-10-22 stsp goto done;
1108 1a76625f 2018-10-22 stsp } else if (asprintf(&header, "commit: %s%s",
1109 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1110 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1111 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1112 1a76625f 2018-10-22 stsp header = NULL;
1113 1a76625f 2018-10-22 stsp goto done;
1115 1a76625f 2018-10-22 stsp err = format_line(&wline, &width, header, view->ncols);
1117 1a76625f 2018-10-22 stsp goto done;
1119 2814baeb 2018-08-01 stsp werase(view->window);
1121 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1122 a3404814 2018-09-02 stsp wstandout(view->window);
1123 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1124 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1125 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1128 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1129 a3404814 2018-09-02 stsp wstandend(view->window);
1130 ecb28ae0 2018-07-16 stsp free(wline);
1131 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1132 1a76625f 2018-10-22 stsp goto done;
1134 899d86c2 2018-05-10 stsp entry = first;
1135 899d86c2 2018-05-10 stsp *last = first;
1136 867c6645 2018-07-10 stsp ncommits = 0;
1137 899d86c2 2018-05-10 stsp while (entry) {
1138 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1140 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1141 2814baeb 2018-08-01 stsp wstandout(view->window);
1142 2814baeb 2018-08-01 stsp err = draw_commit(view, entry->commit, entry->id);
1143 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1144 2814baeb 2018-08-01 stsp wstandend(view->window);
1147 0553a4e3 2018-04-30 stsp ncommits++;
1148 899d86c2 2018-05-10 stsp *last = entry;
1149 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1152 1a57306a 2018-09-02 stsp view_vborder(view);
1154 1a76625f 2018-10-22 stsp free(id_str);
1155 1a76625f 2018-10-22 stsp free(ncommits_str);
1156 1a76625f 2018-10-22 stsp free(header);
1157 80ddbec8 2018-04-29 stsp return err;
1160 07b55e75 2018-05-10 stsp static void
1161 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1162 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1164 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1165 07b55e75 2018-05-10 stsp int nscrolled = 0;
1167 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1168 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
1171 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1172 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1173 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1174 07b55e75 2018-05-10 stsp if (entry) {
1175 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1176 07b55e75 2018-05-10 stsp nscrolled++;
1181 aa075928 2018-05-10 stsp static const struct got_error *
1182 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1183 93e45b7c 2018-09-24 stsp struct commit_queue_entry **last_displayed_entry,
1184 1a76625f 2018-10-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1185 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1187 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
1188 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
1189 aa075928 2018-05-10 stsp int nscrolled = 0;
1191 1a76625f 2018-10-22 stsp if (*last_displayed_entry == NULL)
1192 1a76625f 2018-10-22 stsp return NULL;
1195 93e45b7c 2018-09-24 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1196 aa075928 2018-05-10 stsp if (pentry == NULL) {
1197 1a76625f 2018-10-22 stsp int errcode;
1198 1a76625f 2018-10-22 stsp if (*log_complete)
1199 1a76625f 2018-10-22 stsp return NULL;
1200 1a76625f 2018-10-22 stsp *commits_needed = maxscroll + 20;
1201 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(need_commits);
1202 1a76625f 2018-10-22 stsp if (errcode)
1203 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1204 1a76625f 2018-10-22 stsp return NULL;
1206 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1208 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1209 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1211 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1212 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1214 dd0a52c1 2018-05-20 stsp return err;
1217 cd0acaa7 2018-05-20 stsp static const struct got_error *
1218 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1219 0cf4efb1 2018-09-29 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
1220 2a4718d3 2018-09-29 stsp struct got_repository *repo)
1222 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1223 cd0acaa7 2018-05-20 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1224 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1225 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1227 2a4718d3 2018-09-29 stsp err = got_object_open(&obj2, repo, commit_id);
1229 cd0acaa7 2018-05-20 stsp return err;
1231 2a4718d3 2018-09-29 stsp parent_id = SIMPLEQ_FIRST(&commit->parent_ids);
1232 9ba79e04 2018-06-11 stsp if (parent_id) {
1233 9ba79e04 2018-06-11 stsp err = got_object_open(&obj1, repo, parent_id->id);
1235 cd0acaa7 2018-05-20 stsp goto done;
1238 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1239 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
1240 ea5e7bb5 2018-08-01 stsp err = got_error_from_errno();
1241 ea5e7bb5 2018-08-01 stsp goto done;
1244 e5a0f69f 2018-08-18 stsp err = open_diff_view(diff_view, obj1, obj2, repo);
1245 e5a0f69f 2018-08-18 stsp if (err == NULL)
1246 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1249 cd0acaa7 2018-05-20 stsp got_object_close(obj1);
1251 cd0acaa7 2018-05-20 stsp got_object_close(obj2);
1252 cd0acaa7 2018-05-20 stsp return err;
1255 80ddbec8 2018-04-29 stsp static const struct got_error *
1256 0cf4efb1 2018-09-29 stsp browse_commit(struct tog_view **new_view, int begin_x,
1257 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *entry, struct got_repository *repo)
1259 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1260 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1261 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1263 9343a5fb 2018-06-23 stsp err = got_object_open_as_tree(&tree, repo, entry->commit->tree_id);
1265 9343a5fb 2018-06-23 stsp return err;
1267 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1268 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1269 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1271 e5a0f69f 2018-08-18 stsp err = open_tree_view(tree_view, tree, entry->id, repo);
1273 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1275 e5a0f69f 2018-08-18 stsp *new_view = tree_view;
1276 1a76625f 2018-10-22 stsp return err;
1279 1a76625f 2018-10-22 stsp static void *
1280 1a76625f 2018-10-22 stsp log_thread(void *arg)
1282 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1283 1a76625f 2018-10-22 stsp int errcode = 0;
1284 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1285 1a76625f 2018-10-22 stsp int done = 0;
1287 1a76625f 2018-10-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1289 1a76625f 2018-10-22 stsp return (void *)err;
1291 1a76625f 2018-10-22 stsp while (!done && !err) {
1292 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1293 1a76625f 2018-10-22 stsp a->in_repo_path);
1294 1a76625f 2018-10-22 stsp if (err) {
1295 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1296 1a76625f 2018-10-22 stsp return (void *)err;
1297 1a76625f 2018-10-22 stsp err = NULL;
1299 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1300 1a76625f 2018-10-22 stsp a->commits_needed--;
1302 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1303 1a76625f 2018-10-22 stsp if (errcode)
1304 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
1307 1a76625f 2018-10-22 stsp a->log_complete = 1;
1308 1a76625f 2018-10-22 stsp else if (*a->quit) {
1310 1a76625f 2018-10-22 stsp a->log_complete = 1;
1311 1a76625f 2018-10-22 stsp } else if (*a->first_displayed_entry == NULL) {
1312 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1313 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1314 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1318 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1319 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1320 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1321 1a76625f 2018-10-22 stsp &tog_mutex);
1322 1a76625f 2018-10-22 stsp if (errcode)
1323 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1326 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1327 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1328 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1330 1a76625f 2018-10-22 stsp return (void *)err;
1333 1a76625f 2018-10-22 stsp static const struct got_error *
1334 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1336 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1337 1a76625f 2018-10-22 stsp int errcode;
1339 1a76625f 2018-10-22 stsp if (s->thread) {
1340 1a76625f 2018-10-22 stsp s->quit = 1;
1341 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1342 1a76625f 2018-10-22 stsp if (errcode)
1343 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1344 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1345 1a76625f 2018-10-22 stsp if (errcode)
1346 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1347 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1348 1a76625f 2018-10-22 stsp if (errcode)
1349 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1350 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1351 1a76625f 2018-10-22 stsp if (errcode)
1352 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1353 1a76625f 2018-10-22 stsp s->thread = NULL;
1356 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1357 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1358 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1360 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1361 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1362 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1365 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1366 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1367 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1370 9343a5fb 2018-06-23 stsp return err;
1373 9343a5fb 2018-06-23 stsp static const struct got_error *
1374 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1376 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1377 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1379 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1380 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1381 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1382 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1383 1a76625f 2018-10-22 stsp free(s->start_id);
1384 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1385 1a76625f 2018-10-22 stsp return err;
1388 1a76625f 2018-10-22 stsp static const struct got_error *
1389 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1390 23721109 2018-10-22 stsp struct got_repository *repo, const char *path, int check_disk)
1392 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1393 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1394 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1395 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1396 1a76625f 2018-10-22 stsp int errcode;
1398 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1399 ecb28ae0 2018-07-16 stsp if (err != NULL)
1400 ecb28ae0 2018-07-16 stsp goto done;
1402 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1403 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1404 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1406 fb2756b9 2018-08-04 stsp s->repo = repo;
1407 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1408 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1409 5036bf37 2018-09-24 stsp err = got_error_from_errno();
1410 5036bf37 2018-09-24 stsp goto done;
1413 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1414 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1415 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1417 1a76625f 2018-10-22 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1419 1a76625f 2018-10-22 stsp goto done;
1420 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1421 1a76625f 2018-10-22 stsp 0, thread_repo);
1423 1a76625f 2018-10-22 stsp goto done;
1425 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1426 1a76625f 2018-10-22 stsp if (errcode) {
1427 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1428 1a76625f 2018-10-22 stsp goto done;
1431 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1432 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1433 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1434 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1435 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1436 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1437 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1438 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1439 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1440 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1441 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1444 1a76625f 2018-10-22 stsp close_log_view(view);
1445 ba4f502b 2018-08-04 stsp return err;
1448 e5a0f69f 2018-08-18 stsp static const struct got_error *
1449 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1451 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1453 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1454 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1455 2b380cc8 2018-10-24 stsp &s->thread_args);
1456 2b380cc8 2018-10-24 stsp if (errcode)
1457 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
1460 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1461 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1462 1a76625f 2018-10-22 stsp &s->commits, s->selected, view->nlines,
1463 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1466 e5a0f69f 2018-08-18 stsp static const struct got_error *
1467 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1468 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1470 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1471 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1472 5036bf37 2018-09-24 stsp char *parent_path;
1473 669b5ffa 2018-10-07 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
1474 669b5ffa 2018-10-07 stsp int begin_x = 0;
1476 e5a0f69f 2018-08-18 stsp switch (ch) {
1478 1a76625f 2018-10-22 stsp s->quit = 1;
1481 e5a0f69f 2018-08-18 stsp case KEY_UP:
1482 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1484 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1485 e5a0f69f 2018-08-18 stsp s->selected--;
1486 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1488 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry, 1,
1489 e5a0f69f 2018-08-18 stsp &s->commits);
1491 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1492 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1494 e5a0f69f 2018-08-18 stsp if (TAILQ_FIRST(&s->commits.head) ==
1495 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
1496 e5a0f69f 2018-08-18 stsp s->selected = 0;
1499 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry,
1500 e5a0f69f 2018-08-18 stsp view->nlines, &s->commits);
1503 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1504 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1506 e5a0f69f 2018-08-18 stsp if (s->selected < MIN(view->nlines - 2,
1507 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1508 e5a0f69f 2018-08-18 stsp s->selected++;
1511 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry, 1,
1512 93e45b7c 2018-09-24 stsp &s->last_displayed_entry, &s->commits,
1513 1a76625f 2018-10-22 stsp &s->thread_args.log_complete,
1514 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1515 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1517 e5a0f69f 2018-08-18 stsp case KEY_NPAGE: {
1518 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *first;
1519 e5a0f69f 2018-08-18 stsp first = s->first_displayed_entry;
1520 2b380cc8 2018-10-24 stsp if (first == NULL)
1522 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry,
1523 93e45b7c 2018-09-24 stsp view->nlines, &s->last_displayed_entry,
1524 1a76625f 2018-10-22 stsp &s->commits, &s->thread_args.log_complete,
1525 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1526 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1527 e5a0f69f 2018-08-18 stsp if (first == s->first_displayed_entry &&
1528 e5a0f69f 2018-08-18 stsp s->selected < MIN(view->nlines - 2,
1529 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1530 e5a0f69f 2018-08-18 stsp /* can't scroll further down */
1531 e5a0f69f 2018-08-18 stsp s->selected = MIN(view->nlines - 2,
1532 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1);
1534 e5a0f69f 2018-08-18 stsp err = NULL;
1537 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
1538 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines - 2)
1539 e5a0f69f 2018-08-18 stsp s->selected = view->nlines - 2;
1540 e5a0f69f 2018-08-18 stsp if (s->selected > s->commits.ncommits - 1)
1541 e5a0f69f 2018-08-18 stsp s->selected = s->commits.ncommits - 1;
1543 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
1544 e5a0f69f 2018-08-18 stsp case '\r':
1545 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1547 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1548 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1549 669b5ffa 2018-10-07 stsp err = open_diff_view_for_commit(&diff_view, begin_x,
1550 2a4718d3 2018-09-29 stsp s->selected_entry->id, s->selected_entry->commit,
1554 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1555 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1557 669b5ffa 2018-10-07 stsp return err;
1558 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
1559 669b5ffa 2018-10-07 stsp if (err) {
1560 669b5ffa 2018-10-07 stsp view_close(diff_view);
1563 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(diff_view)) {
1564 669b5ffa 2018-10-07 stsp *focus_view = diff_view;
1565 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1568 669b5ffa 2018-10-07 stsp *new_view = diff_view;
1571 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1573 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1574 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1575 669b5ffa 2018-10-07 stsp err = browse_commit(&tree_view, begin_x,
1576 0cf4efb1 2018-09-29 stsp s->selected_entry, s->repo);
1579 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1580 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1582 669b5ffa 2018-10-07 stsp return err;
1583 669b5ffa 2018-10-07 stsp err = view_set_child(view, tree_view);
1584 669b5ffa 2018-10-07 stsp if (err) {
1585 669b5ffa 2018-10-07 stsp view_close(tree_view);
1588 669b5ffa 2018-10-07 stsp *focus_view = tree_view;
1589 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1591 669b5ffa 2018-10-07 stsp *new_view = tree_view;
1593 5036bf37 2018-09-24 stsp case KEY_BACKSPACE:
1594 5036bf37 2018-09-24 stsp if (strcmp(s->in_repo_path, "/") == 0)
1596 5036bf37 2018-09-24 stsp parent_path = dirname(s->in_repo_path);
1597 5036bf37 2018-09-24 stsp if (parent_path && strcmp(parent_path, ".") != 0) {
1598 5036bf37 2018-09-24 stsp struct tog_view *lv;
1599 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1601 1a76625f 2018-10-22 stsp return err;
1602 0cf4efb1 2018-09-29 stsp lv = view_open(view->nlines, view->ncols,
1603 0cf4efb1 2018-09-29 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
1604 5036bf37 2018-09-24 stsp if (lv == NULL)
1605 5036bf37 2018-09-24 stsp return got_error_from_errno();
1606 5036bf37 2018-09-24 stsp err = open_log_view(lv, s->start_id, s->repo,
1607 23721109 2018-10-22 stsp parent_path, 0);
1609 1a76625f 2018-10-22 stsp return err;;
1610 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1611 669b5ffa 2018-10-07 stsp *new_view = lv;
1613 669b5ffa 2018-10-07 stsp view_set_child(view->parent, lv);
1614 34095730 2018-10-22 stsp *focus_view = lv;
1616 1a76625f 2018-10-22 stsp return NULL;
1623 80ddbec8 2018-04-29 stsp return err;
1626 4ed7e80c 2018-05-20 stsp static const struct got_error *
1627 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1629 80ddbec8 2018-04-29 stsp const struct got_error *error;
1630 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1631 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1632 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1633 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1635 04cc582a 2018-08-01 stsp struct tog_view *view;
1637 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1638 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
1640 80ddbec8 2018-04-29 stsp err(1, "pledge");
1643 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1644 80ddbec8 2018-04-29 stsp switch (ch) {
1646 80ddbec8 2018-04-29 stsp start_commit = optarg;
1649 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1650 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1651 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1655 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1659 80ddbec8 2018-04-29 stsp argc -= optind;
1660 80ddbec8 2018-04-29 stsp argv += optind;
1662 ecb28ae0 2018-07-16 stsp if (argc == 0)
1663 ecb28ae0 2018-07-16 stsp path = strdup("");
1664 ecb28ae0 2018-07-16 stsp else if (argc == 1)
1665 ecb28ae0 2018-07-16 stsp path = strdup(argv[0]);
1667 80ddbec8 2018-04-29 stsp usage_log();
1668 ecb28ae0 2018-07-16 stsp if (path == NULL)
1669 ecb28ae0 2018-07-16 stsp return got_error_from_errno();
1671 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1672 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1673 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1674 ecb28ae0 2018-07-16 stsp goto done;
1676 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1677 ecb28ae0 2018-07-16 stsp repo_path = strdup(cwd);
1678 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1679 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1680 ecb28ae0 2018-07-16 stsp goto done;
1684 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1685 80ddbec8 2018-04-29 stsp if (error != NULL)
1686 ecb28ae0 2018-07-16 stsp goto done;
1688 80ddbec8 2018-04-29 stsp if (start_commit == NULL) {
1689 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
1690 80ddbec8 2018-04-29 stsp if (error != NULL)
1691 ecb28ae0 2018-07-16 stsp goto done;
1693 80ddbec8 2018-04-29 stsp struct got_object *obj;
1694 80ddbec8 2018-04-29 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
1695 80ddbec8 2018-04-29 stsp if (error == NULL) {
1696 6402fb3c 2018-09-15 stsp start_id = got_object_id_dup(got_object_get_id(obj));
1697 899d86c2 2018-05-10 stsp if (start_id == NULL)
1698 80ddbec8 2018-04-29 stsp error = got_error_from_errno();
1699 ecb28ae0 2018-07-16 stsp goto done;
1702 80ddbec8 2018-04-29 stsp if (error != NULL)
1703 ecb28ae0 2018-07-16 stsp goto done;
1705 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1706 04cc582a 2018-08-01 stsp if (view == NULL) {
1707 04cc582a 2018-08-01 stsp error = got_error_from_errno();
1708 04cc582a 2018-08-01 stsp goto done;
1710 23721109 2018-10-22 stsp error = open_log_view(view, start_id, repo, path, 1);
1711 ba4f502b 2018-08-04 stsp if (error)
1712 ba4f502b 2018-08-04 stsp goto done;
1713 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1715 ecb28ae0 2018-07-16 stsp free(repo_path);
1716 ecb28ae0 2018-07-16 stsp free(cwd);
1717 ecb28ae0 2018-07-16 stsp free(path);
1718 899d86c2 2018-05-10 stsp free(start_id);
1720 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
1721 80ddbec8 2018-04-29 stsp return error;
1724 4ed7e80c 2018-05-20 stsp __dead static void
1725 9f7d7167 2018-04-29 stsp usage_diff(void)
1728 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1729 9f7d7167 2018-04-29 stsp getprogname());
1733 b304db33 2018-05-20 stsp static char *
1734 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
1736 b304db33 2018-05-20 stsp char *line;
1737 b304db33 2018-05-20 stsp size_t linelen;
1738 b304db33 2018-05-20 stsp size_t lineno;
1739 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
1741 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
1743 b304db33 2018-05-20 stsp *len = linelen;
1744 b304db33 2018-05-20 stsp return line;
1747 4ed7e80c 2018-05-20 stsp static const struct got_error *
1748 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1749 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
1750 a3404814 2018-09-02 stsp char * header)
1752 61e69b96 2018-05-20 stsp const struct got_error *err;
1753 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
1754 b304db33 2018-05-20 stsp char *line;
1755 b304db33 2018-05-20 stsp size_t len;
1756 61e69b96 2018-05-20 stsp wchar_t *wline;
1757 e0b650dd 2018-05-20 stsp int width;
1759 26ed57b2 2018-05-19 stsp rewind(f);
1760 f7d12f7e 2018-08-01 stsp werase(view->window);
1762 a3404814 2018-09-02 stsp if (header) {
1763 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
1764 a3404814 2018-09-02 stsp if (err) {
1765 a3404814 2018-09-02 stsp return err;
1768 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1769 a3404814 2018-09-02 stsp wstandout(view->window);
1770 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
1771 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1772 a3404814 2018-09-02 stsp wstandend(view->window);
1773 a3404814 2018-09-02 stsp if (width < view->ncols)
1774 a3404814 2018-09-02 stsp waddch(view->window, '\n');
1776 a3404814 2018-09-02 stsp if (max_lines <= 1)
1777 a3404814 2018-09-02 stsp return NULL;
1778 a3404814 2018-09-02 stsp max_lines--;
1782 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
1783 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
1784 26ed57b2 2018-05-19 stsp if (line == NULL) {
1788 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
1789 26ed57b2 2018-05-19 stsp free(line);
1793 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1794 61e69b96 2018-05-20 stsp if (err) {
1795 61e69b96 2018-05-20 stsp free(line);
1796 61e69b96 2018-05-20 stsp return err;
1798 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1799 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1800 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1801 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
1802 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
1803 26ed57b2 2018-05-19 stsp free(line);
1804 2550e4c3 2018-07-13 stsp free(wline);
1805 2550e4c3 2018-07-13 stsp wline = NULL;
1807 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
1809 1a57306a 2018-09-02 stsp view_vborder(view);
1811 26ed57b2 2018-05-19 stsp return NULL;
1814 4ed7e80c 2018-05-20 stsp static const struct got_error *
1815 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
1817 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
1818 48ae06ee 2018-10-18 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1819 48ae06ee 2018-10-18 stsp FILE *f = NULL;
1821 48ae06ee 2018-10-18 stsp if (s->id1) {
1822 48ae06ee 2018-10-18 stsp err = got_object_open(&obj1, s->repo, s->id1);
1824 48ae06ee 2018-10-18 stsp return err;
1827 48ae06ee 2018-10-18 stsp err = got_object_open(&obj2, s->repo, s->id2);
1829 48ae06ee 2018-10-18 stsp goto done;
1831 511a516b 2018-05-19 stsp f = got_opentemp();
1832 48ae06ee 2018-10-18 stsp if (f == NULL) {
1833 48ae06ee 2018-10-18 stsp err = got_error_from_errno();
1834 48ae06ee 2018-10-18 stsp goto done;
1837 48ae06ee 2018-10-18 stsp fclose(s->f);
1840 cd0acaa7 2018-05-20 stsp switch (got_object_get_type(obj1 ? obj1 : obj2)) {
1841 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
1842 48ae06ee 2018-10-18 stsp err = got_diff_objects_as_blobs(obj1, obj2, NULL, NULL,
1843 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
1845 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
1846 48ae06ee 2018-10-18 stsp err = got_diff_objects_as_trees(obj1, obj2, "", "",
1847 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
1849 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_COMMIT:
1850 48ae06ee 2018-10-18 stsp err = got_diff_objects_as_commits(obj1, obj2, s->diff_context,
1851 48ae06ee 2018-10-18 stsp s->repo, f);
1854 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1859 48ae06ee 2018-10-18 stsp got_object_close(obj1);
1860 48ae06ee 2018-10-18 stsp got_object_close(obj2);
1862 48ae06ee 2018-10-18 stsp fflush(f);
1863 48ae06ee 2018-10-18 stsp return err;
1866 48ae06ee 2018-10-18 stsp static const struct got_error *
1867 48ae06ee 2018-10-18 stsp open_diff_view(struct tog_view *view, struct got_object *obj1,
1868 48ae06ee 2018-10-18 stsp struct got_object *obj2, struct got_repository *repo)
1870 48ae06ee 2018-10-18 stsp const struct got_error *err;
1872 48ae06ee 2018-10-18 stsp if (obj1 != NULL && obj2 != NULL &&
1873 48ae06ee 2018-10-18 stsp got_object_get_type(obj1) != got_object_get_type(obj2))
1874 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
1876 48ae06ee 2018-10-18 stsp if (obj1) {
1877 48ae06ee 2018-10-18 stsp struct got_object_id *id1;
1878 48ae06ee 2018-10-18 stsp id1 = got_object_id_dup(got_object_get_id(obj1));
1879 48ae06ee 2018-10-18 stsp if (id1 == NULL)
1880 48ae06ee 2018-10-18 stsp return got_error_from_errno();
1881 48ae06ee 2018-10-18 stsp view->state.diff.id1 = id1;
1883 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1885 48ae06ee 2018-10-18 stsp view->state.diff.id2 = got_object_id_dup(got_object_get_id(obj2));
1886 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
1887 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
1888 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1889 48ae06ee 2018-10-18 stsp return got_error_from_errno();
1891 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
1892 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
1893 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
1894 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
1895 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
1897 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
1898 48ae06ee 2018-10-18 stsp if (err) {
1899 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
1900 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1901 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
1902 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
1903 48ae06ee 2018-10-18 stsp return err;
1906 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
1907 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
1908 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
1910 5dc9f4bc 2018-08-04 stsp return NULL;
1913 e5a0f69f 2018-08-18 stsp static const struct got_error *
1914 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
1916 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1918 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
1919 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1920 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
1921 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
1922 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
1923 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
1924 e5a0f69f 2018-08-18 stsp return err;
1927 5dc9f4bc 2018-08-04 stsp static const struct got_error *
1928 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
1930 a3404814 2018-09-02 stsp const struct got_error *err;
1931 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
1932 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
1934 a3404814 2018-09-02 stsp if (s->id1) {
1935 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
1937 a3404814 2018-09-02 stsp return err;
1939 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
1941 a3404814 2018-09-02 stsp return err;
1943 a3404814 2018-09-02 stsp if (asprintf(&header, "diff: %s %s",
1944 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
1945 a3404814 2018-09-02 stsp err = got_error_from_errno();
1946 a3404814 2018-09-02 stsp free(id_str1);
1947 a3404814 2018-09-02 stsp free(id_str2);
1948 a3404814 2018-09-02 stsp return err;
1950 a3404814 2018-09-02 stsp free(id_str1);
1951 a3404814 2018-09-02 stsp free(id_str2);
1953 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
1954 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
1958 0cf4efb1 2018-09-29 stsp static const struct got_error *
1959 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
1960 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1962 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
1963 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
1966 e5a0f69f 2018-08-18 stsp switch (ch) {
1968 e5a0f69f 2018-08-18 stsp case KEY_UP:
1969 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > 1)
1970 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
1972 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1974 e5a0f69f 2018-08-18 stsp while (i++ < view->nlines - 1 &&
1975 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
1976 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
1979 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1980 e5a0f69f 2018-08-18 stsp if (!s->eof)
1981 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
1983 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
1986 e5a0f69f 2018-08-18 stsp while (!s->eof && i++ < view->nlines - 1) {
1987 e5a0f69f 2018-08-18 stsp char *line;
1988 e5a0f69f 2018-08-18 stsp line = parse_next_line(s->f, NULL);
1989 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
1990 e5a0f69f 2018-08-18 stsp if (line == NULL)
1995 48ae06ee 2018-10-18 stsp if (s->diff_context > 0) {
1996 48ae06ee 2018-10-18 stsp s->diff_context--;
1997 48ae06ee 2018-10-18 stsp err = create_diff(s);
2001 4a8520aa 2018-10-18 stsp if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2002 48ae06ee 2018-10-18 stsp s->diff_context++;
2003 48ae06ee 2018-10-18 stsp err = create_diff(s);
2010 bcbd79e2 2018-08-19 stsp return err;
2013 4ed7e80c 2018-05-20 stsp static const struct got_error *
2014 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2016 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2017 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2018 26ed57b2 2018-05-19 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
2019 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2020 26ed57b2 2018-05-19 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
2022 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2024 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2025 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
2027 26ed57b2 2018-05-19 stsp err(1, "pledge");
2030 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2031 26ed57b2 2018-05-19 stsp switch (ch) {
2034 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2038 26ed57b2 2018-05-19 stsp argc -= optind;
2039 26ed57b2 2018-05-19 stsp argv += optind;
2041 26ed57b2 2018-05-19 stsp if (argc == 0) {
2042 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2043 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2044 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2045 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2046 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2047 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[0];
2048 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[1];
2049 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2050 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2051 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2052 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2053 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[1];
2054 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[2];
2056 26ed57b2 2018-05-19 stsp usage_diff();
2058 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
2059 26ed57b2 2018-05-19 stsp free(repo_path);
2060 26ed57b2 2018-05-19 stsp if (error)
2061 26ed57b2 2018-05-19 stsp goto done;
2063 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
2064 26ed57b2 2018-05-19 stsp if (error)
2065 26ed57b2 2018-05-19 stsp goto done;
2067 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
2068 26ed57b2 2018-05-19 stsp if (error)
2069 26ed57b2 2018-05-19 stsp goto done;
2071 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2072 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2073 ea5e7bb5 2018-08-01 stsp error = got_error_from_errno();
2074 ea5e7bb5 2018-08-01 stsp goto done;
2076 5dc9f4bc 2018-08-04 stsp error = open_diff_view(view, obj1, obj2, repo);
2077 5dc9f4bc 2018-08-04 stsp if (error)
2078 5dc9f4bc 2018-08-04 stsp goto done;
2079 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2081 26ed57b2 2018-05-19 stsp got_repo_close(repo);
2083 26ed57b2 2018-05-19 stsp got_object_close(obj1);
2085 26ed57b2 2018-05-19 stsp got_object_close(obj2);
2086 26ed57b2 2018-05-19 stsp return error;
2089 4ed7e80c 2018-05-20 stsp __dead static void
2090 9f7d7167 2018-04-29 stsp usage_blame(void)
2093 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2094 9f7d7167 2018-04-29 stsp getprogname());
2098 84451b3e 2018-07-10 stsp struct tog_blame_line {
2099 84451b3e 2018-07-10 stsp int annotated;
2100 84451b3e 2018-07-10 stsp struct got_object_id *id;
2103 4ed7e80c 2018-05-20 stsp static const struct got_error *
2104 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2105 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
2106 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
2107 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
2109 84451b3e 2018-07-10 stsp const struct got_error *err;
2110 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
2111 84451b3e 2018-07-10 stsp char *line;
2112 84451b3e 2018-07-10 stsp size_t len;
2113 84451b3e 2018-07-10 stsp wchar_t *wline;
2114 b700b5d6 2018-07-10 stsp int width, wlimit;
2115 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
2116 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
2117 ab089a2a 2018-07-12 stsp char *id_str;
2119 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
2121 ab089a2a 2018-07-12 stsp return err;
2123 84451b3e 2018-07-10 stsp rewind(f);
2124 f7d12f7e 2018-08-01 stsp werase(view->window);
2126 ab089a2a 2018-07-12 stsp if (asprintf(&line, "commit: %s", id_str) == -1) {
2127 ab089a2a 2018-07-12 stsp err = got_error_from_errno();
2128 ab089a2a 2018-07-12 stsp free(id_str);
2129 ab089a2a 2018-07-12 stsp return err;
2132 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2133 ab089a2a 2018-07-12 stsp free(line);
2134 2550e4c3 2018-07-13 stsp line = NULL;
2135 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2136 a3404814 2018-09-02 stsp wstandout(view->window);
2137 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2138 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2139 a3404814 2018-09-02 stsp wstandend(view->window);
2140 2550e4c3 2018-07-13 stsp free(wline);
2141 2550e4c3 2018-07-13 stsp wline = NULL;
2142 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2143 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2145 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
2146 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
2147 12a0b23b 2018-07-12 stsp blame_complete ? "" : "annotating ", path) == -1) {
2148 ab089a2a 2018-07-12 stsp free(id_str);
2149 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
2151 ab089a2a 2018-07-12 stsp free(id_str);
2152 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2153 3f60a8ef 2018-07-10 stsp free(line);
2154 2550e4c3 2018-07-13 stsp line = NULL;
2156 3f60a8ef 2018-07-10 stsp return err;
2157 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2158 2550e4c3 2018-07-13 stsp free(wline);
2159 2550e4c3 2018-07-13 stsp wline = NULL;
2160 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2161 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2164 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
2165 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
2166 84451b3e 2018-07-10 stsp if (line == NULL) {
2170 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
2171 84451b3e 2018-07-10 stsp free(line);
2175 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2176 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
2177 84451b3e 2018-07-10 stsp if (err) {
2178 84451b3e 2018-07-10 stsp free(line);
2179 84451b3e 2018-07-10 stsp return err;
2182 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2183 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2185 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
2186 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
2187 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
2188 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
2189 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
2190 84451b3e 2018-07-10 stsp char *id_str;
2191 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
2192 84451b3e 2018-07-10 stsp if (err) {
2193 84451b3e 2018-07-10 stsp free(line);
2194 2550e4c3 2018-07-13 stsp free(wline);
2195 84451b3e 2018-07-10 stsp return err;
2197 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
2198 84451b3e 2018-07-10 stsp free(id_str);
2199 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
2201 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
2202 ee41ec32 2018-07-10 stsp prev_id = NULL;
2205 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2206 b700b5d6 2018-07-10 stsp while (width < wlimit) {
2207 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
2210 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2211 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2212 84451b3e 2018-07-10 stsp if (++nprinted == 1)
2213 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
2214 84451b3e 2018-07-10 stsp free(line);
2215 2550e4c3 2018-07-13 stsp free(wline);
2216 2550e4c3 2018-07-13 stsp wline = NULL;
2218 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
2220 1a57306a 2018-09-02 stsp view_vborder(view);
2222 84451b3e 2018-07-10 stsp return NULL;
2225 84451b3e 2018-07-10 stsp static const struct got_error *
2226 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2228 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
2229 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
2230 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
2231 1a76625f 2018-10-22 stsp int errcode;
2233 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
2234 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2235 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
2237 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2238 1a76625f 2018-10-22 stsp if (errcode)
2239 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2241 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
2242 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
2243 d68a0a7d 2018-07-10 stsp goto done;
2246 d68a0a7d 2018-07-10 stsp if (lineno == -1)
2247 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
2249 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
2250 d68a0a7d 2018-07-10 stsp if (line->annotated)
2251 d68a0a7d 2018-07-10 stsp goto done;
2253 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
2254 84451b3e 2018-07-10 stsp if (line->id == NULL) {
2255 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2256 84451b3e 2018-07-10 stsp goto done;
2258 84451b3e 2018-07-10 stsp line->annotated = 1;
2260 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2261 1a76625f 2018-10-22 stsp if (errcode)
2262 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2263 84451b3e 2018-07-10 stsp return err;
2266 84451b3e 2018-07-10 stsp static void *
2267 84451b3e 2018-07-10 stsp blame_thread(void *arg)
2269 18430de3 2018-07-10 stsp const struct got_error *err;
2270 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
2271 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
2272 1a76625f 2018-10-22 stsp int errcode;
2274 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2275 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
2277 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2278 1a76625f 2018-10-22 stsp if (errcode)
2279 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
2281 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
2282 c9beca56 2018-07-22 stsp ta->repo = NULL;
2283 c9beca56 2018-07-22 stsp *ta->complete = 1;
2285 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2286 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2287 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2289 18430de3 2018-07-10 stsp return (void *)err;
2292 245d91c1 2018-07-12 stsp static struct got_object_id *
2293 245d91c1 2018-07-12 stsp get_selected_commit_id(struct tog_blame_line *lines,
2294 245d91c1 2018-07-12 stsp int first_displayed_line, int selected_line)
2296 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
2298 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
2299 245d91c1 2018-07-12 stsp if (!line->annotated)
2300 245d91c1 2018-07-12 stsp return NULL;
2302 245d91c1 2018-07-12 stsp return line->id;
2305 84451b3e 2018-07-10 stsp static const struct got_error *
2306 245d91c1 2018-07-12 stsp open_selected_commit(struct got_object **pobj, struct got_object **obj,
2307 b880a918 2018-07-10 stsp struct tog_blame_line *lines, int first_displayed_line,
2308 b880a918 2018-07-10 stsp int selected_line, struct got_repository *repo)
2310 b880a918 2018-07-10 stsp const struct got_error *err = NULL;
2311 b880a918 2018-07-10 stsp struct got_commit_object *commit = NULL;
2312 245d91c1 2018-07-12 stsp struct got_object_id *selected_id;
2313 b880a918 2018-07-10 stsp struct got_object_qid *pid;
2315 b880a918 2018-07-10 stsp *pobj = NULL;
2316 b880a918 2018-07-10 stsp *obj = NULL;
2318 245d91c1 2018-07-12 stsp selected_id = get_selected_commit_id(lines,
2319 245d91c1 2018-07-12 stsp first_displayed_line, selected_line);
2320 245d91c1 2018-07-12 stsp if (selected_id == NULL)
2321 b880a918 2018-07-10 stsp return NULL;
2323 245d91c1 2018-07-12 stsp err = got_object_open(obj, repo, selected_id);
2325 b880a918 2018-07-10 stsp goto done;
2327 b880a918 2018-07-10 stsp err = got_object_commit_open(&commit, repo, *obj);
2329 b880a918 2018-07-10 stsp goto done;
2331 b880a918 2018-07-10 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
2332 b880a918 2018-07-10 stsp if (pid) {
2333 b880a918 2018-07-10 stsp err = got_object_open(pobj, repo, pid->id);
2335 b880a918 2018-07-10 stsp goto done;
2338 b880a918 2018-07-10 stsp if (commit)
2339 b880a918 2018-07-10 stsp got_object_commit_close(commit);
2340 b880a918 2018-07-10 stsp return err;
2343 b880a918 2018-07-10 stsp static const struct got_error *
2344 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
2346 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
2349 245d91c1 2018-07-12 stsp if (blame->thread) {
2350 1a76625f 2018-10-22 stsp int errcode;
2351 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2352 1a76625f 2018-10-22 stsp if (errcode)
2353 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2354 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
2355 1a76625f 2018-10-22 stsp if (errcode)
2356 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2357 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2358 1a76625f 2018-10-22 stsp if (errcode)
2359 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2360 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
2361 245d91c1 2018-07-12 stsp err = NULL;
2362 245d91c1 2018-07-12 stsp blame->thread = NULL;
2364 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
2365 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
2366 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
2368 245d91c1 2018-07-12 stsp if (blame->f) {
2369 245d91c1 2018-07-12 stsp fclose(blame->f);
2370 245d91c1 2018-07-12 stsp blame->f = NULL;
2372 245d91c1 2018-07-12 stsp for (i = 0; i < blame->nlines; i++)
2373 245d91c1 2018-07-12 stsp free(blame->lines[i].id);
2374 245d91c1 2018-07-12 stsp free(blame->lines);
2375 245d91c1 2018-07-12 stsp blame->lines = NULL;
2376 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
2377 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
2379 245d91c1 2018-07-12 stsp return err;
2382 245d91c1 2018-07-12 stsp static const struct got_error *
2383 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2384 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
2385 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
2386 245d91c1 2018-07-12 stsp struct got_repository *repo)
2388 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
2389 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
2390 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
2391 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
2392 27d434c2 2018-09-15 stsp struct got_object *obj = NULL;
2394 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2396 27d434c2 2018-09-15 stsp goto done;
2398 27d434c2 2018-09-15 stsp err = got_object_open(&obj, repo, obj_id);
2400 84451b3e 2018-07-10 stsp goto done;
2402 84451b3e 2018-07-10 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_BLOB) {
2403 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2404 84451b3e 2018-07-10 stsp goto done;
2407 84451b3e 2018-07-10 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
2409 a70480e0 2018-06-23 stsp goto done;
2410 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
2411 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
2412 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2413 84451b3e 2018-07-10 stsp goto done;
2415 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2416 245d91c1 2018-07-12 stsp blame->f, blob);
2418 84451b3e 2018-07-10 stsp goto done;
2420 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2421 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
2422 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2423 84451b3e 2018-07-10 stsp goto done;
2426 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2428 bd24772e 2018-07-11 stsp goto done;
2430 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
2431 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
2432 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
2433 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
2434 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
2435 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2436 245d91c1 2018-07-12 stsp goto done;
2438 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
2440 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
2441 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
2442 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
2443 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
2444 245d91c1 2018-07-12 stsp *blame_complete = 0;
2448 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
2449 27d434c2 2018-09-15 stsp free(obj_id);
2451 245d91c1 2018-07-12 stsp got_object_close(obj);
2453 245d91c1 2018-07-12 stsp stop_blame(blame);
2454 245d91c1 2018-07-12 stsp return err;
2457 245d91c1 2018-07-12 stsp static const struct got_error *
2458 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
2459 e1cd8fed 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
2461 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
2462 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2464 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
2466 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2468 7cbe629d 2018-08-04 stsp return err;
2470 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2471 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
2472 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
2473 fb2756b9 2018-08-04 stsp s->selected_line = 1;
2474 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
2475 fb2756b9 2018-08-04 stsp s->path = path;
2476 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
2477 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2478 fb2756b9 2018-08-04 stsp s->repo = repo;
2479 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
2480 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
2482 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
2483 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
2484 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
2486 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
2487 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
2488 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2489 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2492 e5a0f69f 2018-08-18 stsp static const struct got_error *
2493 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
2495 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2496 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2498 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
2499 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
2501 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2502 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
2503 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2504 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2505 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
2508 e5a0f69f 2018-08-18 stsp free(s->path);
2510 e5a0f69f 2018-08-18 stsp return err;
2513 7cbe629d 2018-08-04 stsp static const struct got_error *
2514 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
2516 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2517 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
2518 2b380cc8 2018-10-24 stsp int errcode;
2520 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
2521 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2522 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
2523 2b380cc8 2018-10-24 stsp if (errcode)
2524 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
2527 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2528 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2529 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
2530 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
2532 669b5ffa 2018-10-07 stsp view_vborder(view);
2533 e5a0f69f 2018-08-18 stsp return err;
2536 e5a0f69f 2018-08-18 stsp static const struct got_error *
2537 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2538 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2540 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
2541 7cbe629d 2018-08-04 stsp struct got_object *obj = NULL, *pobj = NULL;
2542 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
2543 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2544 669b5ffa 2018-10-07 stsp int begin_x = 0;
2546 e5a0f69f 2018-08-18 stsp switch (ch) {
2548 e5a0f69f 2018-08-18 stsp s->done = 1;
2551 e5a0f69f 2018-08-18 stsp case KEY_UP:
2552 e5a0f69f 2018-08-18 stsp if (s->selected_line > 1)
2553 e5a0f69f 2018-08-18 stsp s->selected_line--;
2554 e5a0f69f 2018-08-18 stsp else if (s->selected_line == 1 &&
2555 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2556 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2558 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2559 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line == 1) {
2560 e5a0f69f 2018-08-18 stsp s->selected_line = 1;
2563 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > view->nlines - 2)
2564 e5a0f69f 2018-08-18 stsp s->first_displayed_line -=
2565 e5a0f69f 2018-08-18 stsp (view->nlines - 2);
2567 e5a0f69f 2018-08-18 stsp s->first_displayed_line = 1;
2570 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2571 e5a0f69f 2018-08-18 stsp if (s->selected_line < view->nlines - 2 &&
2572 e5a0f69f 2018-08-18 stsp s->first_displayed_line +
2573 e5a0f69f 2018-08-18 stsp s->selected_line <= s->blame.nlines)
2574 e5a0f69f 2018-08-18 stsp s->selected_line++;
2575 e5a0f69f 2018-08-18 stsp else if (s->last_displayed_line <
2576 e5a0f69f 2018-08-18 stsp s->blame.nlines)
2577 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2580 e5a0f69f 2018-08-18 stsp case 'p': {
2581 e5a0f69f 2018-08-18 stsp struct got_object_id *id;
2582 e5a0f69f 2018-08-18 stsp id = get_selected_commit_id(s->blame.lines,
2583 e5a0f69f 2018-08-18 stsp s->first_displayed_line, s->selected_line);
2584 e5a0f69f 2018-08-18 stsp if (id == NULL || got_object_id_cmp(id,
2585 e5a0f69f 2018-08-18 stsp s->blamed_commit->id) == 0)
2587 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2588 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2589 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2592 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2594 e5a0f69f 2018-08-18 stsp if (ch == 'p' && pobj == NULL)
2596 e5a0f69f 2018-08-18 stsp s->done = 1;
2597 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2598 e5a0f69f 2018-08-18 stsp s->done = 0;
2599 e5a0f69f 2018-08-18 stsp if (thread_err)
2601 e5a0f69f 2018-08-18 stsp id = got_object_get_id(ch == 'b' ? obj : pobj);
2602 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2603 e5a0f69f 2018-08-18 stsp obj = NULL;
2604 e5a0f69f 2018-08-18 stsp if (pobj) {
2605 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2606 e5a0f69f 2018-08-18 stsp pobj = NULL;
2608 6402fb3c 2018-09-15 stsp err = got_object_qid_alloc(&s->blamed_commit, id);
2610 e5a0f69f 2018-08-18 stsp goto done;
2611 e5a0f69f 2018-08-18 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2612 e5a0f69f 2018-08-18 stsp s->blamed_commit, entry);
2613 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2614 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2615 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof,
2616 e5a0f69f 2018-08-18 stsp s->path, s->blamed_commit->id, s->repo);
2621 e5a0f69f 2018-08-18 stsp case 'B': {
2622 e5a0f69f 2018-08-18 stsp struct got_object_qid *first;
2623 e5a0f69f 2018-08-18 stsp first = SIMPLEQ_FIRST(&s->blamed_commits);
2624 e5a0f69f 2018-08-18 stsp if (!got_object_id_cmp(first->id, s->commit_id))
2626 e5a0f69f 2018-08-18 stsp s->done = 1;
2627 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2628 e5a0f69f 2018-08-18 stsp s->done = 0;
2629 e5a0f69f 2018-08-18 stsp if (thread_err)
2631 e5a0f69f 2018-08-18 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2632 e5a0f69f 2018-08-18 stsp got_object_qid_free(s->blamed_commit);
2633 e5a0f69f 2018-08-18 stsp s->blamed_commit =
2634 e5a0f69f 2018-08-18 stsp SIMPLEQ_FIRST(&s->blamed_commits);
2635 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2636 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2637 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2638 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2643 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2644 e5a0f69f 2018-08-18 stsp case '\r':
2645 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2646 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2647 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2650 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2653 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
2654 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
2655 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2656 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
2657 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2660 669b5ffa 2018-10-07 stsp err = open_diff_view(diff_view, pobj, obj, s->repo);
2661 e5a0f69f 2018-08-18 stsp if (err) {
2662 e5a0f69f 2018-08-18 stsp view_close(diff_view);
2665 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
2666 669b5ffa 2018-10-07 stsp err = view_close_child(view);
2668 669b5ffa 2018-10-07 stsp return err;
2669 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
2670 669b5ffa 2018-10-07 stsp if (err) {
2671 669b5ffa 2018-10-07 stsp view_close(diff_view);
2674 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(diff_view)) {
2675 669b5ffa 2018-10-07 stsp *focus_view = diff_view;
2676 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
2679 669b5ffa 2018-10-07 stsp *new_view = diff_view;
2680 e5a0f69f 2018-08-18 stsp if (pobj) {
2681 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2682 e5a0f69f 2018-08-18 stsp pobj = NULL;
2684 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2685 e5a0f69f 2018-08-18 stsp obj = NULL;
2689 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2691 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line >= s->blame.nlines &&
2692 e5a0f69f 2018-08-18 stsp s->selected_line < view->nlines - 2) {
2693 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2694 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2697 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line + view->nlines - 2
2698 e5a0f69f 2018-08-18 stsp <= s->blame.nlines)
2699 e5a0f69f 2018-08-18 stsp s->first_displayed_line +=
2700 e5a0f69f 2018-08-18 stsp view->nlines - 2;
2702 e5a0f69f 2018-08-18 stsp s->first_displayed_line =
2703 e5a0f69f 2018-08-18 stsp s->blame.nlines -
2704 e5a0f69f 2018-08-18 stsp (view->nlines - 3);
2706 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
2707 e5a0f69f 2018-08-18 stsp if (s->selected_line > view->nlines - 2) {
2708 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2709 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2717 b880a918 2018-07-10 stsp got_object_close(pobj);
2718 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
2721 a70480e0 2018-06-23 stsp static const struct got_error *
2722 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
2724 a70480e0 2018-06-23 stsp const struct got_error *error;
2725 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
2726 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2727 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
2728 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
2730 e1cd8fed 2018-08-01 stsp struct tog_view *view;
2732 a70480e0 2018-06-23 stsp #ifndef PROFILE
2733 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
2735 a70480e0 2018-06-23 stsp err(1, "pledge");
2738 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2739 a70480e0 2018-06-23 stsp switch (ch) {
2741 a70480e0 2018-06-23 stsp commit_id_str = optarg;
2744 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2745 69069811 2018-08-02 stsp if (repo_path == NULL)
2746 69069811 2018-08-02 stsp err(1, "-r option");
2750 a70480e0 2018-06-23 stsp /* NOTREACHED */
2754 a70480e0 2018-06-23 stsp argc -= optind;
2755 a70480e0 2018-06-23 stsp argv += optind;
2757 69069811 2018-08-02 stsp if (argc == 1)
2758 69069811 2018-08-02 stsp path = argv[0];
2760 a70480e0 2018-06-23 stsp usage_blame();
2762 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
2763 69069811 2018-08-02 stsp if (cwd == NULL) {
2764 69069811 2018-08-02 stsp error = got_error_from_errno();
2765 69069811 2018-08-02 stsp goto done;
2767 69069811 2018-08-02 stsp if (repo_path == NULL) {
2768 69069811 2018-08-02 stsp repo_path = strdup(cwd);
2769 69069811 2018-08-02 stsp if (repo_path == NULL) {
2770 69069811 2018-08-02 stsp error = got_error_from_errno();
2771 69069811 2018-08-02 stsp goto done;
2776 69069811 2018-08-02 stsp error = got_repo_open(&repo, repo_path);
2777 a70480e0 2018-06-23 stsp if (error != NULL)
2778 66b4983c 2018-06-23 stsp return error;
2780 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2781 69069811 2018-08-02 stsp if (error != NULL)
2782 69069811 2018-08-02 stsp goto done;
2784 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
2785 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
2786 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
2787 a70480e0 2018-06-23 stsp if (error != NULL)
2788 66b4983c 2018-06-23 stsp goto done;
2789 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2790 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
2792 a70480e0 2018-06-23 stsp struct got_object *obj;
2793 a70480e0 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_str);
2794 a70480e0 2018-06-23 stsp if (error != NULL)
2795 66b4983c 2018-06-23 stsp goto done;
2796 6402fb3c 2018-09-15 stsp commit_id = got_object_id_dup(got_object_get_id(obj));
2797 a19e88aa 2018-06-23 stsp if (commit_id == NULL)
2798 66b4983c 2018-06-23 stsp error = got_error_from_errno();
2799 a19e88aa 2018-06-23 stsp got_object_close(obj);
2801 a19e88aa 2018-06-23 stsp if (error != NULL)
2802 a19e88aa 2018-06-23 stsp goto done;
2804 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
2805 e1cd8fed 2018-08-01 stsp if (view == NULL) {
2806 e1cd8fed 2018-08-01 stsp error = got_error_from_errno();
2807 e1cd8fed 2018-08-01 stsp goto done;
2809 7cbe629d 2018-08-04 stsp error = open_blame_view(view, in_repo_path, commit_id, repo);
2810 7cbe629d 2018-08-04 stsp if (error)
2811 7cbe629d 2018-08-04 stsp goto done;
2812 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2814 69069811 2018-08-02 stsp free(repo_path);
2815 69069811 2018-08-02 stsp free(cwd);
2816 a70480e0 2018-06-23 stsp free(commit_id);
2818 a70480e0 2018-06-23 stsp got_repo_close(repo);
2819 a70480e0 2018-06-23 stsp return error;
2822 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2823 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
2824 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
2825 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
2826 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
2827 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
2828 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
2830 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
2831 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
2832 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
2833 ffd1d5e5 2018-06-23 stsp int width, n;
2835 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
2837 f7d12f7e 2018-08-01 stsp werase(view->window);
2839 ffd1d5e5 2018-06-23 stsp if (limit == 0)
2840 ffd1d5e5 2018-06-23 stsp return NULL;
2842 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
2844 ffd1d5e5 2018-06-23 stsp return err;
2845 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2846 a3404814 2018-09-02 stsp wstandout(view->window);
2847 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2848 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2849 a3404814 2018-09-02 stsp wstandend(view->window);
2850 2550e4c3 2018-07-13 stsp free(wline);
2851 2550e4c3 2018-07-13 stsp wline = NULL;
2852 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2853 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2854 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2855 ffd1d5e5 2018-06-23 stsp return NULL;
2856 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
2858 ce52c690 2018-06-23 stsp return err;
2859 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2860 2550e4c3 2018-07-13 stsp free(wline);
2861 2550e4c3 2018-07-13 stsp wline = NULL;
2862 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2863 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2864 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2865 ffd1d5e5 2018-06-23 stsp return NULL;
2866 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2867 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
2868 a1eca9bb 2018-06-23 stsp return NULL;
2870 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2871 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
2872 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
2873 0cf4efb1 2018-09-29 stsp if (view->focussed)
2874 0cf4efb1 2018-09-29 stsp wstandout(view->window);
2875 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
2877 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
2878 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
2879 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2880 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2881 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2882 ffd1d5e5 2018-06-23 stsp return NULL;
2886 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
2887 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2890 ffd1d5e5 2018-06-23 stsp while (te) {
2891 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
2893 1d13200f 2018-07-12 stsp if (show_ids) {
2894 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
2896 1d13200f 2018-07-12 stsp return got_error_from_errno();
2898 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
2899 1d13200f 2018-07-12 stsp te->name, S_ISDIR(te->mode) ? "/" : "") == -1) {
2900 1d13200f 2018-07-12 stsp free(id_str);
2901 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2903 1d13200f 2018-07-12 stsp free(id_str);
2904 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2905 ffd1d5e5 2018-06-23 stsp if (err) {
2906 ffd1d5e5 2018-06-23 stsp free(line);
2909 ffd1d5e5 2018-06-23 stsp if (n == selected) {
2910 0cf4efb1 2018-09-29 stsp if (view->focussed)
2911 0cf4efb1 2018-09-29 stsp wstandout(view->window);
2912 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
2914 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2915 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2916 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2917 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
2918 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2919 ffd1d5e5 2018-06-23 stsp free(line);
2920 2550e4c3 2018-07-13 stsp free(wline);
2921 2550e4c3 2018-07-13 stsp wline = NULL;
2923 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2924 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
2925 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2927 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2930 ffd1d5e5 2018-06-23 stsp return err;
2933 ffd1d5e5 2018-06-23 stsp static void
2934 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
2935 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
2937 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
2940 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
2943 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2944 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
2945 ffd1d5e5 2018-06-23 stsp if (!isroot)
2946 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
2950 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
2951 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
2952 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
2953 ffd1d5e5 2018-06-23 stsp prev = te;
2954 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2956 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
2957 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2959 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
2960 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
2963 ffd1d5e5 2018-06-23 stsp static void
2964 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
2965 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
2966 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
2968 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *next;
2969 ffd1d5e5 2018-06-23 stsp int n = 0;
2971 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_NEXT(last_displayed_entry, entry) == NULL)
2974 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
2975 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
2977 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
2978 ffd1d5e5 2018-06-23 stsp while (next) {
2979 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = next;
2980 ffd1d5e5 2018-06-23 stsp if (++n >= maxscroll)
2982 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(next, entry);
2986 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2987 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
2988 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
2990 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
2991 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
2992 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
2994 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
2995 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
2997 ce52c690 2018-06-23 stsp len += strlen(te->name);
2999 ce52c690 2018-06-23 stsp *path = calloc(1, len);
3000 ffd1d5e5 2018-06-23 stsp if (path == NULL)
3001 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3003 ce52c690 2018-06-23 stsp (*path)[0] = '/';
3004 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
3005 d9765a41 2018-06-23 stsp while (pt) {
3006 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3007 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3008 cb2ebc8a 2018-06-23 stsp goto done;
3010 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
3011 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3012 cb2ebc8a 2018-06-23 stsp goto done;
3014 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3017 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
3018 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3019 ce52c690 2018-06-23 stsp goto done;
3023 ce52c690 2018-06-23 stsp if (err) {
3024 ce52c690 2018-06-23 stsp free(*path);
3025 ce52c690 2018-06-23 stsp *path = NULL;
3027 ce52c690 2018-06-23 stsp return err;
3030 ce52c690 2018-06-23 stsp static const struct got_error *
3031 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
3032 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3033 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
3035 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
3036 ce52c690 2018-06-23 stsp char *path;
3037 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
3039 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
3041 ce52c690 2018-06-23 stsp return err;
3043 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3044 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
3045 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3047 e5a0f69f 2018-08-18 stsp err = open_blame_view(blame_view, path, commit_id, repo);
3048 e5a0f69f 2018-08-18 stsp if (err) {
3049 e5a0f69f 2018-08-18 stsp view_close(blame_view);
3050 e5a0f69f 2018-08-18 stsp free(path);
3052 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
3053 69efd4c4 2018-07-18 stsp return err;
3056 69efd4c4 2018-07-18 stsp static const struct got_error *
3057 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
3058 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3059 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
3061 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
3062 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
3063 69efd4c4 2018-07-18 stsp char *path;
3065 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3066 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
3067 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3069 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
3071 69efd4c4 2018-07-18 stsp return err;
3073 23721109 2018-10-22 stsp err = open_log_view(log_view, commit_id, repo, path, 0);
3075 e5a0f69f 2018-08-18 stsp view_close(log_view);
3077 e5a0f69f 2018-08-18 stsp *new_view = log_view;
3078 cb2ebc8a 2018-06-23 stsp free(path);
3079 cb2ebc8a 2018-06-23 stsp return err;
3082 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3083 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
3084 5221c383 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
3086 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3087 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
3088 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3090 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
3092 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
3093 ffd1d5e5 2018-06-23 stsp if (err != NULL)
3094 ffd1d5e5 2018-06-23 stsp goto done;
3096 fb2756b9 2018-08-04 stsp if (asprintf(&s->tree_label, "commit: %s", commit_id_str) == -1) {
3097 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
3098 ffd1d5e5 2018-06-23 stsp goto done;
3101 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
3102 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
3103 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3104 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
3105 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
3106 6484ec90 2018-09-29 stsp err = got_error_from_errno();
3107 6484ec90 2018-09-29 stsp goto done;
3109 fb2756b9 2018-08-04 stsp s->repo = repo;
3111 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
3112 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
3113 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
3115 ad80ab7b 2018-08-04 stsp free(commit_id_str);
3116 6484ec90 2018-09-29 stsp if (err) {
3117 fb2756b9 2018-08-04 stsp free(s->tree_label);
3118 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3120 ad80ab7b 2018-08-04 stsp return err;
3123 e5a0f69f 2018-08-18 stsp static const struct got_error *
3124 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
3126 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3128 fb2756b9 2018-08-04 stsp free(s->tree_label);
3129 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3130 6484ec90 2018-09-29 stsp free(s->commit_id);
3131 6484ec90 2018-09-29 stsp s->commit_id = NULL;
3132 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
3133 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
3134 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
3135 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
3136 ad80ab7b 2018-08-04 stsp free(parent);
3139 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
3140 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
3141 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
3143 e5a0f69f 2018-08-18 stsp return NULL;
3146 ad80ab7b 2018-08-04 stsp static const struct got_error *
3147 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
3149 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
3150 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3151 e5a0f69f 2018-08-18 stsp char *parent_path;
3153 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
3155 e5a0f69f 2018-08-18 stsp return err;
3157 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
3158 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
3159 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3160 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
3161 e5a0f69f 2018-08-18 stsp free(parent_path);
3163 669b5ffa 2018-10-07 stsp view_vborder(view);
3164 e5a0f69f 2018-08-18 stsp return err;
3167 e5a0f69f 2018-08-18 stsp static const struct got_error *
3168 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3169 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3171 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3172 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
3173 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
3174 669b5ffa 2018-10-07 stsp int begin_x = 0;
3176 e5a0f69f 2018-08-18 stsp switch (ch) {
3178 e5a0f69f 2018-08-18 stsp s->show_ids = !s->show_ids;
3181 669b5ffa 2018-10-07 stsp if (!s->selected_entry)
3183 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
3184 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
3185 669b5ffa 2018-10-07 stsp err = log_tree_entry(&log_view, begin_x,
3186 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
3187 669b5ffa 2018-10-07 stsp s->commit_id, s->repo);
3188 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3189 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3191 669b5ffa 2018-10-07 stsp return err;
3192 669b5ffa 2018-10-07 stsp err = view_set_child(view, log_view);
3193 669b5ffa 2018-10-07 stsp if (err) {
3194 669b5ffa 2018-10-07 stsp view_close(log_view);
3197 669b5ffa 2018-10-07 stsp *focus_view = log_view;
3198 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3200 669b5ffa 2018-10-07 stsp *new_view = log_view;
3203 e5a0f69f 2018-08-18 stsp case KEY_UP:
3204 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
3205 e5a0f69f 2018-08-18 stsp s->selected--;
3206 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
3208 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry, 1,
3209 e5a0f69f 2018-08-18 stsp s->entries, s->tree == s->root);
3211 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
3212 8a0ead39 2018-11-03 stsp s->selected = 0;
3213 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_FIRST(&s->entries->head) ==
3214 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
3215 e5a0f69f 2018-08-18 stsp if (s->tree != s->root)
3216 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3219 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry,
3220 e5a0f69f 2018-08-18 stsp view->nlines, s->entries,
3221 e5a0f69f 2018-08-18 stsp s->tree == s->root);
3224 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
3225 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1) {
3226 e5a0f69f 2018-08-18 stsp s->selected++;
3229 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry, 1,
3230 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, s->entries);
3232 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
3233 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry,
3234 e5a0f69f 2018-08-18 stsp view->nlines, s->last_displayed_entry,
3235 e5a0f69f 2018-08-18 stsp s->entries);
3236 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry,
3239 e5a0f69f 2018-08-18 stsp /* can't scroll any further; move cursor down */
3240 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1)
3241 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3243 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
3244 e5a0f69f 2018-08-18 stsp case '\r':
3245 e5a0f69f 2018-08-18 stsp if (s->selected_entry == NULL) {
3246 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3247 7837eeac 2018-09-24 stsp case KEY_BACKSPACE:
3248 e5a0f69f 2018-08-18 stsp /* user selected '..' */
3249 e5a0f69f 2018-08-18 stsp if (s->tree == s->root)
3251 e5a0f69f 2018-08-18 stsp parent = TAILQ_FIRST(&s->parents);
3252 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&s->parents, parent,
3254 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->tree);
3255 e5a0f69f 2018-08-18 stsp s->tree = parent->tree;
3256 e5a0f69f 2018-08-18 stsp s->entries =
3257 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3258 e5a0f69f 2018-08-18 stsp s->first_displayed_entry =
3259 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry;
3260 e5a0f69f 2018-08-18 stsp s->selected_entry =
3261 e5a0f69f 2018-08-18 stsp parent->selected_entry;
3262 e5a0f69f 2018-08-18 stsp s->selected = parent->selected;
3263 e5a0f69f 2018-08-18 stsp free(parent);
3264 e5a0f69f 2018-08-18 stsp } else if (S_ISDIR(s->selected_entry->mode)) {
3265 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3266 e5a0f69f 2018-08-18 stsp struct got_tree_object *child;
3267 e5a0f69f 2018-08-18 stsp err = got_object_open_as_tree(&child,
3268 e5a0f69f 2018-08-18 stsp s->repo, s->selected_entry->id);
3271 e5a0f69f 2018-08-18 stsp parent = calloc(1, sizeof(*parent));
3272 e5a0f69f 2018-08-18 stsp if (parent == NULL) {
3273 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
3276 e5a0f69f 2018-08-18 stsp parent->tree = s->tree;
3277 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry =
3278 e5a0f69f 2018-08-18 stsp s->first_displayed_entry;
3279 e5a0f69f 2018-08-18 stsp parent->selected_entry = s->selected_entry;
3280 e5a0f69f 2018-08-18 stsp parent->selected = s->selected;
3281 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3282 e5a0f69f 2018-08-18 stsp s->tree = child;
3283 e5a0f69f 2018-08-18 stsp s->entries =
3284 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3285 e5a0f69f 2018-08-18 stsp s->selected = 0;
3286 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3287 e5a0f69f 2018-08-18 stsp } else if (S_ISREG(s->selected_entry->mode)) {
3288 669b5ffa 2018-10-07 stsp struct tog_view *blame_view;
3289 669b5ffa 2018-10-07 stsp int begin_x = view_is_parent_view(view) ?
3290 669b5ffa 2018-10-07 stsp view_split_begin_x(view->begin_x) : 0;
3292 669b5ffa 2018-10-07 stsp err = blame_tree_entry(&blame_view, begin_x,
3293 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents, s->commit_id,
3297 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3298 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3300 669b5ffa 2018-10-07 stsp return err;
3301 669b5ffa 2018-10-07 stsp err = view_set_child(view, blame_view);
3302 669b5ffa 2018-10-07 stsp if (err) {
3303 669b5ffa 2018-10-07 stsp view_close(blame_view);
3306 669b5ffa 2018-10-07 stsp *focus_view = blame_view;
3307 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3309 669b5ffa 2018-10-07 stsp *new_view = blame_view;
3312 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
3313 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines)
3314 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3320 ffd1d5e5 2018-06-23 stsp return err;
3323 ffd1d5e5 2018-06-23 stsp __dead static void
3324 ffd1d5e5 2018-06-23 stsp usage_tree(void)
3327 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3328 ffd1d5e5 2018-06-23 stsp getprogname());
3332 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3333 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
3335 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
3336 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
3337 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
3338 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3339 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
3340 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
3341 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
3343 5221c383 2018-08-01 stsp struct tog_view *view;
3345 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
3346 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
3348 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
3351 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
3352 ffd1d5e5 2018-06-23 stsp switch (ch) {
3354 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
3358 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
3362 ffd1d5e5 2018-06-23 stsp argc -= optind;
3363 ffd1d5e5 2018-06-23 stsp argv += optind;
3365 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
3366 ffd1d5e5 2018-06-23 stsp repo_path = getcwd(NULL, 0);
3367 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3368 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3369 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
3370 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
3371 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3372 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3374 ffd1d5e5 2018-06-23 stsp usage_log();
3376 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
3377 ffd1d5e5 2018-06-23 stsp free(repo_path);
3378 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3379 ffd1d5e5 2018-06-23 stsp return error;
3381 ffd1d5e5 2018-06-23 stsp if (commit_id_arg == NULL) {
3382 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
3383 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3384 ffd1d5e5 2018-06-23 stsp goto done;
3386 ffd1d5e5 2018-06-23 stsp struct got_object *obj;
3387 ffd1d5e5 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_arg);
3388 ffd1d5e5 2018-06-23 stsp if (error == NULL) {
3389 6402fb3c 2018-09-15 stsp commit_id = got_object_id_dup(got_object_get_id(obj));
3390 ffd1d5e5 2018-06-23 stsp if (commit_id == NULL)
3391 ffd1d5e5 2018-06-23 stsp error = got_error_from_errno();
3394 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3395 ffd1d5e5 2018-06-23 stsp goto done;
3397 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3398 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3399 ffd1d5e5 2018-06-23 stsp goto done;
3401 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_tree(&tree, repo, commit->tree_id);
3402 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3403 ffd1d5e5 2018-06-23 stsp goto done;
3405 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3406 5221c383 2018-08-01 stsp if (view == NULL) {
3407 5221c383 2018-08-01 stsp error = got_error_from_errno();
3408 5221c383 2018-08-01 stsp goto done;
3410 ad80ab7b 2018-08-04 stsp error = open_tree_view(view, tree, commit_id, repo);
3411 ad80ab7b 2018-08-04 stsp if (error)
3412 ad80ab7b 2018-08-04 stsp goto done;
3413 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3415 ffd1d5e5 2018-06-23 stsp free(commit_id);
3416 ffd1d5e5 2018-06-23 stsp if (commit)
3417 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
3419 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
3421 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
3422 ffd1d5e5 2018-06-23 stsp return error;
3425 5c5136c5 2018-05-20 stsp static void
3426 9f7d7167 2018-04-29 stsp init_curses(void)
3428 9f7d7167 2018-04-29 stsp initscr();
3430 fd823528 2018-10-22 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
3433 9f7d7167 2018-04-29 stsp intrflush(stdscr, FALSE);
3434 9f7d7167 2018-04-29 stsp keypad(stdscr, TRUE);
3435 1f475ad8 2018-05-10 stsp curs_set(0);
3436 25791caa 2018-10-24 stsp signal(SIGWINCH, tog_sigwinch);
3439 4ed7e80c 2018-05-20 stsp __dead static void
3440 9f7d7167 2018-04-29 stsp usage(void)
3444 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3445 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
3446 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3447 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
3448 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3453 c2301be8 2018-04-30 stsp static char **
3454 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
3456 c2301be8 2018-04-30 stsp char **argv;
3457 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
3459 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
3460 c2301be8 2018-04-30 stsp if (argv == NULL)
3461 c2301be8 2018-04-30 stsp err(1, "calloc");
3462 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
3463 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
3464 c2301be8 2018-04-30 stsp err(1, "calloc");
3465 c2301be8 2018-04-30 stsp if (arg1) {
3466 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
3467 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
3468 c2301be8 2018-04-30 stsp err(1, "calloc");
3471 c2301be8 2018-04-30 stsp return argv;
3475 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
3477 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
3478 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
3479 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
3480 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
3482 9f7d7167 2018-04-29 stsp setlocale(LC_ALL, "");
3484 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
3485 9f7d7167 2018-04-29 stsp switch (ch) {
3487 9f7d7167 2018-04-29 stsp hflag = 1;
3491 9f7d7167 2018-04-29 stsp /* NOTREACHED */
3495 9f7d7167 2018-04-29 stsp argc -= optind;
3496 9f7d7167 2018-04-29 stsp argv += optind;
3497 9f7d7167 2018-04-29 stsp optind = 0;
3498 c2301be8 2018-04-30 stsp optreset = 1;
3500 c2301be8 2018-04-30 stsp if (argc == 0) {
3501 f29d3e89 2018-06-23 stsp if (hflag)
3503 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
3504 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
3505 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
3510 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
3511 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3512 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
3513 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
3514 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
3515 9f7d7167 2018-04-29 stsp if (hflag)
3516 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
3520 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
3521 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
3522 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
3523 c2301be8 2018-04-30 stsp if (repo_path) {
3524 c2301be8 2018-04-30 stsp struct got_repository *repo;
3525 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
3526 c2301be8 2018-04-30 stsp if (error == NULL)
3527 c2301be8 2018-04-30 stsp got_repo_close(repo);
3529 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
3530 c2301be8 2018-04-30 stsp if (error) {
3531 f29d3e89 2018-06-23 stsp if (hflag) {
3532 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
3533 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
3537 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
3538 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
3539 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
3540 ad7de8d9 2018-04-30 stsp free(repo_path);
3543 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
3544 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
3546 c2301be8 2018-04-30 stsp free(repo_path);
3550 5c5136c5 2018-05-20 stsp init_curses();
3552 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3553 9f7d7167 2018-04-29 stsp if (error)
3554 9f7d7167 2018-04-29 stsp goto done;
3557 c2301be8 2018-04-30 stsp free(cmd_argv);
3558 9f7d7167 2018-04-29 stsp if (error)
3559 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
