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>
20 31120ada 2018-04-30 stsp #include <errno.h>
21 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
22 9f7d7167 2018-04-29 stsp #include <curses.h>
23 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
24 9f7d7167 2018-04-29 stsp #include <panel.h>
25 9f7d7167 2018-04-29 stsp #include <locale.h>
26 9f7d7167 2018-04-29 stsp #include <stdlib.h>
27 26ed57b2 2018-05-19 stsp #include <stdio.h>
28 9f7d7167 2018-04-29 stsp #include <getopt.h>
29 9f7d7167 2018-04-29 stsp #include <string.h>
30 9f7d7167 2018-04-29 stsp #include <err.h>
31 80ddbec8 2018-04-29 stsp #include <unistd.h>
32 26ed57b2 2018-05-19 stsp #include <util.h>
33 26ed57b2 2018-05-19 stsp #include <limits.h>
34 61e69b96 2018-05-20 stsp #include <wchar.h>
35 788c352e 2018-06-16 stsp #include <time.h>
36 84451b3e 2018-07-10 stsp #include <pthread.h>
37 5036bf37 2018-09-24 stsp #include <libgen.h>
39 9f7d7167 2018-04-29 stsp #include "got_error.h"
40 80ddbec8 2018-04-29 stsp #include "got_object.h"
41 80ddbec8 2018-04-29 stsp #include "got_reference.h"
42 80ddbec8 2018-04-29 stsp #include "got_repository.h"
43 80ddbec8 2018-04-29 stsp #include "got_diff.h"
44 511a516b 2018-05-19 stsp #include "got_opentemp.h"
45 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
46 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
47 a70480e0 2018-06-23 stsp #include "got_blame.h"
50 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
53 9f7d7167 2018-04-29 stsp #ifndef nitems
54 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
57 9f7d7167 2018-04-29 stsp struct tog_cmd {
58 c2301be8 2018-04-30 stsp const char *name;
59 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
60 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
61 c2301be8 2018-04-30 stsp const char *descr;
64 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
65 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
66 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
67 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
68 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
70 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
71 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
72 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
73 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
75 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
76 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
77 9f7d7167 2018-04-29 stsp "show repository history" },
78 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
79 9f7d7167 2018-04-29 stsp "compare files and directories" },
80 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
81 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
82 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
83 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
86 d6b05b5b 2018-08-04 stsp enum tog_view_type {
87 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
88 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
89 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
90 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
93 ad80ab7b 2018-08-04 stsp struct tog_diff_view_state {
94 a3404814 2018-09-02 stsp struct got_object_id *id1, *id2;
96 ad80ab7b 2018-08-04 stsp int first_displayed_line;
97 ad80ab7b 2018-08-04 stsp int last_displayed_line;
101 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
102 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
103 ba4f502b 2018-08-04 stsp struct got_object_id *id;
104 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
106 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
107 ba4f502b 2018-08-04 stsp struct commit_queue {
108 ba4f502b 2018-08-04 stsp int ncommits;
109 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
112 b01e7d3b 2018-08-04 stsp struct tog_log_view_state {
113 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
114 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
115 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
116 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
117 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
118 b01e7d3b 2018-08-04 stsp int selected;
119 b01e7d3b 2018-08-04 stsp char *in_repo_path;
120 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
121 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
124 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
125 e9424729 2018-08-04 stsp pthread_mutex_t *mutex;
126 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
127 e9424729 2018-08-04 stsp int nlines;
129 e9424729 2018-08-04 stsp struct tog_view *view;
130 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
132 e9424729 2018-08-04 stsp const char *path;
133 e9424729 2018-08-04 stsp int *first_displayed_line;
134 e9424729 2018-08-04 stsp int *last_displayed_line;
135 e9424729 2018-08-04 stsp int *selected_line;
140 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
141 e9424729 2018-08-04 stsp const char *path;
142 e9424729 2018-08-04 stsp struct got_repository *repo;
143 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
144 e9424729 2018-08-04 stsp int *complete;
147 e9424729 2018-08-04 stsp struct tog_blame {
149 e9424729 2018-08-04 stsp size_t filesize;
150 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
151 e9424729 2018-08-04 stsp size_t nlines;
152 e9424729 2018-08-04 stsp pthread_t thread;
153 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
154 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
155 e9424729 2018-08-04 stsp const char *path;
158 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
159 7cbe629d 2018-08-04 stsp int first_displayed_line;
160 7cbe629d 2018-08-04 stsp int last_displayed_line;
161 7cbe629d 2018-08-04 stsp int selected_line;
162 7cbe629d 2018-08-04 stsp int blame_complete;
165 7cbe629d 2018-08-04 stsp pthread_mutex_t mutex;
166 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
167 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
168 e5a0f69f 2018-08-18 stsp char *path;
169 7cbe629d 2018-08-04 stsp struct got_repository *repo;
170 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
171 e9424729 2018-08-04 stsp struct tog_blame blame;
174 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
175 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
176 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
177 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
178 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
179 ad80ab7b 2018-08-04 stsp int selected;
182 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
184 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
185 ad80ab7b 2018-08-04 stsp char *tree_label;
186 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
187 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
188 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
189 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
190 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
191 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
192 ad80ab7b 2018-08-04 stsp int nentries, ndisplayed, selected, show_ids;
193 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
194 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
195 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
199 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
201 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
202 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
203 669b5ffa 2018-10-07 stsp * there is enough screen estate.
205 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
206 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
208 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
209 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
210 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
212 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
213 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
215 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
217 cc3c9aac 2018-08-01 stsp struct tog_view {
218 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
219 26ed57b2 2018-05-19 stsp WINDOW *window;
220 26ed57b2 2018-05-19 stsp PANEL *panel;
221 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
222 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
223 1004088d 2018-09-29 stsp int focussed;
224 669b5ffa 2018-10-07 stsp struct tog_view *parent;
225 669b5ffa 2018-10-07 stsp struct tog_view *child;
226 669b5ffa 2018-10-07 stsp int child_focussed;
228 5dc9f4bc 2018-08-04 stsp /* type-specific state */
229 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
231 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
232 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
233 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
234 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
237 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
238 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
239 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
240 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
243 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
244 ba4f502b 2018-08-04 stsp struct got_object *, struct got_object *, struct got_repository *);
245 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
246 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
247 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
248 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
250 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
251 ba4f502b 2018-08-04 stsp struct got_object_id *, struct got_repository *, const char *);
252 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
253 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
254 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
255 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
257 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
258 5221c383 2018-08-01 stsp struct got_object_id *, struct got_repository *);
259 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
260 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
261 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
262 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
264 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
265 4fc679ca 2018-08-04 stsp struct got_tree_object *, struct got_object_id *, struct got_repository *);
266 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
267 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
268 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
269 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
271 e5a0f69f 2018-08-18 stsp static const struct got_error *
272 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
274 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
276 669b5ffa 2018-10-07 stsp if (view->child) {
277 669b5ffa 2018-10-07 stsp view_close(view->child);
278 669b5ffa 2018-10-07 stsp view->child = NULL;
280 e5a0f69f 2018-08-18 stsp if (view->close)
281 e5a0f69f 2018-08-18 stsp err = view->close(view);
282 ea5e7bb5 2018-08-01 stsp if (view->panel)
283 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
284 ea5e7bb5 2018-08-01 stsp if (view->window)
285 ea5e7bb5 2018-08-01 stsp delwin(view->window);
286 ea5e7bb5 2018-08-01 stsp free(view);
287 e5a0f69f 2018-08-18 stsp return err;
290 ea5e7bb5 2018-08-01 stsp static struct tog_view *
291 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
292 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
294 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
296 ea5e7bb5 2018-08-01 stsp if (view == NULL)
297 ea5e7bb5 2018-08-01 stsp return NULL;
299 d6b05b5b 2018-08-04 stsp view->type = type;
300 f7d12f7e 2018-08-01 stsp view->lines = LINES;
301 f7d12f7e 2018-08-01 stsp view->cols = COLS;
302 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
303 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
304 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
305 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
306 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
307 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
308 96a765a8 2018-08-04 stsp view_close(view);
309 ea5e7bb5 2018-08-01 stsp return NULL;
311 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
312 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
313 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
314 96a765a8 2018-08-04 stsp view_close(view);
315 ea5e7bb5 2018-08-01 stsp return NULL;
318 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
319 ea5e7bb5 2018-08-01 stsp return view;
323 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
325 0cf4efb1 2018-09-29 stsp if (begin_x > 0)
327 0cf4efb1 2018-09-29 stsp return (COLS >= 120 ? COLS/2 : 0);
330 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
332 5c60c32a 2018-10-18 stsp static const struct got_error *
333 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
335 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
337 5c60c32a 2018-10-18 stsp view->begin_y = 0;
338 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
339 5c60c32a 2018-10-18 stsp view->nlines = LINES;
340 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
341 5c60c32a 2018-10-18 stsp view->lines = LINES;
342 5c60c32a 2018-10-18 stsp view->cols = COLS;
343 5c60c32a 2018-10-18 stsp err = view_resize(view);
345 5c60c32a 2018-10-18 stsp return err;
347 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
348 5c60c32a 2018-10-18 stsp return got_error_from_errno();
350 5c60c32a 2018-10-18 stsp return NULL;
353 5c60c32a 2018-10-18 stsp static const struct got_error *
354 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
356 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
358 5c60c32a 2018-10-18 stsp view->begin_x = 0;
359 5c60c32a 2018-10-18 stsp view->begin_y = 0;
360 5c60c32a 2018-10-18 stsp view->nlines = LINES;
361 5c60c32a 2018-10-18 stsp view->ncols = COLS;
362 5c60c32a 2018-10-18 stsp view->lines = LINES;
363 5c60c32a 2018-10-18 stsp view->cols = COLS;
364 5c60c32a 2018-10-18 stsp err = view_resize(view);
366 5c60c32a 2018-10-18 stsp return err;
368 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
369 5c60c32a 2018-10-18 stsp return got_error_from_errno();
371 5c60c32a 2018-10-18 stsp return NULL;
375 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
377 5c60c32a 2018-10-18 stsp return view->parent == NULL;
380 4d8c2215 2018-08-19 stsp static const struct got_error *
381 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
383 f7d12f7e 2018-08-01 stsp int nlines, ncols;
385 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
386 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
388 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
390 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
391 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
393 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
395 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
396 0cf4efb1 2018-09-29 stsp return got_error_from_errno();
397 0cf4efb1 2018-09-29 stsp replace_panel(view->panel, view->window);
399 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
400 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
401 0cf4efb1 2018-09-29 stsp view->lines = LINES;
402 0cf4efb1 2018-09-29 stsp view->cols = COLS;
404 5c60c32a 2018-10-18 stsp if (view_is_parent_view(view)) {
405 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
406 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
407 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
408 5c60c32a 2018-10-18 stsp if (view->child->focussed)
409 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
411 5c60c32a 2018-10-18 stsp show_panel(view->panel);
413 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
414 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
418 5c60c32a 2018-10-18 stsp return NULL;
421 669b5ffa 2018-10-07 stsp static const struct got_error *
422 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
424 669b5ffa 2018-10-07 stsp const struct got_error *err;
426 669b5ffa 2018-10-07 stsp if (view->child == NULL)
427 669b5ffa 2018-10-07 stsp return NULL;
429 669b5ffa 2018-10-07 stsp err = view_close(view->child);
430 669b5ffa 2018-10-07 stsp view->child = NULL;
431 669b5ffa 2018-10-07 stsp return err;
434 669b5ffa 2018-10-07 stsp static const struct got_error *
435 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
437 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
439 669b5ffa 2018-10-07 stsp view->child = child;
440 669b5ffa 2018-10-07 stsp child->parent = view;
441 669b5ffa 2018-10-07 stsp return err;
445 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
447 669b5ffa 2018-10-07 stsp return !view_is_parent_view(view) && view->begin_x > 0;
450 0cf4efb1 2018-09-29 stsp static const struct got_error *
451 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
452 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
453 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
455 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
456 669b5ffa 2018-10-07 stsp struct tog_view *v;
459 e5a0f69f 2018-08-18 stsp *new = NULL;
460 e5a0f69f 2018-08-18 stsp *dead = NULL;
461 0cf4efb1 2018-09-29 stsp *focus = NULL;
463 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
464 e5a0f69f 2018-08-18 stsp ch = wgetch(view->window);
465 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
466 e5a0f69f 2018-08-18 stsp switch (ch) {
470 669b5ffa 2018-10-07 stsp if (view->child) {
471 669b5ffa 2018-10-07 stsp *focus = view->child;
472 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
473 669b5ffa 2018-10-07 stsp } else if (view->parent) {
474 669b5ffa 2018-10-07 stsp *focus = view->parent;
475 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 0;
479 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
480 e5a0f69f 2018-08-18 stsp *dead = view;
486 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
487 669b5ffa 2018-10-07 stsp if (view->child == NULL)
489 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view->child)) {
490 669b5ffa 2018-10-07 stsp *focus = view->child;
491 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
492 669b5ffa 2018-10-07 stsp err = view_fullscreen(view->child);
494 669b5ffa 2018-10-07 stsp err = view_splitscreen(view->child);
497 669b5ffa 2018-10-07 stsp err = view->child->input(new, dead, focus,
498 669b5ffa 2018-10-07 stsp view->child, KEY_RESIZE);
500 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view)) {
501 669b5ffa 2018-10-07 stsp *focus = view;
502 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 1;
503 669b5ffa 2018-10-07 stsp err = view_fullscreen(view);
505 669b5ffa 2018-10-07 stsp err = view_splitscreen(view);
509 669b5ffa 2018-10-07 stsp err = view->input(new, dead, focus, view,
510 669b5ffa 2018-10-07 stsp KEY_RESIZE);
513 0cf4efb1 2018-09-29 stsp case KEY_RESIZE:
514 0cf4efb1 2018-09-29 stsp TAILQ_FOREACH(v, views, entry) {
515 0cf4efb1 2018-09-29 stsp err = view_resize(v);
517 0cf4efb1 2018-09-29 stsp return err;
518 878940b7 2018-09-29 stsp err = v->input(new, dead, focus, v, ch);
522 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
526 e5a0f69f 2018-08-18 stsp return err;
530 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
532 0cf4efb1 2018-09-29 stsp PANEL *panel;
533 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
535 669b5ffa 2018-10-07 stsp if (view->parent)
536 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
538 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
539 0cf4efb1 2018-09-29 stsp if (panel == NULL)
542 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
543 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
544 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
548 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
550 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
551 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
553 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
555 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
558 669b5ffa 2018-10-07 stsp return view->focussed;
561 bcbd79e2 2018-08-19 stsp static const struct got_error *
562 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
564 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
565 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
566 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
567 e4197bf9 2018-08-18 stsp int done = 0;
569 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
570 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
572 a81bf10d 2018-09-29 stsp main_view = view;
573 1004088d 2018-09-29 stsp view->focussed = 1;
574 878940b7 2018-09-29 stsp err = view->show(view);
576 0cf4efb1 2018-09-29 stsp return err;
577 0cf4efb1 2018-09-29 stsp update_panels();
578 0cf4efb1 2018-09-29 stsp doupdate();
579 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
580 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
581 e4197bf9 2018-08-18 stsp view, &views);
584 e5a0f69f 2018-08-18 stsp if (dead_view) {
585 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
587 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
588 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
589 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
591 669b5ffa 2018-10-07 stsp prev = view->parent;
593 669b5ffa 2018-10-07 stsp if (dead_view->parent)
594 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
596 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
598 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
599 a81bf10d 2018-09-29 stsp if (err || dead_view == main_view)
602 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
603 0cf4efb1 2018-09-29 stsp if (focus_view)
604 0cf4efb1 2018-09-29 stsp view = focus_view;
605 669b5ffa 2018-10-07 stsp else if (prev)
606 669b5ffa 2018-10-07 stsp view = prev;
607 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
608 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
609 0cf4efb1 2018-09-29 stsp tog_view_list_head);
611 0cf4efb1 2018-09-29 stsp view = NULL;
612 669b5ffa 2018-10-07 stsp if (view) {
613 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
614 669b5ffa 2018-10-07 stsp focus_view = view->child;
616 669b5ffa 2018-10-07 stsp focus_view = view;
620 bcbd79e2 2018-08-19 stsp if (new_view) {
621 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
622 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
623 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
624 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
626 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
627 86c66b02 2018-10-18 stsp err = view_close(v);
630 86c66b02 2018-10-18 stsp if (v == view)
631 86c66b02 2018-10-18 stsp view = new_view;
634 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
635 878940b7 2018-09-29 stsp if (focus_view == NULL)
636 878940b7 2018-09-29 stsp focus_view = new_view;
638 0cf4efb1 2018-09-29 stsp if (focus_view) {
639 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
641 0cf4efb1 2018-09-29 stsp view->focussed = 0;
642 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
643 0cf4efb1 2018-09-29 stsp view = focus_view;
644 878940b7 2018-09-29 stsp if (new_view)
645 878940b7 2018-09-29 stsp show_panel(new_view->panel);
646 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
647 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
649 669b5ffa 2018-10-07 stsp if (view) {
650 669b5ffa 2018-10-07 stsp if (view->parent) {
651 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
653 669b5ffa 2018-10-07 stsp return err;
655 669b5ffa 2018-10-07 stsp err = view->show(view);
657 878940b7 2018-09-29 stsp return err;
658 669b5ffa 2018-10-07 stsp if (view->child) {
659 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
661 669b5ffa 2018-10-07 stsp return err;
664 0cf4efb1 2018-09-29 stsp update_panels();
665 0cf4efb1 2018-09-29 stsp doupdate();
668 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
669 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
670 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
671 e5a0f69f 2018-08-18 stsp view_close(view);
673 e5a0f69f 2018-08-18 stsp return err;
676 4ed7e80c 2018-05-20 stsp __dead static void
677 9f7d7167 2018-04-29 stsp usage_log(void)
680 c70c5802 2018-08-01 stsp fprintf(stderr,
681 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
682 9f7d7167 2018-04-29 stsp getprogname());
686 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
687 80ddbec8 2018-04-29 stsp static const struct got_error *
688 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
690 00dfcb92 2018-06-11 stsp char *vis = NULL;
691 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
693 963b370f 2018-05-20 stsp *ws = NULL;
694 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
695 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
696 00dfcb92 2018-06-11 stsp int vislen;
697 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
698 00dfcb92 2018-06-11 stsp return got_error_from_errno();
700 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
701 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
703 00dfcb92 2018-06-11 stsp return err;
704 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
705 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
706 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
711 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
712 a7f50699 2018-06-11 stsp if (*ws == NULL) {
713 a7f50699 2018-06-11 stsp err = got_error_from_errno();
717 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
718 963b370f 2018-05-20 stsp err = got_error_from_errno();
723 963b370f 2018-05-20 stsp *ws = NULL;
726 963b370f 2018-05-20 stsp return err;
729 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
730 963b370f 2018-05-20 stsp static const struct got_error *
731 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
733 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
734 963b370f 2018-05-20 stsp int cols = 0;
735 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
736 963b370f 2018-05-20 stsp size_t wlen;
739 963b370f 2018-05-20 stsp *wlinep = NULL;
740 b700b5d6 2018-07-10 stsp *widthp = 0;
742 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
744 963b370f 2018-05-20 stsp return err;
747 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
748 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
749 963b370f 2018-05-20 stsp switch (width) {
755 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
756 b700b5d6 2018-07-10 stsp cols += width;
760 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
761 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
765 963b370f 2018-05-20 stsp err = got_error_from_errno();
769 963b370f 2018-05-20 stsp wline[i] = L'\0';
770 b700b5d6 2018-07-10 stsp if (widthp)
771 b700b5d6 2018-07-10 stsp *widthp = cols;
774 963b370f 2018-05-20 stsp free(wline);
776 963b370f 2018-05-20 stsp *wlinep = wline;
777 963b370f 2018-05-20 stsp return err;
780 963b370f 2018-05-20 stsp static const struct got_error *
781 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
782 2814baeb 2018-08-01 stsp struct got_object_id *id)
784 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
785 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
786 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
787 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
788 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
789 bb737323 2018-05-20 stsp int author_width, logmsg_width;
790 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
791 80ddbec8 2018-04-29 stsp char *line = NULL;
792 bb737323 2018-05-20 stsp int col, limit;
793 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
794 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
795 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
797 c70c5802 2018-08-01 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ",
798 c70c5802 2018-08-01 stsp &commit->tm_committer) >= sizeof(datebuf))
799 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
801 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
802 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
804 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
805 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
806 b39d25c7 2018-07-10 stsp col = limit + 1;
807 b39d25c7 2018-07-10 stsp if (col > avail)
810 6d9fbc00 2018-04-29 stsp author0 = strdup(commit->author);
811 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
812 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
815 6d9fbc00 2018-04-29 stsp author = author0;
816 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
817 6d9fbc00 2018-04-29 stsp if (smallerthan)
818 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
820 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
822 6d9fbc00 2018-04-29 stsp *at = '\0';
824 b39d25c7 2018-07-10 stsp limit = avail - col;
825 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
828 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
829 bb737323 2018-05-20 stsp col += author_width;
830 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
831 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
833 bb737323 2018-05-20 stsp author_width++;
835 9c2eaf34 2018-05-20 stsp if (col > avail)
838 bb737323 2018-05-20 stsp logmsg0 = strdup(commit->logmsg);
839 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
840 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
843 bb737323 2018-05-20 stsp logmsg = logmsg0;
844 bb737323 2018-05-20 stsp while (*logmsg == '\n')
846 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
847 bb737323 2018-05-20 stsp if (newline)
848 bb737323 2018-05-20 stsp *newline = '\0';
849 bb737323 2018-05-20 stsp limit = avail - col;
850 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
853 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
854 bb737323 2018-05-20 stsp col += logmsg_width;
855 bb737323 2018-05-20 stsp while (col <= avail) {
856 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
860 80ddbec8 2018-04-29 stsp free(logmsg0);
861 bb737323 2018-05-20 stsp free(wlogmsg);
862 6d9fbc00 2018-04-29 stsp free(author0);
863 bb737323 2018-05-20 stsp free(wauthor);
864 80ddbec8 2018-04-29 stsp free(line);
865 80ddbec8 2018-04-29 stsp return err;
868 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
869 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
870 899d86c2 2018-05-10 stsp struct got_object_id *id)
872 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
874 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
875 80ddbec8 2018-04-29 stsp if (entry == NULL)
876 899d86c2 2018-05-10 stsp return NULL;
878 899d86c2 2018-05-10 stsp entry->id = id;
879 99db9666 2018-05-07 stsp entry->commit = commit;
880 899d86c2 2018-05-10 stsp return entry;
883 99db9666 2018-05-07 stsp static void
884 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
886 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
888 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
889 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
890 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
891 ecb28ae0 2018-07-16 stsp commits->ncommits--;
892 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
893 99db9666 2018-05-07 stsp free(entry);
896 99db9666 2018-05-07 stsp static void
897 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
899 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
900 99db9666 2018-05-07 stsp pop_commit(commits);
903 c4972b91 2018-05-07 stsp static const struct got_error *
904 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
905 93e45b7c 2018-09-24 stsp struct got_object_id *start_id, int minqueue,
906 ecb28ae0 2018-07-16 stsp struct got_repository *repo, const char *path)
908 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
909 93e45b7c 2018-09-24 stsp int nqueued = 0;
911 93e45b7c 2018-09-24 stsp if (start_id) {
912 93e45b7c 2018-09-24 stsp err = got_commit_graph_iter_start(graph, start_id, repo);
914 9ba79e04 2018-06-11 stsp return err;
917 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
918 93e45b7c 2018-09-24 stsp struct got_object_id *id;
919 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
920 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
922 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
924 93e45b7c 2018-09-24 stsp if (err->code == GOT_ERR_ITER_COMPLETED) {
925 9ba79e04 2018-06-11 stsp err = NULL;
928 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
930 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
931 93e45b7c 2018-09-24 stsp minqueue, repo);
933 ecb28ae0 2018-07-16 stsp return err;
937 ecb28ae0 2018-07-16 stsp if (id == NULL)
940 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
943 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
944 9ba79e04 2018-06-11 stsp if (entry == NULL) {
945 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
949 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
951 ecb28ae0 2018-07-16 stsp commits->ncommits++;
954 9ba79e04 2018-06-11 stsp return err;
957 99db9666 2018-05-07 stsp static const struct got_error *
958 9ba79e04 2018-06-11 stsp fetch_next_commit(struct commit_queue_entry **pentry,
959 9ba79e04 2018-06-11 stsp struct commit_queue_entry *entry, struct commit_queue *commits,
960 ecb28ae0 2018-07-16 stsp struct got_commit_graph *graph, struct got_repository *repo,
961 ecb28ae0 2018-07-16 stsp const char *path)
963 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
965 9ba79e04 2018-06-11 stsp *pentry = NULL;
967 93e45b7c 2018-09-24 stsp err = queue_commits(graph, commits, NULL, 1, repo, path);
969 9ba79e04 2018-06-11 stsp return err;
971 9ba79e04 2018-06-11 stsp /* Next entry to display should now be available. */
972 9ba79e04 2018-06-11 stsp *pentry = TAILQ_NEXT(entry, entry);
973 9ba79e04 2018-06-11 stsp return NULL;
976 899d86c2 2018-05-10 stsp static const struct got_error *
977 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
979 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
980 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
982 9ba79e04 2018-06-11 stsp *head_id = NULL;
984 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
986 99db9666 2018-05-07 stsp return err;
988 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
989 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
991 9ba79e04 2018-06-11 stsp *head_id = NULL;
992 99db9666 2018-05-07 stsp return err;
995 9ba79e04 2018-06-11 stsp return NULL;
998 0553a4e3 2018-04-30 stsp static const struct got_error *
999 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1000 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1001 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1002 a7f40148 2018-07-18 stsp struct got_commit_graph *graph, struct got_repository *repo,
1003 a7f40148 2018-07-18 stsp const char *path)
1005 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1006 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1007 ecb28ae0 2018-07-16 stsp int ncommits, width;
1008 867c6645 2018-07-10 stsp char *id_str, *header;
1009 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1011 e0d42f60 2018-07-22 stsp entry = first;
1012 e0d42f60 2018-07-22 stsp ncommits = 0;
1013 e0d42f60 2018-07-22 stsp while (entry) {
1014 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1015 e0d42f60 2018-07-22 stsp *selected = entry;
1018 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1019 e0d42f60 2018-07-22 stsp ncommits++;
1022 867c6645 2018-07-10 stsp err = got_object_id_str(&id_str, (*selected)->id);
1024 867c6645 2018-07-10 stsp return err;
1026 c3ba6f36 2018-08-01 stsp if (path && strcmp(path, "/") != 0) {
1027 ecb28ae0 2018-07-16 stsp if (asprintf(&header, "commit: %s [%s]", id_str, path) == -1) {
1028 ecb28ae0 2018-07-16 stsp err = got_error_from_errno();
1029 ecb28ae0 2018-07-16 stsp free(id_str);
1030 ecb28ae0 2018-07-16 stsp return err;
1032 ecb28ae0 2018-07-16 stsp } else if (asprintf(&header, "commit: %s", id_str) == -1) {
1033 867c6645 2018-07-10 stsp err = got_error_from_errno();
1034 867c6645 2018-07-10 stsp free(id_str);
1035 867c6645 2018-07-10 stsp return err;
1037 ecb28ae0 2018-07-16 stsp free(id_str);
1038 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, header, view->ncols);
1039 ecb28ae0 2018-07-16 stsp if (err) {
1040 ecb28ae0 2018-07-16 stsp free(header);
1041 ecb28ae0 2018-07-16 stsp return err;
1043 ecb28ae0 2018-07-16 stsp free(header);
1045 2814baeb 2018-08-01 stsp werase(view->window);
1047 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1048 a3404814 2018-09-02 stsp wstandout(view->window);
1049 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1050 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1051 a3404814 2018-09-02 stsp wstandend(view->window);
1052 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1053 2814baeb 2018-08-01 stsp waddch(view->window, '\n');
1054 ecb28ae0 2018-07-16 stsp free(wline);
1055 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1056 ecb28ae0 2018-07-16 stsp return NULL;
1058 899d86c2 2018-05-10 stsp entry = first;
1059 899d86c2 2018-05-10 stsp *last = first;
1060 867c6645 2018-07-10 stsp ncommits = 0;
1061 899d86c2 2018-05-10 stsp while (entry) {
1062 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1064 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1065 2814baeb 2018-08-01 stsp wstandout(view->window);
1066 2814baeb 2018-08-01 stsp err = draw_commit(view, entry->commit, entry->id);
1067 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1068 2814baeb 2018-08-01 stsp wstandend(view->window);
1071 0553a4e3 2018-04-30 stsp ncommits++;
1072 899d86c2 2018-05-10 stsp *last = entry;
1073 a7f40148 2018-07-18 stsp if (entry == TAILQ_LAST(&commits->head, commit_queue_head)) {
1074 93e45b7c 2018-09-24 stsp err = queue_commits(graph, commits, NULL, 1,
1075 93e45b7c 2018-09-24 stsp repo, path);
1076 a7f40148 2018-07-18 stsp if (err) {
1077 a7f40148 2018-07-18 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1078 a7f40148 2018-07-18 stsp return err;
1079 a7f40148 2018-07-18 stsp err = NULL;
1082 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1085 1a57306a 2018-09-02 stsp view_vborder(view);
1087 80ddbec8 2018-04-29 stsp return err;
1090 07b55e75 2018-05-10 stsp static void
1091 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1092 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1094 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1095 07b55e75 2018-05-10 stsp int nscrolled = 0;
1097 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1098 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
1101 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1102 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1103 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1104 07b55e75 2018-05-10 stsp if (entry) {
1105 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1106 07b55e75 2018-05-10 stsp nscrolled++;
1111 aa075928 2018-05-10 stsp static const struct got_error *
1112 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1113 93e45b7c 2018-09-24 stsp struct commit_queue_entry **last_displayed_entry,
1114 9ba79e04 2018-06-11 stsp struct commit_queue *commits, struct got_commit_graph *graph,
1115 ecb28ae0 2018-07-16 stsp struct got_repository *repo, const char *path)
1117 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
1118 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
1119 aa075928 2018-05-10 stsp int nscrolled = 0;
1122 93e45b7c 2018-09-24 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1123 aa075928 2018-05-10 stsp if (pentry == NULL) {
1124 93e45b7c 2018-09-24 stsp err = fetch_next_commit(&pentry, *last_displayed_entry,
1125 ecb28ae0 2018-07-16 stsp commits, graph, repo, path);
1126 9a6bf2a5 2018-05-20 stsp if (err || pentry == NULL)
1129 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1131 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1132 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1134 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1135 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1137 dd0a52c1 2018-05-20 stsp return err;
1140 cd0acaa7 2018-05-20 stsp static const struct got_error *
1141 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1142 0cf4efb1 2018-09-29 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
1143 2a4718d3 2018-09-29 stsp struct got_repository *repo)
1145 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1146 cd0acaa7 2018-05-20 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1147 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1148 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1150 2a4718d3 2018-09-29 stsp err = got_object_open(&obj2, repo, commit_id);
1152 cd0acaa7 2018-05-20 stsp return err;
1154 2a4718d3 2018-09-29 stsp parent_id = SIMPLEQ_FIRST(&commit->parent_ids);
1155 9ba79e04 2018-06-11 stsp if (parent_id) {
1156 9ba79e04 2018-06-11 stsp err = got_object_open(&obj1, repo, parent_id->id);
1158 cd0acaa7 2018-05-20 stsp goto done;
1161 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1162 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
1163 ea5e7bb5 2018-08-01 stsp err = got_error_from_errno();
1164 ea5e7bb5 2018-08-01 stsp goto done;
1167 e5a0f69f 2018-08-18 stsp err = open_diff_view(diff_view, obj1, obj2, repo);
1168 e5a0f69f 2018-08-18 stsp if (err == NULL)
1169 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1172 cd0acaa7 2018-05-20 stsp got_object_close(obj1);
1174 cd0acaa7 2018-05-20 stsp got_object_close(obj2);
1175 cd0acaa7 2018-05-20 stsp return err;
1178 80ddbec8 2018-04-29 stsp static const struct got_error *
1179 0cf4efb1 2018-09-29 stsp browse_commit(struct tog_view **new_view, int begin_x,
1180 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *entry, struct got_repository *repo)
1182 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1183 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1184 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1186 9343a5fb 2018-06-23 stsp err = got_object_open_as_tree(&tree, repo, entry->commit->tree_id);
1188 9343a5fb 2018-06-23 stsp return err;
1190 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1191 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1192 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1194 e5a0f69f 2018-08-18 stsp err = open_tree_view(tree_view, tree, entry->id, repo);
1196 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1198 e5a0f69f 2018-08-18 stsp *new_view = tree_view;
1199 9343a5fb 2018-06-23 stsp return err;
1202 9343a5fb 2018-06-23 stsp static const struct got_error *
1203 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1204 04cc582a 2018-08-01 stsp struct got_repository *repo, const char *path)
1206 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1207 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1209 fb2756b9 2018-08-04 stsp err = got_repo_map_path(&s->in_repo_path, repo, path);
1210 ecb28ae0 2018-07-16 stsp if (err != NULL)
1211 ecb28ae0 2018-07-16 stsp goto done;
1213 93e45b7c 2018-09-24 stsp err = got_commit_graph_open(&s->graph, start_id, s->in_repo_path,
1216 9ba79e04 2018-06-11 stsp goto done;
1217 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1218 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1219 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1222 9ba79e04 2018-06-11 stsp * Open the initial batch of commits, sorted in commit graph order.
1223 9ba79e04 2018-06-11 stsp * We keep all commits open throughout the lifetime of the log view
1224 9ba79e04 2018-06-11 stsp * in order to avoid having to re-fetch commits from disk while
1225 9ba79e04 2018-06-11 stsp * updating the display.
1227 93e45b7c 2018-09-24 stsp err = queue_commits(s->graph, &s->commits, start_id, view->nlines,
1228 fb2756b9 2018-08-04 stsp repo, s->in_repo_path);
1229 55198a88 2018-07-16 stsp if (err) {
1230 55198a88 2018-07-16 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1231 55198a88 2018-07-16 stsp goto done;
1232 55198a88 2018-07-16 stsp err = NULL;
1235 93e45b7c 2018-09-24 stsp s->first_displayed_entry = TAILQ_FIRST(&s->commits.head);
1236 1bfa490b 2018-08-18 stsp s->selected_entry = s->first_displayed_entry;
1237 fb2756b9 2018-08-04 stsp s->repo = repo;
1238 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1239 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1240 5036bf37 2018-09-24 stsp err = got_error_from_errno();
1241 5036bf37 2018-09-24 stsp goto done;
1244 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1245 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1246 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1248 ba4f502b 2018-08-04 stsp return err;
1251 e5a0f69f 2018-08-18 stsp static const struct got_error *
1252 e5a0f69f 2018-08-18 stsp close_log_view(struct tog_view *view)
1254 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1256 fb2756b9 2018-08-04 stsp if (s->graph)
1257 fb2756b9 2018-08-04 stsp got_commit_graph_close(s->graph);
1258 fb2756b9 2018-08-04 stsp free_commits(&s->commits);
1259 fb2756b9 2018-08-04 stsp free(s->in_repo_path);
1260 5036bf37 2018-09-24 stsp free(s->start_id);
1261 e5a0f69f 2018-08-18 stsp return NULL;
1264 ba4f502b 2018-08-04 stsp static const struct got_error *
1265 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1267 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
1268 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1270 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1271 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1272 e5a0f69f 2018-08-18 stsp &s->commits, s->selected, view->nlines, s->graph,
1273 e5a0f69f 2018-08-18 stsp s->repo, s->in_repo_path);
1275 bcbd79e2 2018-08-19 stsp return err;
1278 e5a0f69f 2018-08-18 stsp static const struct got_error *
1279 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1280 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1282 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1283 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1284 5036bf37 2018-09-24 stsp char *parent_path;
1285 669b5ffa 2018-10-07 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
1286 669b5ffa 2018-10-07 stsp int begin_x = 0;
1288 e5a0f69f 2018-08-18 stsp switch (ch) {
1290 e5a0f69f 2018-08-18 stsp case KEY_UP:
1292 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1293 e5a0f69f 2018-08-18 stsp s->selected--;
1294 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1296 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry, 1,
1297 e5a0f69f 2018-08-18 stsp &s->commits);
1299 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1300 e5a0f69f 2018-08-18 stsp if (TAILQ_FIRST(&s->commits.head) ==
1301 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
1302 e5a0f69f 2018-08-18 stsp s->selected = 0;
1305 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry,
1306 e5a0f69f 2018-08-18 stsp view->nlines, &s->commits);
1309 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1311 e5a0f69f 2018-08-18 stsp if (s->selected < MIN(view->nlines - 2,
1312 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1313 e5a0f69f 2018-08-18 stsp s->selected++;
1316 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry, 1,
1317 93e45b7c 2018-09-24 stsp &s->last_displayed_entry, &s->commits,
1318 e5a0f69f 2018-08-18 stsp s->graph, s->repo, s->in_repo_path);
1319 e5a0f69f 2018-08-18 stsp if (err) {
1320 4d7951a5 2018-08-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1322 4d7951a5 2018-08-04 stsp err = NULL;
1325 e5a0f69f 2018-08-18 stsp case KEY_NPAGE: {
1326 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *first;
1327 e5a0f69f 2018-08-18 stsp first = s->first_displayed_entry;
1328 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry,
1329 93e45b7c 2018-09-24 stsp view->nlines, &s->last_displayed_entry,
1330 e5a0f69f 2018-08-18 stsp &s->commits, s->graph, s->repo,
1331 e5a0f69f 2018-08-18 stsp s->in_repo_path);
1332 93e45b7c 2018-09-24 stsp if (err && err->code != GOT_ERR_ITER_COMPLETED)
1334 e5a0f69f 2018-08-18 stsp if (first == s->first_displayed_entry &&
1335 e5a0f69f 2018-08-18 stsp s->selected < MIN(view->nlines - 2,
1336 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1337 e5a0f69f 2018-08-18 stsp /* can't scroll further down */
1338 e5a0f69f 2018-08-18 stsp s->selected = MIN(view->nlines - 2,
1339 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1);
1341 e5a0f69f 2018-08-18 stsp err = NULL;
1344 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
1345 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines - 2)
1346 e5a0f69f 2018-08-18 stsp s->selected = view->nlines - 2;
1347 e5a0f69f 2018-08-18 stsp if (s->selected > s->commits.ncommits - 1)
1348 e5a0f69f 2018-08-18 stsp s->selected = s->commits.ncommits - 1;
1350 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
1351 e5a0f69f 2018-08-18 stsp case '\r':
1352 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1353 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1354 669b5ffa 2018-10-07 stsp err = open_diff_view_for_commit(&diff_view, begin_x,
1355 2a4718d3 2018-09-29 stsp s->selected_entry->id, s->selected_entry->commit,
1359 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1360 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1362 669b5ffa 2018-10-07 stsp return err;
1363 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
1364 669b5ffa 2018-10-07 stsp if (err) {
1365 669b5ffa 2018-10-07 stsp view_close(diff_view);
1368 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(diff_view)) {
1369 669b5ffa 2018-10-07 stsp *focus_view = diff_view;
1370 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1373 669b5ffa 2018-10-07 stsp *new_view = diff_view;
1376 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1377 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1378 669b5ffa 2018-10-07 stsp err = browse_commit(&tree_view, begin_x,
1379 0cf4efb1 2018-09-29 stsp s->selected_entry, s->repo);
1380 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1381 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1383 669b5ffa 2018-10-07 stsp return err;
1384 669b5ffa 2018-10-07 stsp err = view_set_child(view, tree_view);
1385 669b5ffa 2018-10-07 stsp if (err) {
1386 669b5ffa 2018-10-07 stsp view_close(tree_view);
1389 669b5ffa 2018-10-07 stsp *focus_view = tree_view;
1390 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1392 669b5ffa 2018-10-07 stsp *new_view = tree_view;
1394 5036bf37 2018-09-24 stsp case KEY_BACKSPACE:
1395 5036bf37 2018-09-24 stsp if (strcmp(s->in_repo_path, "/") == 0)
1397 5036bf37 2018-09-24 stsp parent_path = dirname(s->in_repo_path);
1398 5036bf37 2018-09-24 stsp if (parent_path && strcmp(parent_path, ".") != 0) {
1399 5036bf37 2018-09-24 stsp struct tog_view *lv;
1400 0cf4efb1 2018-09-29 stsp lv = view_open(view->nlines, view->ncols,
1401 0cf4efb1 2018-09-29 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
1402 5036bf37 2018-09-24 stsp if (lv == NULL)
1403 5036bf37 2018-09-24 stsp return got_error_from_errno();
1404 5036bf37 2018-09-24 stsp err = open_log_view(lv, s->start_id, s->repo,
1405 5036bf37 2018-09-24 stsp parent_path);
1408 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1409 669b5ffa 2018-10-07 stsp *new_view = lv;
1411 669b5ffa 2018-10-07 stsp view_set_child(view->parent, lv);
1412 669b5ffa 2018-10-07 stsp *dead_view = view;
1420 80ddbec8 2018-04-29 stsp return err;
1423 4ed7e80c 2018-05-20 stsp static const struct got_error *
1424 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1426 80ddbec8 2018-04-29 stsp const struct got_error *error;
1427 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1428 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1429 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1430 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1432 04cc582a 2018-08-01 stsp struct tog_view *view;
1434 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1435 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
1437 80ddbec8 2018-04-29 stsp err(1, "pledge");
1440 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1441 80ddbec8 2018-04-29 stsp switch (ch) {
1443 80ddbec8 2018-04-29 stsp start_commit = optarg;
1446 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1447 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1448 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1452 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1456 80ddbec8 2018-04-29 stsp argc -= optind;
1457 80ddbec8 2018-04-29 stsp argv += optind;
1459 ecb28ae0 2018-07-16 stsp if (argc == 0)
1460 ecb28ae0 2018-07-16 stsp path = strdup("");
1461 ecb28ae0 2018-07-16 stsp else if (argc == 1)
1462 ecb28ae0 2018-07-16 stsp path = strdup(argv[0]);
1464 80ddbec8 2018-04-29 stsp usage_log();
1465 ecb28ae0 2018-07-16 stsp if (path == NULL)
1466 ecb28ae0 2018-07-16 stsp return got_error_from_errno();
1468 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1469 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1470 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1471 ecb28ae0 2018-07-16 stsp goto done;
1473 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1474 ecb28ae0 2018-07-16 stsp repo_path = strdup(cwd);
1475 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1476 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1477 ecb28ae0 2018-07-16 stsp goto done;
1481 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1482 80ddbec8 2018-04-29 stsp if (error != NULL)
1483 ecb28ae0 2018-07-16 stsp goto done;
1485 80ddbec8 2018-04-29 stsp if (start_commit == NULL) {
1486 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
1487 80ddbec8 2018-04-29 stsp if (error != NULL)
1488 ecb28ae0 2018-07-16 stsp goto done;
1490 80ddbec8 2018-04-29 stsp struct got_object *obj;
1491 80ddbec8 2018-04-29 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
1492 80ddbec8 2018-04-29 stsp if (error == NULL) {
1493 6402fb3c 2018-09-15 stsp start_id = got_object_id_dup(got_object_get_id(obj));
1494 899d86c2 2018-05-10 stsp if (start_id == NULL)
1495 80ddbec8 2018-04-29 stsp error = got_error_from_errno();
1496 ecb28ae0 2018-07-16 stsp goto done;
1499 80ddbec8 2018-04-29 stsp if (error != NULL)
1500 ecb28ae0 2018-07-16 stsp goto done;
1502 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1503 04cc582a 2018-08-01 stsp if (view == NULL) {
1504 04cc582a 2018-08-01 stsp error = got_error_from_errno();
1505 04cc582a 2018-08-01 stsp goto done;
1507 ba4f502b 2018-08-04 stsp error = open_log_view(view, start_id, repo, path);
1508 ba4f502b 2018-08-04 stsp if (error)
1509 ba4f502b 2018-08-04 stsp goto done;
1510 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1512 ecb28ae0 2018-07-16 stsp free(repo_path);
1513 ecb28ae0 2018-07-16 stsp free(cwd);
1514 ecb28ae0 2018-07-16 stsp free(path);
1515 899d86c2 2018-05-10 stsp free(start_id);
1517 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
1518 80ddbec8 2018-04-29 stsp return error;
1521 4ed7e80c 2018-05-20 stsp __dead static void
1522 9f7d7167 2018-04-29 stsp usage_diff(void)
1525 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1526 9f7d7167 2018-04-29 stsp getprogname());
1530 b304db33 2018-05-20 stsp static char *
1531 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
1533 b304db33 2018-05-20 stsp char *line;
1534 b304db33 2018-05-20 stsp size_t linelen;
1535 b304db33 2018-05-20 stsp size_t lineno;
1536 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
1538 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
1540 b304db33 2018-05-20 stsp *len = linelen;
1541 b304db33 2018-05-20 stsp return line;
1544 4ed7e80c 2018-05-20 stsp static const struct got_error *
1545 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1546 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
1547 a3404814 2018-09-02 stsp char * header)
1549 61e69b96 2018-05-20 stsp const struct got_error *err;
1550 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
1551 b304db33 2018-05-20 stsp char *line;
1552 b304db33 2018-05-20 stsp size_t len;
1553 61e69b96 2018-05-20 stsp wchar_t *wline;
1554 e0b650dd 2018-05-20 stsp int width;
1556 26ed57b2 2018-05-19 stsp rewind(f);
1557 f7d12f7e 2018-08-01 stsp werase(view->window);
1559 a3404814 2018-09-02 stsp if (header) {
1560 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
1561 a3404814 2018-09-02 stsp if (err) {
1562 a3404814 2018-09-02 stsp return err;
1565 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1566 a3404814 2018-09-02 stsp wstandout(view->window);
1567 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
1568 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1569 a3404814 2018-09-02 stsp wstandend(view->window);
1570 a3404814 2018-09-02 stsp if (width < view->ncols)
1571 a3404814 2018-09-02 stsp waddch(view->window, '\n');
1573 a3404814 2018-09-02 stsp if (max_lines <= 1)
1574 a3404814 2018-09-02 stsp return NULL;
1575 a3404814 2018-09-02 stsp max_lines--;
1579 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
1580 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
1581 26ed57b2 2018-05-19 stsp if (line == NULL) {
1585 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
1586 26ed57b2 2018-05-19 stsp free(line);
1590 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1591 61e69b96 2018-05-20 stsp if (err) {
1592 61e69b96 2018-05-20 stsp free(line);
1593 61e69b96 2018-05-20 stsp return err;
1595 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1596 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1597 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1598 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
1599 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
1600 26ed57b2 2018-05-19 stsp free(line);
1601 2550e4c3 2018-07-13 stsp free(wline);
1602 2550e4c3 2018-07-13 stsp wline = NULL;
1604 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
1606 1a57306a 2018-09-02 stsp view_vborder(view);
1608 26ed57b2 2018-05-19 stsp return NULL;
1611 4ed7e80c 2018-05-20 stsp static const struct got_error *
1612 5dc9f4bc 2018-08-04 stsp open_diff_view(struct tog_view *view, struct got_object *obj1,
1613 ea5e7bb5 2018-08-01 stsp struct got_object *obj2, struct got_repository *repo)
1615 26ed57b2 2018-05-19 stsp const struct got_error *err;
1618 cd0acaa7 2018-05-20 stsp if (obj1 != NULL && obj2 != NULL &&
1619 cd0acaa7 2018-05-20 stsp got_object_get_type(obj1) != got_object_get_type(obj2))
1620 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
1622 511a516b 2018-05-19 stsp f = got_opentemp();
1623 26ed57b2 2018-05-19 stsp if (f == NULL)
1624 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1626 cd0acaa7 2018-05-20 stsp switch (got_object_get_type(obj1 ? obj1 : obj2)) {
1627 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
1628 f6861a81 2018-09-13 stsp err = got_diff_objects_as_blobs(obj1, obj2, NULL, NULL,
1631 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
1632 f6861a81 2018-09-13 stsp err = got_diff_objects_as_trees(obj1, obj2, "", "", repo, f);
1634 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_COMMIT:
1635 11528a82 2018-05-19 stsp err = got_diff_objects_as_commits(obj1, obj2, repo, f);
1638 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
1641 26ed57b2 2018-05-19 stsp fflush(f);
1643 a3404814 2018-09-02 stsp view->state.diff.id1 = obj1 ? got_object_get_id(obj1) : NULL;
1644 a3404814 2018-09-02 stsp view->state.diff.id2 = got_object_get_id(obj2);
1645 5dc9f4bc 2018-08-04 stsp view->state.diff.f = f;
1646 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
1647 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
1649 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
1650 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
1651 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
1653 5dc9f4bc 2018-08-04 stsp return NULL;
1656 e5a0f69f 2018-08-18 stsp static const struct got_error *
1657 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
1659 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1661 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
1662 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
1663 e5a0f69f 2018-08-18 stsp return err;
1666 5dc9f4bc 2018-08-04 stsp static const struct got_error *
1667 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
1669 a3404814 2018-09-02 stsp const struct got_error *err;
1670 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
1671 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
1673 a3404814 2018-09-02 stsp if (s->id1) {
1674 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
1676 a3404814 2018-09-02 stsp return err;
1678 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
1680 a3404814 2018-09-02 stsp return err;
1682 a3404814 2018-09-02 stsp if (asprintf(&header, "diff: %s %s",
1683 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
1684 a3404814 2018-09-02 stsp err = got_error_from_errno();
1685 a3404814 2018-09-02 stsp free(id_str1);
1686 a3404814 2018-09-02 stsp free(id_str2);
1687 a3404814 2018-09-02 stsp return err;
1689 a3404814 2018-09-02 stsp free(id_str1);
1690 a3404814 2018-09-02 stsp free(id_str2);
1692 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
1693 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
1697 0cf4efb1 2018-09-29 stsp static const struct got_error *
1698 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
1699 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1701 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
1702 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
1705 e5a0f69f 2018-08-18 stsp switch (ch) {
1707 e5a0f69f 2018-08-18 stsp case KEY_UP:
1708 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > 1)
1709 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
1711 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1713 e5a0f69f 2018-08-18 stsp while (i++ < view->nlines - 1 &&
1714 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
1715 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
1718 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1719 e5a0f69f 2018-08-18 stsp if (!s->eof)
1720 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
1722 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
1725 e5a0f69f 2018-08-18 stsp while (!s->eof && i++ < view->nlines - 1) {
1726 e5a0f69f 2018-08-18 stsp char *line;
1727 e5a0f69f 2018-08-18 stsp line = parse_next_line(s->f, NULL);
1728 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
1729 e5a0f69f 2018-08-18 stsp if (line == NULL)
1737 bcbd79e2 2018-08-19 stsp return err;
1740 4ed7e80c 2018-05-20 stsp static const struct got_error *
1741 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
1743 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
1744 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
1745 26ed57b2 2018-05-19 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1746 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
1747 26ed57b2 2018-05-19 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
1749 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
1751 26ed57b2 2018-05-19 stsp #ifndef PROFILE
1752 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
1754 26ed57b2 2018-05-19 stsp err(1, "pledge");
1757 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1758 26ed57b2 2018-05-19 stsp switch (ch) {
1761 26ed57b2 2018-05-19 stsp /* NOTREACHED */
1765 26ed57b2 2018-05-19 stsp argc -= optind;
1766 26ed57b2 2018-05-19 stsp argv += optind;
1768 26ed57b2 2018-05-19 stsp if (argc == 0) {
1769 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
1770 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
1771 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
1772 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1773 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1774 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[0];
1775 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[1];
1776 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
1777 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
1778 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1779 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1780 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[1];
1781 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[2];
1783 26ed57b2 2018-05-19 stsp usage_diff();
1785 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
1786 26ed57b2 2018-05-19 stsp free(repo_path);
1787 26ed57b2 2018-05-19 stsp if (error)
1788 26ed57b2 2018-05-19 stsp goto done;
1790 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
1791 26ed57b2 2018-05-19 stsp if (error)
1792 26ed57b2 2018-05-19 stsp goto done;
1794 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
1795 26ed57b2 2018-05-19 stsp if (error)
1796 26ed57b2 2018-05-19 stsp goto done;
1798 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
1799 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
1800 ea5e7bb5 2018-08-01 stsp error = got_error_from_errno();
1801 ea5e7bb5 2018-08-01 stsp goto done;
1803 5dc9f4bc 2018-08-04 stsp error = open_diff_view(view, obj1, obj2, repo);
1804 5dc9f4bc 2018-08-04 stsp if (error)
1805 5dc9f4bc 2018-08-04 stsp goto done;
1806 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1808 26ed57b2 2018-05-19 stsp got_repo_close(repo);
1810 26ed57b2 2018-05-19 stsp got_object_close(obj1);
1812 26ed57b2 2018-05-19 stsp got_object_close(obj2);
1813 26ed57b2 2018-05-19 stsp return error;
1816 4ed7e80c 2018-05-20 stsp __dead static void
1817 9f7d7167 2018-04-29 stsp usage_blame(void)
1820 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
1821 9f7d7167 2018-04-29 stsp getprogname());
1825 84451b3e 2018-07-10 stsp struct tog_blame_line {
1826 84451b3e 2018-07-10 stsp int annotated;
1827 84451b3e 2018-07-10 stsp struct got_object_id *id;
1830 4ed7e80c 2018-05-20 stsp static const struct got_error *
1831 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
1832 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
1833 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
1834 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
1836 84451b3e 2018-07-10 stsp const struct got_error *err;
1837 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
1838 84451b3e 2018-07-10 stsp char *line;
1839 84451b3e 2018-07-10 stsp size_t len;
1840 84451b3e 2018-07-10 stsp wchar_t *wline;
1841 b700b5d6 2018-07-10 stsp int width, wlimit;
1842 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
1843 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
1844 ab089a2a 2018-07-12 stsp char *id_str;
1846 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
1848 ab089a2a 2018-07-12 stsp return err;
1850 84451b3e 2018-07-10 stsp rewind(f);
1851 f7d12f7e 2018-08-01 stsp werase(view->window);
1853 ab089a2a 2018-07-12 stsp if (asprintf(&line, "commit: %s", id_str) == -1) {
1854 ab089a2a 2018-07-12 stsp err = got_error_from_errno();
1855 ab089a2a 2018-07-12 stsp free(id_str);
1856 ab089a2a 2018-07-12 stsp return err;
1859 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1860 ab089a2a 2018-07-12 stsp free(line);
1861 2550e4c3 2018-07-13 stsp line = NULL;
1862 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1863 a3404814 2018-09-02 stsp wstandout(view->window);
1864 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1865 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1866 a3404814 2018-09-02 stsp wstandend(view->window);
1867 2550e4c3 2018-07-13 stsp free(wline);
1868 2550e4c3 2018-07-13 stsp wline = NULL;
1869 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1870 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1872 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
1873 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
1874 12a0b23b 2018-07-12 stsp blame_complete ? "" : "annotating ", path) == -1) {
1875 ab089a2a 2018-07-12 stsp free(id_str);
1876 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
1878 ab089a2a 2018-07-12 stsp free(id_str);
1879 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1880 3f60a8ef 2018-07-10 stsp free(line);
1881 2550e4c3 2018-07-13 stsp line = NULL;
1883 3f60a8ef 2018-07-10 stsp return err;
1884 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1885 2550e4c3 2018-07-13 stsp free(wline);
1886 2550e4c3 2018-07-13 stsp wline = NULL;
1887 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1888 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1891 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
1892 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
1893 84451b3e 2018-07-10 stsp if (line == NULL) {
1897 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
1898 84451b3e 2018-07-10 stsp free(line);
1902 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
1903 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
1904 84451b3e 2018-07-10 stsp if (err) {
1905 84451b3e 2018-07-10 stsp free(line);
1906 84451b3e 2018-07-10 stsp return err;
1909 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
1910 f7d12f7e 2018-08-01 stsp wstandout(view->window);
1912 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
1913 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
1914 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
1915 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
1916 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
1917 84451b3e 2018-07-10 stsp char *id_str;
1918 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
1919 84451b3e 2018-07-10 stsp if (err) {
1920 84451b3e 2018-07-10 stsp free(line);
1921 2550e4c3 2018-07-13 stsp free(wline);
1922 84451b3e 2018-07-10 stsp return err;
1924 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
1925 84451b3e 2018-07-10 stsp free(id_str);
1926 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
1928 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
1929 ee41ec32 2018-07-10 stsp prev_id = NULL;
1932 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1933 b700b5d6 2018-07-10 stsp while (width < wlimit) {
1934 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
1937 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
1938 f7d12f7e 2018-08-01 stsp wstandend(view->window);
1939 84451b3e 2018-07-10 stsp if (++nprinted == 1)
1940 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
1941 84451b3e 2018-07-10 stsp free(line);
1942 2550e4c3 2018-07-13 stsp free(wline);
1943 2550e4c3 2018-07-13 stsp wline = NULL;
1945 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
1947 1a57306a 2018-09-02 stsp view_vborder(view);
1949 84451b3e 2018-07-10 stsp return NULL;
1952 84451b3e 2018-07-10 stsp static const struct got_error *
1953 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
1955 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
1956 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
1957 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
1959 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
1960 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
1961 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
1963 84451b3e 2018-07-10 stsp if (pthread_mutex_lock(a->mutex) != 0)
1964 84451b3e 2018-07-10 stsp return got_error_from_errno();
1966 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
1967 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
1968 d68a0a7d 2018-07-10 stsp goto done;
1971 d68a0a7d 2018-07-10 stsp if (lineno == -1)
1972 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
1974 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
1975 d68a0a7d 2018-07-10 stsp if (line->annotated)
1976 d68a0a7d 2018-07-10 stsp goto done;
1978 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
1979 84451b3e 2018-07-10 stsp if (line->id == NULL) {
1980 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1981 84451b3e 2018-07-10 stsp goto done;
1983 84451b3e 2018-07-10 stsp line->annotated = 1;
1985 f7d12f7e 2018-08-01 stsp err = draw_blame(a->view, a->commit_id, a->f, a->path,
1986 245d91c1 2018-07-12 stsp a->lines, a->nlines, 0, *a->selected_line, a->first_displayed_line,
1987 e5a0f69f 2018-08-18 stsp a->last_displayed_line, a->eof, a->view->nlines);
1989 84451b3e 2018-07-10 stsp if (pthread_mutex_unlock(a->mutex) != 0)
1990 84451b3e 2018-07-10 stsp return got_error_from_errno();
1991 84451b3e 2018-07-10 stsp return err;
1994 84451b3e 2018-07-10 stsp static void *
1995 84451b3e 2018-07-10 stsp blame_thread(void *arg)
1997 18430de3 2018-07-10 stsp const struct got_error *err;
1998 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
1999 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
2001 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2002 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
2004 18430de3 2018-07-10 stsp if (pthread_mutex_lock(a->mutex) != 0)
2005 18430de3 2018-07-10 stsp return (void *)got_error_from_errno();
2007 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
2008 c9beca56 2018-07-22 stsp ta->repo = NULL;
2009 c9beca56 2018-07-22 stsp *ta->complete = 1;
2011 f7d12f7e 2018-08-01 stsp err = draw_blame(a->view, a->commit_id, a->f, a->path,
2012 f7d12f7e 2018-08-01 stsp a->lines, a->nlines, 1, *a->selected_line,
2013 e5a0f69f 2018-08-18 stsp a->first_displayed_line, a->last_displayed_line, a->eof,
2014 f7d12f7e 2018-08-01 stsp a->view->nlines);
2016 18430de3 2018-07-10 stsp if (pthread_mutex_unlock(a->mutex) != 0 && err == NULL)
2017 18430de3 2018-07-10 stsp err = got_error_from_errno();
2019 18430de3 2018-07-10 stsp return (void *)err;
2022 245d91c1 2018-07-12 stsp static struct got_object_id *
2023 245d91c1 2018-07-12 stsp get_selected_commit_id(struct tog_blame_line *lines,
2024 245d91c1 2018-07-12 stsp int first_displayed_line, int selected_line)
2026 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
2028 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
2029 245d91c1 2018-07-12 stsp if (!line->annotated)
2030 245d91c1 2018-07-12 stsp return NULL;
2032 245d91c1 2018-07-12 stsp return line->id;
2035 84451b3e 2018-07-10 stsp static const struct got_error *
2036 245d91c1 2018-07-12 stsp open_selected_commit(struct got_object **pobj, struct got_object **obj,
2037 b880a918 2018-07-10 stsp struct tog_blame_line *lines, int first_displayed_line,
2038 b880a918 2018-07-10 stsp int selected_line, struct got_repository *repo)
2040 b880a918 2018-07-10 stsp const struct got_error *err = NULL;
2041 b880a918 2018-07-10 stsp struct got_commit_object *commit = NULL;
2042 245d91c1 2018-07-12 stsp struct got_object_id *selected_id;
2043 b880a918 2018-07-10 stsp struct got_object_qid *pid;
2045 b880a918 2018-07-10 stsp *pobj = NULL;
2046 b880a918 2018-07-10 stsp *obj = NULL;
2048 245d91c1 2018-07-12 stsp selected_id = get_selected_commit_id(lines,
2049 245d91c1 2018-07-12 stsp first_displayed_line, selected_line);
2050 245d91c1 2018-07-12 stsp if (selected_id == NULL)
2051 b880a918 2018-07-10 stsp return NULL;
2053 245d91c1 2018-07-12 stsp err = got_object_open(obj, repo, selected_id);
2055 b880a918 2018-07-10 stsp goto done;
2057 b880a918 2018-07-10 stsp err = got_object_commit_open(&commit, repo, *obj);
2059 b880a918 2018-07-10 stsp goto done;
2061 b880a918 2018-07-10 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
2062 b880a918 2018-07-10 stsp if (pid) {
2063 b880a918 2018-07-10 stsp err = got_object_open(pobj, repo, pid->id);
2065 b880a918 2018-07-10 stsp goto done;
2068 b880a918 2018-07-10 stsp if (commit)
2069 b880a918 2018-07-10 stsp got_object_commit_close(commit);
2070 b880a918 2018-07-10 stsp return err;
2073 b880a918 2018-07-10 stsp static const struct got_error *
2074 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
2076 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
2079 245d91c1 2018-07-12 stsp if (blame->thread) {
2080 245d91c1 2018-07-12 stsp if (pthread_join(blame->thread, (void **)&err) != 0)
2081 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2082 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
2083 245d91c1 2018-07-12 stsp err = NULL;
2084 245d91c1 2018-07-12 stsp blame->thread = NULL;
2086 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
2087 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
2088 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
2090 245d91c1 2018-07-12 stsp if (blame->f) {
2091 245d91c1 2018-07-12 stsp fclose(blame->f);
2092 245d91c1 2018-07-12 stsp blame->f = NULL;
2094 245d91c1 2018-07-12 stsp for (i = 0; i < blame->nlines; i++)
2095 245d91c1 2018-07-12 stsp free(blame->lines[i].id);
2096 245d91c1 2018-07-12 stsp free(blame->lines);
2097 245d91c1 2018-07-12 stsp blame->lines = NULL;
2098 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
2099 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
2101 245d91c1 2018-07-12 stsp return err;
2104 245d91c1 2018-07-12 stsp static const struct got_error *
2105 7cc84d77 2018-08-01 stsp run_blame(struct tog_blame *blame, pthread_mutex_t *mutex,
2106 7cc84d77 2018-08-01 stsp struct tog_view *view, int *blame_complete,
2107 245d91c1 2018-07-12 stsp int *first_displayed_line, int *last_displayed_line,
2108 e5a0f69f 2018-08-18 stsp int *selected_line, int *done, int *eof, const char *path,
2109 245d91c1 2018-07-12 stsp struct got_object_id *commit_id,
2110 245d91c1 2018-07-12 stsp struct got_repository *repo)
2112 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
2113 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
2114 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
2115 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
2116 27d434c2 2018-09-15 stsp struct got_object *obj = NULL;
2118 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2120 27d434c2 2018-09-15 stsp goto done;
2122 27d434c2 2018-09-15 stsp err = got_object_open(&obj, repo, obj_id);
2124 84451b3e 2018-07-10 stsp goto done;
2126 84451b3e 2018-07-10 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_BLOB) {
2127 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2128 84451b3e 2018-07-10 stsp goto done;
2131 84451b3e 2018-07-10 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
2133 a70480e0 2018-06-23 stsp goto done;
2134 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
2135 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
2136 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2137 84451b3e 2018-07-10 stsp goto done;
2139 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2140 245d91c1 2018-07-12 stsp blame->f, blob);
2142 84451b3e 2018-07-10 stsp goto done;
2144 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2145 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
2146 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2147 84451b3e 2018-07-10 stsp goto done;
2150 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2152 bd24772e 2018-07-11 stsp goto done;
2154 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
2155 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
2156 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
2157 245d91c1 2018-07-12 stsp blame->cb_args.mutex = mutex;
2158 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
2159 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
2160 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2161 245d91c1 2018-07-12 stsp goto done;
2163 245d91c1 2018-07-12 stsp blame->cb_args.f = blame->f;
2164 245d91c1 2018-07-12 stsp blame->cb_args.path = path;
2165 245d91c1 2018-07-12 stsp blame->cb_args.first_displayed_line = first_displayed_line;
2166 245d91c1 2018-07-12 stsp blame->cb_args.selected_line = selected_line;
2167 245d91c1 2018-07-12 stsp blame->cb_args.last_displayed_line = last_displayed_line;
2168 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
2169 e5a0f69f 2018-08-18 stsp blame->cb_args.eof = eof;
2171 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
2172 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
2173 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
2174 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
2175 245d91c1 2018-07-12 stsp *blame_complete = 0;
2177 245d91c1 2018-07-12 stsp if (pthread_create(&blame->thread, NULL, blame_thread,
2178 245d91c1 2018-07-12 stsp &blame->thread_args) != 0) {
2179 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2180 245d91c1 2018-07-12 stsp goto done;
2185 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
2186 27d434c2 2018-09-15 stsp free(obj_id);
2188 245d91c1 2018-07-12 stsp got_object_close(obj);
2190 245d91c1 2018-07-12 stsp stop_blame(blame);
2191 245d91c1 2018-07-12 stsp return err;
2194 245d91c1 2018-07-12 stsp static const struct got_error *
2195 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
2196 e1cd8fed 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
2198 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
2199 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2201 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
2203 fb2756b9 2018-08-04 stsp if (pthread_mutex_init(&s->mutex, NULL) != 0)
2204 7cbe629d 2018-08-04 stsp return got_error_from_errno();
2206 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2208 7cbe629d 2018-08-04 stsp return err;
2210 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2211 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
2212 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
2213 fb2756b9 2018-08-04 stsp s->selected_line = 1;
2214 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
2215 fb2756b9 2018-08-04 stsp s->path = path;
2216 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
2217 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2218 fb2756b9 2018-08-04 stsp s->repo = repo;
2219 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
2220 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
2222 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
2223 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
2224 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
2226 e5a0f69f 2018-08-18 stsp return run_blame(&s->blame, &s->mutex, view, &s->blame_complete,
2227 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
2228 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2229 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2232 e5a0f69f 2018-08-18 stsp static const struct got_error *
2233 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
2235 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2236 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2238 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
2239 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
2241 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2242 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
2243 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2244 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2245 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
2248 e5a0f69f 2018-08-18 stsp free(s->path);
2250 e5a0f69f 2018-08-18 stsp return err;
2253 7cbe629d 2018-08-04 stsp static const struct got_error *
2254 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
2256 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2257 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
2259 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0)
2260 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2262 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2263 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2264 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
2265 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
2267 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0 && err == NULL)
2268 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2270 669b5ffa 2018-10-07 stsp view_vborder(view);
2271 e5a0f69f 2018-08-18 stsp return err;
2274 e5a0f69f 2018-08-18 stsp static const struct got_error *
2275 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2276 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2278 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
2279 7cbe629d 2018-08-04 stsp struct got_object *obj = NULL, *pobj = NULL;
2280 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
2281 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2282 669b5ffa 2018-10-07 stsp int begin_x = 0;
2284 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0) {
2285 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2286 e5a0f69f 2018-08-18 stsp goto done;
2289 e5a0f69f 2018-08-18 stsp switch (ch) {
2291 e5a0f69f 2018-08-18 stsp s->done = 1;
2292 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0) {
2293 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2294 e5a0f69f 2018-08-18 stsp goto done;
2296 e5a0f69f 2018-08-18 stsp return stop_blame(&s->blame);
2298 e5a0f69f 2018-08-18 stsp case KEY_UP:
2299 e5a0f69f 2018-08-18 stsp if (s->selected_line > 1)
2300 e5a0f69f 2018-08-18 stsp s->selected_line--;
2301 e5a0f69f 2018-08-18 stsp else if (s->selected_line == 1 &&
2302 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2303 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2305 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2306 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line == 1) {
2307 e5a0f69f 2018-08-18 stsp s->selected_line = 1;
2310 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > view->nlines - 2)
2311 e5a0f69f 2018-08-18 stsp s->first_displayed_line -=
2312 e5a0f69f 2018-08-18 stsp (view->nlines - 2);
2314 e5a0f69f 2018-08-18 stsp s->first_displayed_line = 1;
2317 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2318 e5a0f69f 2018-08-18 stsp if (s->selected_line < view->nlines - 2 &&
2319 e5a0f69f 2018-08-18 stsp s->first_displayed_line +
2320 e5a0f69f 2018-08-18 stsp s->selected_line <= s->blame.nlines)
2321 e5a0f69f 2018-08-18 stsp s->selected_line++;
2322 e5a0f69f 2018-08-18 stsp else if (s->last_displayed_line <
2323 e5a0f69f 2018-08-18 stsp s->blame.nlines)
2324 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2327 e5a0f69f 2018-08-18 stsp case 'p': {
2328 e5a0f69f 2018-08-18 stsp struct got_object_id *id;
2329 e5a0f69f 2018-08-18 stsp id = get_selected_commit_id(s->blame.lines,
2330 e5a0f69f 2018-08-18 stsp s->first_displayed_line, s->selected_line);
2331 e5a0f69f 2018-08-18 stsp if (id == NULL || got_object_id_cmp(id,
2332 e5a0f69f 2018-08-18 stsp s->blamed_commit->id) == 0)
2334 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2335 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2336 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2339 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2341 e5a0f69f 2018-08-18 stsp if (ch == 'p' && pobj == NULL)
2343 e5a0f69f 2018-08-18 stsp s->done = 1;
2344 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0) {
2345 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2346 e5a0f69f 2018-08-18 stsp goto done;
2348 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2349 e5a0f69f 2018-08-18 stsp s->done = 0;
2350 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0) {
2351 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2352 e5a0f69f 2018-08-18 stsp goto done;
2354 e5a0f69f 2018-08-18 stsp if (thread_err)
2356 e5a0f69f 2018-08-18 stsp id = got_object_get_id(ch == 'b' ? obj : pobj);
2357 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2358 e5a0f69f 2018-08-18 stsp obj = NULL;
2359 e5a0f69f 2018-08-18 stsp if (pobj) {
2360 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2361 e5a0f69f 2018-08-18 stsp pobj = NULL;
2363 6402fb3c 2018-09-15 stsp err = got_object_qid_alloc(&s->blamed_commit, id);
2365 e5a0f69f 2018-08-18 stsp goto done;
2366 e5a0f69f 2018-08-18 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2367 e5a0f69f 2018-08-18 stsp s->blamed_commit, entry);
2368 e5a0f69f 2018-08-18 stsp err = run_blame(&s->blame, &s->mutex, view,
2369 e5a0f69f 2018-08-18 stsp &s->blame_complete,
2370 e5a0f69f 2018-08-18 stsp &s->first_displayed_line,
2371 e5a0f69f 2018-08-18 stsp &s->last_displayed_line,
2372 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof,
2373 e5a0f69f 2018-08-18 stsp s->path, s->blamed_commit->id, s->repo);
2378 e5a0f69f 2018-08-18 stsp case 'B': {
2379 e5a0f69f 2018-08-18 stsp struct got_object_qid *first;
2380 e5a0f69f 2018-08-18 stsp first = SIMPLEQ_FIRST(&s->blamed_commits);
2381 e5a0f69f 2018-08-18 stsp if (!got_object_id_cmp(first->id, s->commit_id))
2383 e5a0f69f 2018-08-18 stsp s->done = 1;
2384 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0) {
2385 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2386 e5a0f69f 2018-08-18 stsp goto done;
2388 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2389 e5a0f69f 2018-08-18 stsp s->done = 0;
2390 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0) {
2391 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2392 e5a0f69f 2018-08-18 stsp goto done;
2394 e5a0f69f 2018-08-18 stsp if (thread_err)
2396 e5a0f69f 2018-08-18 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2397 e5a0f69f 2018-08-18 stsp got_object_qid_free(s->blamed_commit);
2398 e5a0f69f 2018-08-18 stsp s->blamed_commit =
2399 e5a0f69f 2018-08-18 stsp SIMPLEQ_FIRST(&s->blamed_commits);
2400 e5a0f69f 2018-08-18 stsp err = run_blame(&s->blame, &s->mutex, view,
2401 e5a0f69f 2018-08-18 stsp &s->blame_complete,
2402 e5a0f69f 2018-08-18 stsp &s->first_displayed_line,
2403 e5a0f69f 2018-08-18 stsp &s->last_displayed_line,
2404 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2405 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2410 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2411 e5a0f69f 2018-08-18 stsp case '\r':
2412 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2413 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2414 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2417 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2420 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
2421 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
2422 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2423 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
2424 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2427 669b5ffa 2018-10-07 stsp err = open_diff_view(diff_view, pobj, obj, s->repo);
2428 e5a0f69f 2018-08-18 stsp if (err) {
2429 e5a0f69f 2018-08-18 stsp view_close(diff_view);
2432 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
2433 669b5ffa 2018-10-07 stsp err = view_close_child(view);
2435 669b5ffa 2018-10-07 stsp return err;
2436 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
2437 669b5ffa 2018-10-07 stsp if (err) {
2438 669b5ffa 2018-10-07 stsp view_close(diff_view);
2441 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(diff_view)) {
2442 669b5ffa 2018-10-07 stsp *focus_view = diff_view;
2443 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
2446 669b5ffa 2018-10-07 stsp *new_view = diff_view;
2447 e5a0f69f 2018-08-18 stsp if (pobj) {
2448 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2449 e5a0f69f 2018-08-18 stsp pobj = NULL;
2451 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2452 e5a0f69f 2018-08-18 stsp obj = NULL;
2456 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2458 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line >= s->blame.nlines &&
2459 e5a0f69f 2018-08-18 stsp s->selected_line < view->nlines - 2) {
2460 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2461 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2464 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line + view->nlines - 2
2465 e5a0f69f 2018-08-18 stsp <= s->blame.nlines)
2466 e5a0f69f 2018-08-18 stsp s->first_displayed_line +=
2467 e5a0f69f 2018-08-18 stsp view->nlines - 2;
2469 e5a0f69f 2018-08-18 stsp s->first_displayed_line =
2470 e5a0f69f 2018-08-18 stsp s->blame.nlines -
2471 e5a0f69f 2018-08-18 stsp (view->nlines - 3);
2473 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
2474 e5a0f69f 2018-08-18 stsp if (s->selected_line > view->nlines - 2) {
2475 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2476 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2483 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0)
2484 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2487 b880a918 2018-07-10 stsp got_object_close(pobj);
2488 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
2491 a70480e0 2018-06-23 stsp static const struct got_error *
2492 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
2494 a70480e0 2018-06-23 stsp const struct got_error *error;
2495 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
2496 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2497 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
2498 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
2500 e1cd8fed 2018-08-01 stsp struct tog_view *view;
2502 a70480e0 2018-06-23 stsp #ifndef PROFILE
2503 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
2505 a70480e0 2018-06-23 stsp err(1, "pledge");
2508 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2509 a70480e0 2018-06-23 stsp switch (ch) {
2511 a70480e0 2018-06-23 stsp commit_id_str = optarg;
2514 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2515 69069811 2018-08-02 stsp if (repo_path == NULL)
2516 69069811 2018-08-02 stsp err(1, "-r option");
2520 a70480e0 2018-06-23 stsp /* NOTREACHED */
2524 a70480e0 2018-06-23 stsp argc -= optind;
2525 a70480e0 2018-06-23 stsp argv += optind;
2527 69069811 2018-08-02 stsp if (argc == 1)
2528 69069811 2018-08-02 stsp path = argv[0];
2530 a70480e0 2018-06-23 stsp usage_blame();
2532 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
2533 69069811 2018-08-02 stsp if (cwd == NULL) {
2534 69069811 2018-08-02 stsp error = got_error_from_errno();
2535 69069811 2018-08-02 stsp goto done;
2537 69069811 2018-08-02 stsp if (repo_path == NULL) {
2538 69069811 2018-08-02 stsp repo_path = strdup(cwd);
2539 69069811 2018-08-02 stsp if (repo_path == NULL) {
2540 69069811 2018-08-02 stsp error = got_error_from_errno();
2541 69069811 2018-08-02 stsp goto done;
2546 69069811 2018-08-02 stsp error = got_repo_open(&repo, repo_path);
2547 a70480e0 2018-06-23 stsp if (error != NULL)
2548 66b4983c 2018-06-23 stsp return error;
2550 69069811 2018-08-02 stsp error = got_repo_map_path(&in_repo_path, repo, path);
2551 69069811 2018-08-02 stsp if (error != NULL)
2552 69069811 2018-08-02 stsp goto done;
2554 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
2555 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
2556 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
2557 a70480e0 2018-06-23 stsp if (error != NULL)
2558 66b4983c 2018-06-23 stsp goto done;
2559 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2560 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
2562 a70480e0 2018-06-23 stsp struct got_object *obj;
2563 a70480e0 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_str);
2564 a70480e0 2018-06-23 stsp if (error != NULL)
2565 66b4983c 2018-06-23 stsp goto done;
2566 6402fb3c 2018-09-15 stsp commit_id = got_object_id_dup(got_object_get_id(obj));
2567 a19e88aa 2018-06-23 stsp if (commit_id == NULL)
2568 66b4983c 2018-06-23 stsp error = got_error_from_errno();
2569 a19e88aa 2018-06-23 stsp got_object_close(obj);
2571 a19e88aa 2018-06-23 stsp if (error != NULL)
2572 a19e88aa 2018-06-23 stsp goto done;
2574 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
2575 e1cd8fed 2018-08-01 stsp if (view == NULL) {
2576 e1cd8fed 2018-08-01 stsp error = got_error_from_errno();
2577 e1cd8fed 2018-08-01 stsp goto done;
2579 7cbe629d 2018-08-04 stsp error = open_blame_view(view, in_repo_path, commit_id, repo);
2580 7cbe629d 2018-08-04 stsp if (error)
2581 7cbe629d 2018-08-04 stsp goto done;
2582 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2584 69069811 2018-08-02 stsp free(repo_path);
2585 69069811 2018-08-02 stsp free(cwd);
2586 a70480e0 2018-06-23 stsp free(commit_id);
2588 a70480e0 2018-06-23 stsp got_repo_close(repo);
2589 a70480e0 2018-06-23 stsp return error;
2592 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2593 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
2594 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
2595 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
2596 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
2597 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
2598 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
2600 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
2601 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
2602 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
2603 ffd1d5e5 2018-06-23 stsp int width, n;
2605 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
2607 f7d12f7e 2018-08-01 stsp werase(view->window);
2609 ffd1d5e5 2018-06-23 stsp if (limit == 0)
2610 ffd1d5e5 2018-06-23 stsp return NULL;
2612 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
2614 ffd1d5e5 2018-06-23 stsp return err;
2615 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2616 a3404814 2018-09-02 stsp wstandout(view->window);
2617 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2618 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2619 a3404814 2018-09-02 stsp wstandend(view->window);
2620 2550e4c3 2018-07-13 stsp free(wline);
2621 2550e4c3 2018-07-13 stsp wline = NULL;
2622 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2623 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2624 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2625 ffd1d5e5 2018-06-23 stsp return NULL;
2626 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
2628 ce52c690 2018-06-23 stsp return err;
2629 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2630 2550e4c3 2018-07-13 stsp free(wline);
2631 2550e4c3 2018-07-13 stsp wline = NULL;
2632 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2633 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2634 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2635 ffd1d5e5 2018-06-23 stsp return NULL;
2636 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2637 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
2638 a1eca9bb 2018-06-23 stsp return NULL;
2640 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2641 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
2642 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
2643 0cf4efb1 2018-09-29 stsp if (view->focussed)
2644 0cf4efb1 2018-09-29 stsp wstandout(view->window);
2645 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
2647 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
2648 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
2649 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2650 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2651 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2652 ffd1d5e5 2018-06-23 stsp return NULL;
2656 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
2657 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2660 ffd1d5e5 2018-06-23 stsp while (te) {
2661 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
2663 1d13200f 2018-07-12 stsp if (show_ids) {
2664 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
2666 1d13200f 2018-07-12 stsp return got_error_from_errno();
2668 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
2669 1d13200f 2018-07-12 stsp te->name, S_ISDIR(te->mode) ? "/" : "") == -1) {
2670 1d13200f 2018-07-12 stsp free(id_str);
2671 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2673 1d13200f 2018-07-12 stsp free(id_str);
2674 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2675 ffd1d5e5 2018-06-23 stsp if (err) {
2676 ffd1d5e5 2018-06-23 stsp free(line);
2679 ffd1d5e5 2018-06-23 stsp if (n == selected) {
2680 0cf4efb1 2018-09-29 stsp if (view->focussed)
2681 0cf4efb1 2018-09-29 stsp wstandout(view->window);
2682 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
2684 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2685 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2686 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2687 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
2688 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2689 ffd1d5e5 2018-06-23 stsp free(line);
2690 2550e4c3 2018-07-13 stsp free(wline);
2691 2550e4c3 2018-07-13 stsp wline = NULL;
2693 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2694 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
2695 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2697 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2700 ffd1d5e5 2018-06-23 stsp return err;
2703 ffd1d5e5 2018-06-23 stsp static void
2704 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
2705 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
2707 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
2710 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
2713 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2714 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
2715 ffd1d5e5 2018-06-23 stsp if (!isroot)
2716 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
2720 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
2721 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
2722 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
2723 ffd1d5e5 2018-06-23 stsp prev = te;
2724 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2726 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
2727 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2729 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
2730 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
2733 ffd1d5e5 2018-06-23 stsp static void
2734 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
2735 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
2736 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
2738 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *next;
2739 ffd1d5e5 2018-06-23 stsp int n = 0;
2741 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_NEXT(last_displayed_entry, entry) == NULL)
2744 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
2745 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
2747 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
2748 ffd1d5e5 2018-06-23 stsp while (next) {
2749 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = next;
2750 ffd1d5e5 2018-06-23 stsp if (++n >= maxscroll)
2752 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(next, entry);
2756 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2757 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
2758 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
2760 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
2761 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
2762 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
2764 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
2765 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
2767 ce52c690 2018-06-23 stsp len += strlen(te->name);
2769 ce52c690 2018-06-23 stsp *path = calloc(1, len);
2770 ffd1d5e5 2018-06-23 stsp if (path == NULL)
2771 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2773 ce52c690 2018-06-23 stsp (*path)[0] = '/';
2774 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
2775 d9765a41 2018-06-23 stsp while (pt) {
2776 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
2777 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
2778 cb2ebc8a 2018-06-23 stsp goto done;
2780 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
2781 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
2782 cb2ebc8a 2018-06-23 stsp goto done;
2784 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
2787 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
2788 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
2789 ce52c690 2018-06-23 stsp goto done;
2793 ce52c690 2018-06-23 stsp if (err) {
2794 ce52c690 2018-06-23 stsp free(*path);
2795 ce52c690 2018-06-23 stsp *path = NULL;
2797 ce52c690 2018-06-23 stsp return err;
2800 ce52c690 2018-06-23 stsp static const struct got_error *
2801 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
2802 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
2803 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
2805 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
2806 ce52c690 2018-06-23 stsp char *path;
2807 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
2809 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
2811 ce52c690 2018-06-23 stsp return err;
2813 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
2814 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
2815 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2817 e5a0f69f 2018-08-18 stsp err = open_blame_view(blame_view, path, commit_id, repo);
2818 e5a0f69f 2018-08-18 stsp if (err) {
2819 e5a0f69f 2018-08-18 stsp view_close(blame_view);
2820 e5a0f69f 2018-08-18 stsp free(path);
2822 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
2823 69efd4c4 2018-07-18 stsp return err;
2826 69efd4c4 2018-07-18 stsp static const struct got_error *
2827 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
2828 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
2829 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
2831 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
2832 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
2833 69efd4c4 2018-07-18 stsp char *path;
2835 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
2836 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
2837 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2839 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
2841 69efd4c4 2018-07-18 stsp return err;
2843 e5a0f69f 2018-08-18 stsp err = open_log_view(log_view, commit_id, repo, path);
2845 e5a0f69f 2018-08-18 stsp view_close(log_view);
2847 e5a0f69f 2018-08-18 stsp *new_view = log_view;
2848 cb2ebc8a 2018-06-23 stsp free(path);
2849 cb2ebc8a 2018-06-23 stsp return err;
2852 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2853 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
2854 5221c383 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
2856 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
2857 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
2858 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
2860 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
2862 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
2863 ffd1d5e5 2018-06-23 stsp if (err != NULL)
2864 ffd1d5e5 2018-06-23 stsp goto done;
2866 fb2756b9 2018-08-04 stsp if (asprintf(&s->tree_label, "commit: %s", commit_id_str) == -1) {
2867 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
2868 ffd1d5e5 2018-06-23 stsp goto done;
2871 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
2872 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
2873 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
2874 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
2875 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
2876 6484ec90 2018-09-29 stsp err = got_error_from_errno();
2877 6484ec90 2018-09-29 stsp goto done;
2879 fb2756b9 2018-08-04 stsp s->repo = repo;
2881 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
2882 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
2883 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
2885 ad80ab7b 2018-08-04 stsp free(commit_id_str);
2886 6484ec90 2018-09-29 stsp if (err) {
2887 fb2756b9 2018-08-04 stsp free(s->tree_label);
2888 6484ec90 2018-09-29 stsp s->tree_label = NULL;
2890 ad80ab7b 2018-08-04 stsp return err;
2893 e5a0f69f 2018-08-18 stsp static const struct got_error *
2894 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
2896 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
2898 fb2756b9 2018-08-04 stsp free(s->tree_label);
2899 6484ec90 2018-09-29 stsp s->tree_label = NULL;
2900 6484ec90 2018-09-29 stsp free(s->commit_id);
2901 6484ec90 2018-09-29 stsp s->commit_id = NULL;
2902 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
2903 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
2904 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
2905 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
2906 ad80ab7b 2018-08-04 stsp free(parent);
2909 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
2910 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
2911 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
2913 e5a0f69f 2018-08-18 stsp return NULL;
2916 ad80ab7b 2018-08-04 stsp static const struct got_error *
2917 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
2919 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
2920 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
2921 e5a0f69f 2018-08-18 stsp char *parent_path;
2923 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
2925 e5a0f69f 2018-08-18 stsp return err;
2927 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
2928 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
2929 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
2930 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
2931 e5a0f69f 2018-08-18 stsp free(parent_path);
2933 669b5ffa 2018-10-07 stsp view_vborder(view);
2934 e5a0f69f 2018-08-18 stsp return err;
2937 e5a0f69f 2018-08-18 stsp static const struct got_error *
2938 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
2939 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2941 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2942 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
2943 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
2944 669b5ffa 2018-10-07 stsp int begin_x = 0;
2946 e5a0f69f 2018-08-18 stsp switch (ch) {
2948 e5a0f69f 2018-08-18 stsp s->show_ids = !s->show_ids;
2951 669b5ffa 2018-10-07 stsp if (!s->selected_entry)
2953 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
2954 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
2955 669b5ffa 2018-10-07 stsp err = log_tree_entry(&log_view, begin_x,
2956 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
2957 669b5ffa 2018-10-07 stsp s->commit_id, s->repo);
2958 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
2959 669b5ffa 2018-10-07 stsp err = view_close_child(view);
2961 669b5ffa 2018-10-07 stsp return err;
2962 669b5ffa 2018-10-07 stsp err = view_set_child(view, log_view);
2963 669b5ffa 2018-10-07 stsp if (err) {
2964 669b5ffa 2018-10-07 stsp view_close(log_view);
2967 669b5ffa 2018-10-07 stsp *focus_view = log_view;
2968 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
2970 669b5ffa 2018-10-07 stsp *new_view = log_view;
2973 e5a0f69f 2018-08-18 stsp case KEY_UP:
2974 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
2975 e5a0f69f 2018-08-18 stsp s->selected--;
2976 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
2978 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry, 1,
2979 e5a0f69f 2018-08-18 stsp s->entries, s->tree == s->root);
2981 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2982 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_FIRST(&s->entries->head) ==
2983 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
2984 e5a0f69f 2018-08-18 stsp if (s->tree != s->root)
2985 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
2986 e5a0f69f 2018-08-18 stsp s->selected = 0;
2989 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry,
2990 e5a0f69f 2018-08-18 stsp view->nlines, s->entries,
2991 e5a0f69f 2018-08-18 stsp s->tree == s->root);
2994 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2995 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1) {
2996 e5a0f69f 2018-08-18 stsp s->selected++;
2999 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry, 1,
3000 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, s->entries);
3002 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
3003 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry,
3004 e5a0f69f 2018-08-18 stsp view->nlines, s->last_displayed_entry,
3005 e5a0f69f 2018-08-18 stsp s->entries);
3006 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry,
3009 e5a0f69f 2018-08-18 stsp /* can't scroll any further; move cursor down */
3010 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1)
3011 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3013 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
3014 e5a0f69f 2018-08-18 stsp case '\r':
3015 e5a0f69f 2018-08-18 stsp if (s->selected_entry == NULL) {
3016 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3017 7837eeac 2018-09-24 stsp case KEY_BACKSPACE:
3018 e5a0f69f 2018-08-18 stsp /* user selected '..' */
3019 e5a0f69f 2018-08-18 stsp if (s->tree == s->root)
3021 e5a0f69f 2018-08-18 stsp parent = TAILQ_FIRST(&s->parents);
3022 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&s->parents, parent,
3024 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->tree);
3025 e5a0f69f 2018-08-18 stsp s->tree = parent->tree;
3026 e5a0f69f 2018-08-18 stsp s->entries =
3027 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3028 e5a0f69f 2018-08-18 stsp s->first_displayed_entry =
3029 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry;
3030 e5a0f69f 2018-08-18 stsp s->selected_entry =
3031 e5a0f69f 2018-08-18 stsp parent->selected_entry;
3032 e5a0f69f 2018-08-18 stsp s->selected = parent->selected;
3033 e5a0f69f 2018-08-18 stsp free(parent);
3034 e5a0f69f 2018-08-18 stsp } else if (S_ISDIR(s->selected_entry->mode)) {
3035 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3036 e5a0f69f 2018-08-18 stsp struct got_tree_object *child;
3037 e5a0f69f 2018-08-18 stsp err = got_object_open_as_tree(&child,
3038 e5a0f69f 2018-08-18 stsp s->repo, s->selected_entry->id);
3041 e5a0f69f 2018-08-18 stsp parent = calloc(1, sizeof(*parent));
3042 e5a0f69f 2018-08-18 stsp if (parent == NULL) {
3043 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
3046 e5a0f69f 2018-08-18 stsp parent->tree = s->tree;
3047 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry =
3048 e5a0f69f 2018-08-18 stsp s->first_displayed_entry;
3049 e5a0f69f 2018-08-18 stsp parent->selected_entry = s->selected_entry;
3050 e5a0f69f 2018-08-18 stsp parent->selected = s->selected;
3051 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3052 e5a0f69f 2018-08-18 stsp s->tree = child;
3053 e5a0f69f 2018-08-18 stsp s->entries =
3054 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3055 e5a0f69f 2018-08-18 stsp s->selected = 0;
3056 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3057 e5a0f69f 2018-08-18 stsp } else if (S_ISREG(s->selected_entry->mode)) {
3058 669b5ffa 2018-10-07 stsp struct tog_view *blame_view;
3059 669b5ffa 2018-10-07 stsp int begin_x = view_is_parent_view(view) ?
3060 669b5ffa 2018-10-07 stsp view_split_begin_x(view->begin_x) : 0;
3062 669b5ffa 2018-10-07 stsp err = blame_tree_entry(&blame_view, begin_x,
3063 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents, s->commit_id,
3067 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3068 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3070 669b5ffa 2018-10-07 stsp return err;
3071 669b5ffa 2018-10-07 stsp err = view_set_child(view, blame_view);
3072 669b5ffa 2018-10-07 stsp if (err) {
3073 669b5ffa 2018-10-07 stsp view_close(blame_view);
3076 669b5ffa 2018-10-07 stsp *focus_view = blame_view;
3077 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3079 669b5ffa 2018-10-07 stsp *new_view = blame_view;
3082 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
3083 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines)
3084 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3090 ffd1d5e5 2018-06-23 stsp return err;
3093 ffd1d5e5 2018-06-23 stsp __dead static void
3094 ffd1d5e5 2018-06-23 stsp usage_tree(void)
3097 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3098 ffd1d5e5 2018-06-23 stsp getprogname());
3102 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3103 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
3105 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
3106 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
3107 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
3108 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3109 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
3110 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
3111 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
3113 5221c383 2018-08-01 stsp struct tog_view *view;
3115 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
3116 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
3118 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
3121 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
3122 ffd1d5e5 2018-06-23 stsp switch (ch) {
3124 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
3128 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
3132 ffd1d5e5 2018-06-23 stsp argc -= optind;
3133 ffd1d5e5 2018-06-23 stsp argv += optind;
3135 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
3136 ffd1d5e5 2018-06-23 stsp repo_path = getcwd(NULL, 0);
3137 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3138 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3139 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
3140 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
3141 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3142 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3144 ffd1d5e5 2018-06-23 stsp usage_log();
3146 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
3147 ffd1d5e5 2018-06-23 stsp free(repo_path);
3148 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3149 ffd1d5e5 2018-06-23 stsp return error;
3151 ffd1d5e5 2018-06-23 stsp if (commit_id_arg == NULL) {
3152 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
3153 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3154 ffd1d5e5 2018-06-23 stsp goto done;
3156 ffd1d5e5 2018-06-23 stsp struct got_object *obj;
3157 ffd1d5e5 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_arg);
3158 ffd1d5e5 2018-06-23 stsp if (error == NULL) {
3159 6402fb3c 2018-09-15 stsp commit_id = got_object_id_dup(got_object_get_id(obj));
3160 ffd1d5e5 2018-06-23 stsp if (commit_id == NULL)
3161 ffd1d5e5 2018-06-23 stsp error = got_error_from_errno();
3164 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3165 ffd1d5e5 2018-06-23 stsp goto done;
3167 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3168 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3169 ffd1d5e5 2018-06-23 stsp goto done;
3171 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_tree(&tree, repo, commit->tree_id);
3172 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3173 ffd1d5e5 2018-06-23 stsp goto done;
3175 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3176 5221c383 2018-08-01 stsp if (view == NULL) {
3177 5221c383 2018-08-01 stsp error = got_error_from_errno();
3178 5221c383 2018-08-01 stsp goto done;
3180 ad80ab7b 2018-08-04 stsp error = open_tree_view(view, tree, commit_id, repo);
3181 ad80ab7b 2018-08-04 stsp if (error)
3182 ad80ab7b 2018-08-04 stsp goto done;
3183 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3185 ffd1d5e5 2018-06-23 stsp free(commit_id);
3186 ffd1d5e5 2018-06-23 stsp if (commit)
3187 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
3189 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
3191 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
3192 ffd1d5e5 2018-06-23 stsp return error;
3194 5c5136c5 2018-05-20 stsp static void
3195 9f7d7167 2018-04-29 stsp init_curses(void)
3197 9f7d7167 2018-04-29 stsp initscr();
3201 9f7d7167 2018-04-29 stsp intrflush(stdscr, FALSE);
3202 9f7d7167 2018-04-29 stsp keypad(stdscr, TRUE);
3203 1f475ad8 2018-05-10 stsp curs_set(0);
3206 4ed7e80c 2018-05-20 stsp __dead static void
3207 9f7d7167 2018-04-29 stsp usage(void)
3211 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3212 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
3213 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3214 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
3215 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3220 c2301be8 2018-04-30 stsp static char **
3221 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
3223 c2301be8 2018-04-30 stsp char **argv;
3224 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
3226 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
3227 c2301be8 2018-04-30 stsp if (argv == NULL)
3228 c2301be8 2018-04-30 stsp err(1, "calloc");
3229 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
3230 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
3231 c2301be8 2018-04-30 stsp err(1, "calloc");
3232 c2301be8 2018-04-30 stsp if (arg1) {
3233 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
3234 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
3235 c2301be8 2018-04-30 stsp err(1, "calloc");
3238 c2301be8 2018-04-30 stsp return argv;
3242 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
3244 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
3245 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
3246 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
3247 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
3249 9f7d7167 2018-04-29 stsp setlocale(LC_ALL, "");
3251 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
3252 9f7d7167 2018-04-29 stsp switch (ch) {
3254 9f7d7167 2018-04-29 stsp hflag = 1;
3258 9f7d7167 2018-04-29 stsp /* NOTREACHED */
3262 9f7d7167 2018-04-29 stsp argc -= optind;
3263 9f7d7167 2018-04-29 stsp argv += optind;
3264 9f7d7167 2018-04-29 stsp optind = 0;
3265 c2301be8 2018-04-30 stsp optreset = 1;
3267 c2301be8 2018-04-30 stsp if (argc == 0) {
3268 f29d3e89 2018-06-23 stsp if (hflag)
3270 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
3271 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
3272 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
3277 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
3278 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3279 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
3280 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
3281 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
3282 9f7d7167 2018-04-29 stsp if (hflag)
3283 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
3287 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
3288 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
3289 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
3290 c2301be8 2018-04-30 stsp if (repo_path) {
3291 c2301be8 2018-04-30 stsp struct got_repository *repo;
3292 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
3293 c2301be8 2018-04-30 stsp if (error == NULL)
3294 c2301be8 2018-04-30 stsp got_repo_close(repo);
3296 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
3297 c2301be8 2018-04-30 stsp if (error) {
3298 f29d3e89 2018-06-23 stsp if (hflag) {
3299 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
3300 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
3304 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
3305 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
3306 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
3307 ad7de8d9 2018-04-30 stsp free(repo_path);
3310 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
3311 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
3313 c2301be8 2018-04-30 stsp free(repo_path);
3317 5c5136c5 2018-05-20 stsp init_curses();
3319 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3320 9f7d7167 2018-04-29 stsp if (error)
3321 9f7d7167 2018-04-29 stsp goto done;
3324 c2301be8 2018-04-30 stsp free(cmd_argv);
3325 9f7d7167 2018-04-29 stsp if (error)
3326 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
