2 9f7d7167 2018-04-29 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
4 9f7d7167 2018-04-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 9f7d7167 2018-04-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 9f7d7167 2018-04-29 stsp * copyright notice and this permission notice appear in all copies.
8 9f7d7167 2018-04-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 9f7d7167 2018-04-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 9f7d7167 2018-04-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 9f7d7167 2018-04-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 9f7d7167 2018-04-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 9f7d7167 2018-04-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 9f7d7167 2018-04-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 80ddbec8 2018-04-29 stsp #include <sys/queue.h>
18 ffd1d5e5 2018-06-23 stsp #include <sys/stat.h>
19 25791caa 2018-10-24 stsp #include <sys/ioctl.h>
21 31120ada 2018-04-30 stsp #include <errno.h>
22 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
23 9f7d7167 2018-04-29 stsp #include <curses.h>
24 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
25 9f7d7167 2018-04-29 stsp #include <panel.h>
26 9f7d7167 2018-04-29 stsp #include <locale.h>
27 9f7d7167 2018-04-29 stsp #include <stdlib.h>
28 26ed57b2 2018-05-19 stsp #include <stdio.h>
29 9f7d7167 2018-04-29 stsp #include <getopt.h>
30 9f7d7167 2018-04-29 stsp #include <string.h>
31 9f7d7167 2018-04-29 stsp #include <err.h>
32 80ddbec8 2018-04-29 stsp #include <unistd.h>
33 26ed57b2 2018-05-19 stsp #include <util.h>
34 26ed57b2 2018-05-19 stsp #include <limits.h>
35 61e69b96 2018-05-20 stsp #include <wchar.h>
36 788c352e 2018-06-16 stsp #include <time.h>
37 84451b3e 2018-07-10 stsp #include <pthread.h>
38 5036bf37 2018-09-24 stsp #include <libgen.h>
40 9f7d7167 2018-04-29 stsp #include "got_error.h"
41 80ddbec8 2018-04-29 stsp #include "got_object.h"
42 80ddbec8 2018-04-29 stsp #include "got_reference.h"
43 80ddbec8 2018-04-29 stsp #include "got_repository.h"
44 80ddbec8 2018-04-29 stsp #include "got_diff.h"
45 511a516b 2018-05-19 stsp #include "got_opentemp.h"
46 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
47 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
48 a70480e0 2018-06-23 stsp #include "got_blame.h"
51 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
55 2bd27830 2018-10-22 stsp #define MAX(_a,_b) ((_a) > (_b) ? (_a) : (_b))
59 9f7d7167 2018-04-29 stsp #ifndef nitems
60 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 9f7d7167 2018-04-29 stsp struct tog_cmd {
64 c2301be8 2018-04-30 stsp const char *name;
65 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
66 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
67 c2301be8 2018-04-30 stsp const char *descr;
70 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
71 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
72 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
73 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
74 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
76 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
77 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
78 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
79 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
81 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
82 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
83 9f7d7167 2018-04-29 stsp "show repository history" },
84 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
85 9f7d7167 2018-04-29 stsp "compare files and directories" },
86 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
87 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
88 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
89 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
92 d6b05b5b 2018-08-04 stsp enum tog_view_type {
93 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
94 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
95 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
96 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
99 ad80ab7b 2018-08-04 stsp struct tog_diff_view_state {
100 a3404814 2018-09-02 stsp struct got_object_id *id1, *id2;
102 ad80ab7b 2018-08-04 stsp int first_displayed_line;
103 ad80ab7b 2018-08-04 stsp int last_displayed_line;
105 48ae06ee 2018-10-18 stsp int diff_context;
106 48ae06ee 2018-10-18 stsp struct got_repository *repo;
109 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
110 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
111 ba4f502b 2018-08-04 stsp struct got_object_id *id;
112 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
115 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
116 ba4f502b 2018-08-04 stsp struct commit_queue {
117 ba4f502b 2018-08-04 stsp int ncommits;
118 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
121 1a76625f 2018-10-22 stsp pthread_mutex_t tog_mutex = PTHREAD_MUTEX_INITIALIZER;
123 1a76625f 2018-10-22 stsp struct tog_log_thread_args {
124 1a76625f 2018-10-22 stsp pthread_cond_t need_commits;
125 1a76625f 2018-10-22 stsp int commits_needed;
126 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
127 1a76625f 2018-10-22 stsp struct commit_queue *commits;
128 1a76625f 2018-10-22 stsp const char *in_repo_path;
129 1a76625f 2018-10-22 stsp struct got_object_id *start_id;
130 1a76625f 2018-10-22 stsp struct got_repository *repo;
131 1a76625f 2018-10-22 stsp int log_complete;
132 1a76625f 2018-10-22 stsp sig_atomic_t *quit;
133 1a76625f 2018-10-22 stsp struct tog_view *view;
134 1a76625f 2018-10-22 stsp struct commit_queue_entry **first_displayed_entry;
135 1a76625f 2018-10-22 stsp struct commit_queue_entry **selected_entry;
138 1a76625f 2018-10-22 stsp struct tog_log_view_state {
139 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
140 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
141 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
142 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
143 b01e7d3b 2018-08-04 stsp int selected;
144 b01e7d3b 2018-08-04 stsp char *in_repo_path;
145 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
146 5036bf37 2018-09-24 stsp struct got_object_id *start_id;
147 1a76625f 2018-10-22 stsp sig_atomic_t quit;
148 1a76625f 2018-10-22 stsp pthread_t thread;
149 1a76625f 2018-10-22 stsp struct tog_log_thread_args thread_args;
152 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
153 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
154 e9424729 2018-08-04 stsp int nlines;
156 e9424729 2018-08-04 stsp struct tog_view *view;
157 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
161 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
162 e9424729 2018-08-04 stsp const char *path;
163 e9424729 2018-08-04 stsp struct got_repository *repo;
164 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
165 e9424729 2018-08-04 stsp int *complete;
168 e9424729 2018-08-04 stsp struct tog_blame {
170 e9424729 2018-08-04 stsp size_t filesize;
171 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
172 6fcac457 2018-11-19 stsp int nlines;
173 e9424729 2018-08-04 stsp pthread_t thread;
174 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
175 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
176 e9424729 2018-08-04 stsp const char *path;
179 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
180 7cbe629d 2018-08-04 stsp int first_displayed_line;
181 7cbe629d 2018-08-04 stsp int last_displayed_line;
182 7cbe629d 2018-08-04 stsp int selected_line;
183 7cbe629d 2018-08-04 stsp int blame_complete;
186 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
187 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
188 e5a0f69f 2018-08-18 stsp char *path;
189 7cbe629d 2018-08-04 stsp struct got_repository *repo;
190 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
191 e9424729 2018-08-04 stsp struct tog_blame blame;
194 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
195 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
196 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
197 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
198 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
199 ad80ab7b 2018-08-04 stsp int selected;
202 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
204 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
205 ad80ab7b 2018-08-04 stsp char *tree_label;
206 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
207 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
208 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
209 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
210 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
211 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
212 ad80ab7b 2018-08-04 stsp int nentries, ndisplayed, selected, show_ids;
213 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
214 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
215 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
219 669b5ffa 2018-10-07 stsp * We implement two types of views: parent views and child views.
221 669b5ffa 2018-10-07 stsp * The 'Tab' key switches between a parent view and its child view.
222 669b5ffa 2018-10-07 stsp * Child views are shown side-by-side to their parent view, provided
223 669b5ffa 2018-10-07 stsp * there is enough screen estate.
225 669b5ffa 2018-10-07 stsp * When a new view is opened from within a parent view, this new view
226 669b5ffa 2018-10-07 stsp * becomes a child view of the parent view, replacing any existing child.
228 669b5ffa 2018-10-07 stsp * When a new view is opened from within a child view, this new view
229 669b5ffa 2018-10-07 stsp * becomes a parent view which will obscure the views below until the
230 669b5ffa 2018-10-07 stsp * user quits the new parent view by typing 'q'.
232 669b5ffa 2018-10-07 stsp * This list of views contains parent views only.
233 669b5ffa 2018-10-07 stsp * Child views are only pointed to by their parent view.
235 bcbd79e2 2018-08-19 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
237 cc3c9aac 2018-08-01 stsp struct tog_view {
238 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
239 26ed57b2 2018-05-19 stsp WINDOW *window;
240 26ed57b2 2018-05-19 stsp PANEL *panel;
241 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
242 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
243 1004088d 2018-09-29 stsp int focussed;
244 669b5ffa 2018-10-07 stsp struct tog_view *parent;
245 669b5ffa 2018-10-07 stsp struct tog_view *child;
246 669b5ffa 2018-10-07 stsp int child_focussed;
248 5dc9f4bc 2018-08-04 stsp /* type-specific state */
249 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
251 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
252 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
253 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
254 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
257 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
258 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
259 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view**, struct tog_view *, int);
260 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
263 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
264 ba4f502b 2018-08-04 stsp struct got_object *, struct got_object *, struct got_repository *);
265 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
266 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
267 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
268 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
270 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
271 23721109 2018-10-22 stsp struct got_object_id *, struct got_repository *, const char *, int);
272 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
273 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
274 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
275 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
277 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
278 5221c383 2018-08-01 stsp struct got_object_id *, struct got_repository *);
279 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
280 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
281 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
282 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
284 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
285 4fc679ca 2018-08-04 stsp struct got_tree_object *, struct got_object_id *, struct got_repository *);
286 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
287 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
288 878940b7 2018-09-29 stsp struct tog_view **, struct tog_view **, struct tog_view *, int);
289 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
291 25791caa 2018-10-24 stsp static volatile sig_atomic_t tog_sigwinch_received;
293 25791caa 2018-10-24 stsp static void
294 25791caa 2018-10-24 stsp tog_sigwinch(int signo)
296 25791caa 2018-10-24 stsp tog_sigwinch_received = 1;
299 e5a0f69f 2018-08-18 stsp static const struct got_error *
300 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
302 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
304 669b5ffa 2018-10-07 stsp if (view->child) {
305 669b5ffa 2018-10-07 stsp view_close(view->child);
306 669b5ffa 2018-10-07 stsp view->child = NULL;
308 e5a0f69f 2018-08-18 stsp if (view->close)
309 e5a0f69f 2018-08-18 stsp err = view->close(view);
310 ea5e7bb5 2018-08-01 stsp if (view->panel)
311 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
312 ea5e7bb5 2018-08-01 stsp if (view->window)
313 ea5e7bb5 2018-08-01 stsp delwin(view->window);
314 ea5e7bb5 2018-08-01 stsp free(view);
315 e5a0f69f 2018-08-18 stsp return err;
318 ea5e7bb5 2018-08-01 stsp static struct tog_view *
319 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
320 0cf4efb1 2018-09-29 stsp enum tog_view_type type)
322 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
324 ea5e7bb5 2018-08-01 stsp if (view == NULL)
325 ea5e7bb5 2018-08-01 stsp return NULL;
327 d6b05b5b 2018-08-04 stsp view->type = type;
328 f7d12f7e 2018-08-01 stsp view->lines = LINES;
329 f7d12f7e 2018-08-01 stsp view->cols = COLS;
330 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
331 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
332 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
333 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
334 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
335 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
336 96a765a8 2018-08-04 stsp view_close(view);
337 ea5e7bb5 2018-08-01 stsp return NULL;
339 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
340 0cf4efb1 2018-09-29 stsp if (view->panel == NULL ||
341 0cf4efb1 2018-09-29 stsp set_panel_userptr(view->panel, view) != OK) {
342 96a765a8 2018-08-04 stsp view_close(view);
343 ea5e7bb5 2018-08-01 stsp return NULL;
346 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
347 ea5e7bb5 2018-08-01 stsp return view;
351 0cf4efb1 2018-09-29 stsp view_split_begin_x(int begin_x)
353 2bd27830 2018-10-22 stsp if (begin_x > 0 || COLS < 120)
355 2bd27830 2018-10-22 stsp return (COLS - MAX(COLS / 2, 80));
358 5c60c32a 2018-10-18 stsp static const struct got_error *view_resize(struct tog_view *);
360 5c60c32a 2018-10-18 stsp static const struct got_error *
361 5c60c32a 2018-10-18 stsp view_splitscreen(struct tog_view *view)
363 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
365 5c60c32a 2018-10-18 stsp view->begin_y = 0;
366 5c60c32a 2018-10-18 stsp view->begin_x = view_split_begin_x(0);
367 5c60c32a 2018-10-18 stsp view->nlines = LINES;
368 5c60c32a 2018-10-18 stsp view->ncols = COLS - view->begin_x;
369 5c60c32a 2018-10-18 stsp view->lines = LINES;
370 5c60c32a 2018-10-18 stsp view->cols = COLS;
371 5c60c32a 2018-10-18 stsp err = view_resize(view);
373 5c60c32a 2018-10-18 stsp return err;
375 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
376 5c60c32a 2018-10-18 stsp return got_error_from_errno();
378 5c60c32a 2018-10-18 stsp return NULL;
381 5c60c32a 2018-10-18 stsp static const struct got_error *
382 5c60c32a 2018-10-18 stsp view_fullscreen(struct tog_view *view)
384 5c60c32a 2018-10-18 stsp const struct got_error *err = NULL;
386 5c60c32a 2018-10-18 stsp view->begin_x = 0;
387 5c60c32a 2018-10-18 stsp view->begin_y = 0;
388 5c60c32a 2018-10-18 stsp view->nlines = LINES;
389 5c60c32a 2018-10-18 stsp view->ncols = COLS;
390 5c60c32a 2018-10-18 stsp view->lines = LINES;
391 5c60c32a 2018-10-18 stsp view->cols = COLS;
392 5c60c32a 2018-10-18 stsp err = view_resize(view);
394 5c60c32a 2018-10-18 stsp return err;
396 5c60c32a 2018-10-18 stsp if (mvwin(view->window, view->begin_y, view->begin_x) == ERR)
397 5c60c32a 2018-10-18 stsp return got_error_from_errno();
399 5c60c32a 2018-10-18 stsp return NULL;
403 5c60c32a 2018-10-18 stsp view_is_parent_view(struct tog_view *view)
405 5c60c32a 2018-10-18 stsp return view->parent == NULL;
408 4d8c2215 2018-08-19 stsp static const struct got_error *
409 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
411 f7d12f7e 2018-08-01 stsp int nlines, ncols;
413 0cf4efb1 2018-09-29 stsp if (view->lines > LINES)
414 0cf4efb1 2018-09-29 stsp nlines = view->nlines - (view->lines - LINES);
416 0cf4efb1 2018-09-29 stsp nlines = view->nlines + (LINES - view->lines);
418 0cf4efb1 2018-09-29 stsp if (view->cols > COLS)
419 0cf4efb1 2018-09-29 stsp ncols = view->ncols - (view->cols - COLS);
421 0cf4efb1 2018-09-29 stsp ncols = view->ncols + (COLS - view->cols);
423 0cf4efb1 2018-09-29 stsp if (wresize(view->window, nlines, ncols) == ERR)
424 0cf4efb1 2018-09-29 stsp return got_error_from_errno();
425 a6d7eb8d 2018-10-24 stsp if (replace_panel(view->panel, view->window) == ERR)
426 a6d7eb8d 2018-10-24 stsp return got_error_from_errno();
427 25791caa 2018-10-24 stsp wclear(view->window);
429 0cf4efb1 2018-09-29 stsp view->nlines = nlines;
430 0cf4efb1 2018-09-29 stsp view->ncols = ncols;
431 0cf4efb1 2018-09-29 stsp view->lines = LINES;
432 0cf4efb1 2018-09-29 stsp view->cols = COLS;
434 6e3e5d9c 2018-10-18 stsp if (view->child) {
435 5c60c32a 2018-10-18 stsp view->child->begin_x = view_split_begin_x(view->begin_x);
436 5c60c32a 2018-10-18 stsp if (view->child->begin_x == 0) {
437 5c60c32a 2018-10-18 stsp view_fullscreen(view->child);
438 5c60c32a 2018-10-18 stsp if (view->child->focussed)
439 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
441 5c60c32a 2018-10-18 stsp show_panel(view->panel);
443 5c60c32a 2018-10-18 stsp view_splitscreen(view->child);
444 5c60c32a 2018-10-18 stsp show_panel(view->child->panel);
448 5c60c32a 2018-10-18 stsp return NULL;
451 669b5ffa 2018-10-07 stsp static const struct got_error *
452 669b5ffa 2018-10-07 stsp view_close_child(struct tog_view *view)
454 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
456 669b5ffa 2018-10-07 stsp if (view->child == NULL)
457 669b5ffa 2018-10-07 stsp return NULL;
459 669b5ffa 2018-10-07 stsp err = view_close(view->child);
460 669b5ffa 2018-10-07 stsp view->child = NULL;
461 669b5ffa 2018-10-07 stsp return err;
464 669b5ffa 2018-10-07 stsp static const struct got_error *
465 669b5ffa 2018-10-07 stsp view_set_child(struct tog_view *view, struct tog_view *child)
467 669b5ffa 2018-10-07 stsp const struct got_error *err = NULL;
469 669b5ffa 2018-10-07 stsp view->child = child;
470 669b5ffa 2018-10-07 stsp child->parent = view;
471 669b5ffa 2018-10-07 stsp return err;
475 bfddd0d9 2018-09-29 stsp view_is_splitscreen(struct tog_view *view)
477 669b5ffa 2018-10-07 stsp return !view_is_parent_view(view) && view->begin_x > 0;
480 25791caa 2018-10-24 stsp static void
481 79fcf3e4 2018-11-04 stsp tog_resizeterm(void)
483 25791caa 2018-10-24 stsp int cols, lines;
484 25791caa 2018-10-24 stsp struct winsize size;
486 25791caa 2018-10-24 stsp if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &size) < 0) {
487 25791caa 2018-10-24 stsp cols = 80; /* Default */
488 25791caa 2018-10-24 stsp lines = 24;
490 25791caa 2018-10-24 stsp cols = size.ws_col;
491 25791caa 2018-10-24 stsp lines = size.ws_row;
493 25791caa 2018-10-24 stsp resize_term(lines, cols);
496 0cf4efb1 2018-09-29 stsp static const struct got_error *
497 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
498 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
499 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
501 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
502 669b5ffa 2018-10-07 stsp struct tog_view *v;
503 1a76625f 2018-10-22 stsp int ch, errcode;
505 e5a0f69f 2018-08-18 stsp *new = NULL;
506 e5a0f69f 2018-08-18 stsp *dead = NULL;
507 0cf4efb1 2018-09-29 stsp *focus = NULL;
509 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
510 1a76625f 2018-10-22 stsp /* Allow threads to make progress while we are waiting for input. */
511 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
512 1a76625f 2018-10-22 stsp if (errcode)
513 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
514 cc5bac66 2018-10-22 stsp ch = wgetch(view->window);
515 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
516 1a76625f 2018-10-22 stsp if (errcode)
517 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
518 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
520 25791caa 2018-10-24 stsp if (tog_sigwinch_received) {
521 25791caa 2018-10-24 stsp tog_resizeterm();
522 25791caa 2018-10-24 stsp tog_sigwinch_received = 0;
523 25791caa 2018-10-24 stsp TAILQ_FOREACH(v, views, entry) {
524 25791caa 2018-10-24 stsp err = view_resize(v);
526 25791caa 2018-10-24 stsp return err;
527 25791caa 2018-10-24 stsp err = v->input(new, dead, focus, v, KEY_RESIZE);
529 25791caa 2018-10-24 stsp return err;
533 e5a0f69f 2018-08-18 stsp switch (ch) {
537 669b5ffa 2018-10-07 stsp if (view->child) {
538 669b5ffa 2018-10-07 stsp *focus = view->child;
539 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
540 669b5ffa 2018-10-07 stsp } else if (view->parent) {
541 669b5ffa 2018-10-07 stsp *focus = view->parent;
542 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 0;
546 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
547 e5a0f69f 2018-08-18 stsp *dead = view;
553 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
554 669b5ffa 2018-10-07 stsp if (view->child == NULL)
556 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view->child)) {
557 669b5ffa 2018-10-07 stsp *focus = view->child;
558 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
559 669b5ffa 2018-10-07 stsp err = view_fullscreen(view->child);
561 669b5ffa 2018-10-07 stsp err = view_splitscreen(view->child);
564 669b5ffa 2018-10-07 stsp err = view->child->input(new, dead, focus,
565 669b5ffa 2018-10-07 stsp view->child, KEY_RESIZE);
567 669b5ffa 2018-10-07 stsp if (view_is_splitscreen(view)) {
568 669b5ffa 2018-10-07 stsp *focus = view;
569 669b5ffa 2018-10-07 stsp view->parent->child_focussed = 1;
570 669b5ffa 2018-10-07 stsp err = view_fullscreen(view);
572 669b5ffa 2018-10-07 stsp err = view_splitscreen(view);
576 669b5ffa 2018-10-07 stsp err = view->input(new, dead, focus, view,
577 669b5ffa 2018-10-07 stsp KEY_RESIZE);
580 0cf4efb1 2018-09-29 stsp case KEY_RESIZE:
583 878940b7 2018-09-29 stsp err = view->input(new, dead, focus, view, ch);
587 e5a0f69f 2018-08-18 stsp return err;
591 1a57306a 2018-09-02 stsp view_vborder(struct tog_view *view)
593 0cf4efb1 2018-09-29 stsp PANEL *panel;
594 0cf4efb1 2018-09-29 stsp struct tog_view *view_above;
596 669b5ffa 2018-10-07 stsp if (view->parent)
597 669b5ffa 2018-10-07 stsp return view_vborder(view->parent);
599 0cf4efb1 2018-09-29 stsp panel = panel_above(view->panel);
600 0cf4efb1 2018-09-29 stsp if (panel == NULL)
603 0cf4efb1 2018-09-29 stsp view_above = panel_userptr(panel);
604 0cf4efb1 2018-09-29 stsp mvwvline(view->window, view->begin_y, view_above->begin_x - 1,
605 1a57306a 2018-09-02 stsp got_locale_is_utf8() ? ACS_VLINE : '|', view->nlines);
609 a3404814 2018-09-02 stsp view_needs_focus_indication(struct tog_view *view)
611 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
612 669b5ffa 2018-10-07 stsp if (view->child == NULL || view->child_focussed)
614 669b5ffa 2018-10-07 stsp if (!view_is_splitscreen(view->child))
616 669b5ffa 2018-10-07 stsp } else if (!view_is_splitscreen(view))
619 669b5ffa 2018-10-07 stsp return view->focussed;
622 bcbd79e2 2018-08-19 stsp static const struct got_error *
623 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
625 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
626 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
627 669b5ffa 2018-10-07 stsp struct tog_view *new_view, *dead_view, *focus_view, *main_view;
628 fd823528 2018-10-22 stsp int fast_refresh = 10;
629 1a76625f 2018-10-22 stsp int done = 0, errcode;
631 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
632 1a76625f 2018-10-22 stsp if (errcode)
633 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
635 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
636 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
638 a81bf10d 2018-09-29 stsp main_view = view;
639 1004088d 2018-09-29 stsp view->focussed = 1;
640 878940b7 2018-09-29 stsp err = view->show(view);
642 0cf4efb1 2018-09-29 stsp return err;
643 0cf4efb1 2018-09-29 stsp update_panels();
644 0cf4efb1 2018-09-29 stsp doupdate();
645 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
646 fd823528 2018-10-22 stsp /* Refresh fast during initialization, then become slower. */
647 fd823528 2018-10-22 stsp if (fast_refresh && fast_refresh-- == 0)
648 fd823528 2018-10-22 stsp halfdelay(10); /* switch to once per second */
650 0cf4efb1 2018-09-29 stsp err = view_input(&new_view, &dead_view, &focus_view, &done,
651 e4197bf9 2018-08-18 stsp view, &views);
654 e5a0f69f 2018-08-18 stsp if (dead_view) {
655 669b5ffa 2018-10-07 stsp struct tog_view *prev = NULL;
657 669b5ffa 2018-10-07 stsp if (view_is_parent_view(dead_view))
658 669b5ffa 2018-10-07 stsp prev = TAILQ_PREV(dead_view,
659 669b5ffa 2018-10-07 stsp tog_view_list_head, entry);
660 f41eceb0 2018-10-24 stsp else if (view->parent != dead_view)
661 669b5ffa 2018-10-07 stsp prev = view->parent;
663 669b5ffa 2018-10-07 stsp if (dead_view->parent)
664 669b5ffa 2018-10-07 stsp dead_view->parent->child = NULL;
666 669b5ffa 2018-10-07 stsp TAILQ_REMOVE(&views, dead_view, entry);
668 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
669 a81bf10d 2018-09-29 stsp if (err || dead_view == main_view)
672 0cf4efb1 2018-09-29 stsp if (view == dead_view) {
673 0cf4efb1 2018-09-29 stsp if (focus_view)
674 0cf4efb1 2018-09-29 stsp view = focus_view;
675 669b5ffa 2018-10-07 stsp else if (prev)
676 669b5ffa 2018-10-07 stsp view = prev;
677 669b5ffa 2018-10-07 stsp else if (!TAILQ_EMPTY(&views))
678 0cf4efb1 2018-09-29 stsp view = TAILQ_LAST(&views,
679 0cf4efb1 2018-09-29 stsp tog_view_list_head);
681 0cf4efb1 2018-09-29 stsp view = NULL;
682 669b5ffa 2018-10-07 stsp if (view) {
683 669b5ffa 2018-10-07 stsp if (view->child && view->child_focussed)
684 669b5ffa 2018-10-07 stsp focus_view = view->child;
686 669b5ffa 2018-10-07 stsp focus_view = view;
690 bcbd79e2 2018-08-19 stsp if (new_view) {
691 86c66b02 2018-10-18 stsp struct tog_view *v, *t;
692 86c66b02 2018-10-18 stsp /* Only allow one parent view per type. */
693 86c66b02 2018-10-18 stsp TAILQ_FOREACH_SAFE(v, &views, entry, t) {
694 86c66b02 2018-10-18 stsp if (v->type != new_view->type)
696 86c66b02 2018-10-18 stsp TAILQ_REMOVE(&views, v, entry);
697 86c66b02 2018-10-18 stsp err = view_close(v);
702 bcbd79e2 2018-08-19 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
703 fed7eaa8 2018-10-24 stsp view = new_view;
704 878940b7 2018-09-29 stsp if (focus_view == NULL)
705 878940b7 2018-09-29 stsp focus_view = new_view;
707 0cf4efb1 2018-09-29 stsp if (focus_view) {
708 0cf4efb1 2018-09-29 stsp show_panel(focus_view->panel);
710 0cf4efb1 2018-09-29 stsp view->focussed = 0;
711 0cf4efb1 2018-09-29 stsp focus_view->focussed = 1;
712 0cf4efb1 2018-09-29 stsp view = focus_view;
713 878940b7 2018-09-29 stsp if (new_view)
714 878940b7 2018-09-29 stsp show_panel(new_view->panel);
715 669b5ffa 2018-10-07 stsp if (view->child && view_is_splitscreen(view->child))
716 669b5ffa 2018-10-07 stsp show_panel(view->child->panel);
718 669b5ffa 2018-10-07 stsp if (view) {
719 1a76625f 2018-10-22 stsp if (focus_view == NULL) {
720 758194b5 2018-10-24 stsp view->focussed = 1;
721 758194b5 2018-10-24 stsp show_panel(view->panel);
722 758194b5 2018-10-24 stsp if (view->child && view_is_splitscreen(view->child))
723 758194b5 2018-10-24 stsp show_panel(view->child->panel);
724 1a76625f 2018-10-22 stsp focus_view = view;
726 669b5ffa 2018-10-07 stsp if (view->parent) {
727 669b5ffa 2018-10-07 stsp err = view->parent->show(view->parent);
731 669b5ffa 2018-10-07 stsp err = view->show(view);
734 669b5ffa 2018-10-07 stsp if (view->child) {
735 669b5ffa 2018-10-07 stsp err = view->child->show(view->child);
739 1a76625f 2018-10-22 stsp update_panels();
740 1a76625f 2018-10-22 stsp doupdate();
744 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
745 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
746 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
747 e5a0f69f 2018-08-18 stsp view_close(view);
750 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
751 1a76625f 2018-10-22 stsp if (errcode)
752 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
754 e5a0f69f 2018-08-18 stsp return err;
757 4ed7e80c 2018-05-20 stsp __dead static void
758 9f7d7167 2018-04-29 stsp usage_log(void)
761 c70c5802 2018-08-01 stsp fprintf(stderr,
762 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
763 9f7d7167 2018-04-29 stsp getprogname());
767 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
768 80ddbec8 2018-04-29 stsp static const struct got_error *
769 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
771 00dfcb92 2018-06-11 stsp char *vis = NULL;
772 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
774 963b370f 2018-05-20 stsp *ws = NULL;
775 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
776 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
777 00dfcb92 2018-06-11 stsp int vislen;
778 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
779 00dfcb92 2018-06-11 stsp return got_error_from_errno();
781 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
782 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
784 00dfcb92 2018-06-11 stsp return err;
785 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
786 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
787 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
792 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
793 a7f50699 2018-06-11 stsp if (*ws == NULL) {
794 a7f50699 2018-06-11 stsp err = got_error_from_errno();
798 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
799 963b370f 2018-05-20 stsp err = got_error_from_errno();
804 963b370f 2018-05-20 stsp *ws = NULL;
807 963b370f 2018-05-20 stsp return err;
810 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
811 963b370f 2018-05-20 stsp static const struct got_error *
812 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
814 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
815 963b370f 2018-05-20 stsp int cols = 0;
816 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
817 963b370f 2018-05-20 stsp size_t wlen;
820 963b370f 2018-05-20 stsp *wlinep = NULL;
821 b700b5d6 2018-07-10 stsp *widthp = 0;
823 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
825 963b370f 2018-05-20 stsp return err;
828 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
829 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
830 963b370f 2018-05-20 stsp switch (width) {
836 3c1f04f1 2018-09-13 stsp if (cols + width <= wlimit)
837 b700b5d6 2018-07-10 stsp cols += width;
841 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
842 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
846 963b370f 2018-05-20 stsp err = got_error_from_errno();
850 963b370f 2018-05-20 stsp wline[i] = L'\0';
851 b700b5d6 2018-07-10 stsp if (widthp)
852 b700b5d6 2018-07-10 stsp *widthp = cols;
855 963b370f 2018-05-20 stsp free(wline);
857 963b370f 2018-05-20 stsp *wlinep = wline;
858 963b370f 2018-05-20 stsp return err;
861 963b370f 2018-05-20 stsp static const struct got_error *
862 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
863 2814baeb 2018-08-01 stsp struct got_object_id *id)
865 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
866 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
867 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
868 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
869 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
870 bb737323 2018-05-20 stsp int author_width, logmsg_width;
871 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
872 80ddbec8 2018-04-29 stsp char *line = NULL;
873 bb737323 2018-05-20 stsp int col, limit;
874 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
875 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
876 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
877 ccb26ccd 2018-11-05 stsp struct tm tm;
878 45d799e2 2018-12-23 stsp time_t committer_time;
880 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
881 45d799e2 2018-12-23 stsp if (localtime_r(&committer_time, &tm) == NULL)
882 ccb26ccd 2018-11-05 stsp return got_error_from_errno();
883 ccb26ccd 2018-11-05 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ", &tm)
884 ccb26ccd 2018-11-05 stsp >= sizeof(datebuf))
885 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
887 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
888 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
890 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
891 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
892 b39d25c7 2018-07-10 stsp col = limit + 1;
893 b39d25c7 2018-07-10 stsp if (col > avail)
896 45d799e2 2018-12-23 stsp author0 = strdup(got_object_commit_get_author(commit));
897 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
898 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
901 6d9fbc00 2018-04-29 stsp author = author0;
902 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
903 6d9fbc00 2018-04-29 stsp if (smallerthan)
904 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
906 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
908 6d9fbc00 2018-04-29 stsp *at = '\0';
910 b39d25c7 2018-07-10 stsp limit = avail - col;
911 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
914 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
915 bb737323 2018-05-20 stsp col += author_width;
916 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
917 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
919 bb737323 2018-05-20 stsp author_width++;
921 9c2eaf34 2018-05-20 stsp if (col > avail)
924 45d799e2 2018-12-23 stsp logmsg0 = strdup(got_object_commit_get_logmsg(commit));
925 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
926 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
929 bb737323 2018-05-20 stsp logmsg = logmsg0;
930 bb737323 2018-05-20 stsp while (*logmsg == '\n')
932 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
933 bb737323 2018-05-20 stsp if (newline)
934 bb737323 2018-05-20 stsp *newline = '\0';
935 bb737323 2018-05-20 stsp limit = avail - col;
936 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
939 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
940 bb737323 2018-05-20 stsp col += logmsg_width;
941 bb737323 2018-05-20 stsp while (col <= avail) {
942 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
946 80ddbec8 2018-04-29 stsp free(logmsg0);
947 bb737323 2018-05-20 stsp free(wlogmsg);
948 6d9fbc00 2018-04-29 stsp free(author0);
949 bb737323 2018-05-20 stsp free(wauthor);
950 80ddbec8 2018-04-29 stsp free(line);
951 80ddbec8 2018-04-29 stsp return err;
954 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
955 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
956 899d86c2 2018-05-10 stsp struct got_object_id *id)
958 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
960 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
961 80ddbec8 2018-04-29 stsp if (entry == NULL)
962 899d86c2 2018-05-10 stsp return NULL;
964 899d86c2 2018-05-10 stsp entry->id = id;
965 99db9666 2018-05-07 stsp entry->commit = commit;
966 899d86c2 2018-05-10 stsp return entry;
969 99db9666 2018-05-07 stsp static void
970 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
972 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
974 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
975 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
976 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
977 ecb28ae0 2018-07-16 stsp commits->ncommits--;
978 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
979 99db9666 2018-05-07 stsp free(entry);
982 99db9666 2018-05-07 stsp static void
983 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
985 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
986 99db9666 2018-05-07 stsp pop_commit(commits);
989 c4972b91 2018-05-07 stsp static const struct got_error *
990 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
991 1a76625f 2018-10-22 stsp int minqueue, struct got_repository *repo, const char *path)
993 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
994 93e45b7c 2018-09-24 stsp int nqueued = 0;
997 1a76625f 2018-10-22 stsp * We keep all commits open throughout the lifetime of the log
998 1a76625f 2018-10-22 stsp * view in order to avoid having to re-fetch commits from disk
999 1a76625f 2018-10-22 stsp * while updating the display.
1001 93e45b7c 2018-09-24 stsp while (nqueued < minqueue) {
1002 93e45b7c 2018-09-24 stsp struct got_object_id *id;
1003 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
1004 93e45b7c 2018-09-24 stsp struct commit_queue_entry *entry;
1005 1a76625f 2018-10-22 stsp int errcode;
1007 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
1008 9ba79e04 2018-06-11 stsp if (err) {
1009 93e45b7c 2018-09-24 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
1011 93e45b7c 2018-09-24 stsp err = got_commit_graph_fetch_commits(graph,
1012 93e45b7c 2018-09-24 stsp minqueue, repo);
1014 ecb28ae0 2018-07-16 stsp return err;
1018 ecb28ae0 2018-07-16 stsp if (id == NULL)
1021 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
1024 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
1025 9ba79e04 2018-06-11 stsp if (entry == NULL) {
1026 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
1030 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1031 1a76625f 2018-10-22 stsp if (errcode) {
1032 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1036 1a76625f 2018-10-22 stsp entry->idx = commits->ncommits;
1037 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
1038 ecb28ae0 2018-07-16 stsp nqueued++;
1039 ecb28ae0 2018-07-16 stsp commits->ncommits++;
1041 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1042 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1043 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1046 9ba79e04 2018-06-11 stsp return err;
1049 99db9666 2018-05-07 stsp static const struct got_error *
1050 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
1052 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
1053 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
1055 9ba79e04 2018-06-11 stsp *head_id = NULL;
1057 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
1059 99db9666 2018-05-07 stsp return err;
1061 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
1062 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
1063 9ba79e04 2018-06-11 stsp if (err) {
1064 9ba79e04 2018-06-11 stsp *head_id = NULL;
1065 99db9666 2018-05-07 stsp return err;
1068 9ba79e04 2018-06-11 stsp return NULL;
1071 0553a4e3 2018-04-30 stsp static const struct got_error *
1072 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
1073 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
1074 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
1075 1a76625f 2018-10-22 stsp const char *path, int commits_needed)
1077 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
1078 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
1079 ecb28ae0 2018-07-16 stsp int ncommits, width;
1080 1a76625f 2018-10-22 stsp char *id_str = NULL, *header = NULL, *ncommits_str = NULL;
1081 ecb28ae0 2018-07-16 stsp wchar_t *wline;
1083 e0d42f60 2018-07-22 stsp entry = first;
1084 e0d42f60 2018-07-22 stsp ncommits = 0;
1085 e0d42f60 2018-07-22 stsp while (entry) {
1086 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
1087 e0d42f60 2018-07-22 stsp *selected = entry;
1090 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
1091 e0d42f60 2018-07-22 stsp ncommits++;
1094 1a76625f 2018-10-22 stsp if (*selected) {
1095 1a76625f 2018-10-22 stsp err = got_object_id_str(&id_str, (*selected)->id);
1097 ecb28ae0 2018-07-16 stsp return err;
1100 1a76625f 2018-10-22 stsp if (asprintf(&ncommits_str, " [%d/%d]%s ",
1101 1a76625f 2018-10-22 stsp entry ? entry->idx + 1 : 0, commits->ncommits,
1102 1a76625f 2018-10-22 stsp commits_needed == 0 ? "" : " loading...") == -1)
1103 1a76625f 2018-10-22 stsp return got_error_from_errno();
1105 1a76625f 2018-10-22 stsp if (path && strcmp(path, "/") != 0) {
1106 1a76625f 2018-10-22 stsp if (asprintf(&header, "commit: %s %s%s",
1107 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1108 1a76625f 2018-10-22 stsp path, ncommits_str) == -1) {
1109 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1110 1a76625f 2018-10-22 stsp header = NULL;
1111 1a76625f 2018-10-22 stsp goto done;
1113 1a76625f 2018-10-22 stsp } else if (asprintf(&header, "commit: %s%s",
1114 1a76625f 2018-10-22 stsp id_str ? id_str : "........................................",
1115 1a76625f 2018-10-22 stsp ncommits_str) == -1) {
1116 1a76625f 2018-10-22 stsp err = got_error_from_errno();
1117 1a76625f 2018-10-22 stsp header = NULL;
1118 1a76625f 2018-10-22 stsp goto done;
1120 1a76625f 2018-10-22 stsp err = format_line(&wline, &width, header, view->ncols);
1122 1a76625f 2018-10-22 stsp goto done;
1124 2814baeb 2018-08-01 stsp werase(view->window);
1126 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1127 a3404814 2018-09-02 stsp wstandout(view->window);
1128 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
1129 1a76625f 2018-10-22 stsp while (width < view->ncols) {
1130 1a76625f 2018-10-22 stsp waddch(view->window, ' ');
1133 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1134 a3404814 2018-09-02 stsp wstandend(view->window);
1135 ecb28ae0 2018-07-16 stsp free(wline);
1136 ecb28ae0 2018-07-16 stsp if (limit <= 1)
1137 1a76625f 2018-10-22 stsp goto done;
1139 899d86c2 2018-05-10 stsp entry = first;
1140 899d86c2 2018-05-10 stsp *last = first;
1141 867c6645 2018-07-10 stsp ncommits = 0;
1142 899d86c2 2018-05-10 stsp while (entry) {
1143 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
1145 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1146 2814baeb 2018-08-01 stsp wstandout(view->window);
1147 2814baeb 2018-08-01 stsp err = draw_commit(view, entry->commit, entry->id);
1148 0cf4efb1 2018-09-29 stsp if (view->focussed && ncommits == selected_idx)
1149 2814baeb 2018-08-01 stsp wstandend(view->window);
1152 0553a4e3 2018-04-30 stsp ncommits++;
1153 899d86c2 2018-05-10 stsp *last = entry;
1154 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
1157 1a57306a 2018-09-02 stsp view_vborder(view);
1159 1a76625f 2018-10-22 stsp free(id_str);
1160 1a76625f 2018-10-22 stsp free(ncommits_str);
1161 1a76625f 2018-10-22 stsp free(header);
1162 80ddbec8 2018-04-29 stsp return err;
1165 07b55e75 2018-05-10 stsp static void
1166 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1167 07b55e75 2018-05-10 stsp struct commit_queue *commits)
1169 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
1170 07b55e75 2018-05-10 stsp int nscrolled = 0;
1172 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
1173 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
1176 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
1177 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
1178 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
1179 07b55e75 2018-05-10 stsp if (entry) {
1180 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
1181 07b55e75 2018-05-10 stsp nscrolled++;
1186 aa075928 2018-05-10 stsp static const struct got_error *
1187 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
1188 93e45b7c 2018-09-24 stsp struct commit_queue_entry **last_displayed_entry,
1189 1a76625f 2018-10-22 stsp struct commit_queue *commits, int *log_complete, int *commits_needed,
1190 1a76625f 2018-10-22 stsp pthread_cond_t *need_commits)
1192 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
1193 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
1194 aa075928 2018-05-10 stsp int nscrolled = 0;
1196 1a76625f 2018-10-22 stsp if (*last_displayed_entry == NULL)
1197 1a76625f 2018-10-22 stsp return NULL;
1200 93e45b7c 2018-09-24 stsp pentry = TAILQ_NEXT(*last_displayed_entry, entry);
1201 aa075928 2018-05-10 stsp if (pentry == NULL) {
1202 1a76625f 2018-10-22 stsp int errcode;
1203 1a76625f 2018-10-22 stsp if (*log_complete)
1204 1a76625f 2018-10-22 stsp return NULL;
1205 1a76625f 2018-10-22 stsp *commits_needed = maxscroll + 20;
1206 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(need_commits);
1207 1a76625f 2018-10-22 stsp if (errcode)
1208 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1209 1a76625f 2018-10-22 stsp return NULL;
1211 93e45b7c 2018-09-24 stsp *last_displayed_entry = pentry;
1213 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
1214 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
1216 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
1217 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
1219 dd0a52c1 2018-05-20 stsp return err;
1222 cd0acaa7 2018-05-20 stsp static const struct got_error *
1223 0cf4efb1 2018-09-29 stsp open_diff_view_for_commit(struct tog_view **new_view, int begin_x,
1224 0cf4efb1 2018-09-29 stsp struct got_object_id *commit_id, struct got_commit_object *commit,
1225 2a4718d3 2018-09-29 stsp struct got_repository *repo)
1227 cd0acaa7 2018-05-20 stsp const struct got_error *err;
1228 cd0acaa7 2018-05-20 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1229 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
1230 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
1232 2a4718d3 2018-09-29 stsp err = got_object_open(&obj2, repo, commit_id);
1234 cd0acaa7 2018-05-20 stsp return err;
1236 45d799e2 2018-12-23 stsp parent_id = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1237 9ba79e04 2018-06-11 stsp if (parent_id) {
1238 9ba79e04 2018-06-11 stsp err = got_object_open(&obj1, repo, parent_id->id);
1240 cd0acaa7 2018-05-20 stsp goto done;
1243 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
1244 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
1245 ea5e7bb5 2018-08-01 stsp err = got_error_from_errno();
1246 ea5e7bb5 2018-08-01 stsp goto done;
1249 e5a0f69f 2018-08-18 stsp err = open_diff_view(diff_view, obj1, obj2, repo);
1250 e5a0f69f 2018-08-18 stsp if (err == NULL)
1251 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1254 cd0acaa7 2018-05-20 stsp got_object_close(obj1);
1256 cd0acaa7 2018-05-20 stsp got_object_close(obj2);
1257 cd0acaa7 2018-05-20 stsp return err;
1260 80ddbec8 2018-04-29 stsp static const struct got_error *
1261 0cf4efb1 2018-09-29 stsp browse_commit(struct tog_view **new_view, int begin_x,
1262 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *entry, struct got_repository *repo)
1264 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1265 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1266 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1268 45d799e2 2018-12-23 stsp err = got_object_open_as_tree(&tree, repo,
1269 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(entry->commit));
1271 9343a5fb 2018-06-23 stsp return err;
1273 669b5ffa 2018-10-07 stsp tree_view = view_open(0, 0, 0, begin_x, TOG_VIEW_TREE);
1274 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1275 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1277 e5a0f69f 2018-08-18 stsp err = open_tree_view(tree_view, tree, entry->id, repo);
1279 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1281 e5a0f69f 2018-08-18 stsp *new_view = tree_view;
1282 1a76625f 2018-10-22 stsp return err;
1285 1a76625f 2018-10-22 stsp static void *
1286 1a76625f 2018-10-22 stsp log_thread(void *arg)
1288 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1289 1a76625f 2018-10-22 stsp int errcode = 0;
1290 1a76625f 2018-10-22 stsp struct tog_log_thread_args *a = arg;
1291 1a76625f 2018-10-22 stsp int done = 0;
1293 1a76625f 2018-10-22 stsp err = got_commit_graph_iter_start(a->graph, a->start_id, a->repo);
1295 1a76625f 2018-10-22 stsp return (void *)err;
1297 1a76625f 2018-10-22 stsp while (!done && !err) {
1298 1a76625f 2018-10-22 stsp err = queue_commits(a->graph, a->commits, 1, a->repo,
1299 1a76625f 2018-10-22 stsp a->in_repo_path);
1300 1a76625f 2018-10-22 stsp if (err) {
1301 1a76625f 2018-10-22 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1302 1a76625f 2018-10-22 stsp return (void *)err;
1303 1a76625f 2018-10-22 stsp err = NULL;
1305 1a76625f 2018-10-22 stsp } else if (a->commits_needed > 0)
1306 1a76625f 2018-10-22 stsp a->commits_needed--;
1308 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1309 1a76625f 2018-10-22 stsp if (errcode)
1310 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
1313 1a76625f 2018-10-22 stsp a->log_complete = 1;
1314 1a76625f 2018-10-22 stsp else if (*a->quit) {
1316 1a76625f 2018-10-22 stsp a->log_complete = 1;
1317 1a76625f 2018-10-22 stsp } else if (*a->first_displayed_entry == NULL) {
1318 1a76625f 2018-10-22 stsp *a->first_displayed_entry =
1319 1a76625f 2018-10-22 stsp TAILQ_FIRST(&a->commits->head);
1320 1a76625f 2018-10-22 stsp *a->selected_entry = *a->first_displayed_entry;
1324 1a76625f 2018-10-22 stsp a->commits_needed = 0;
1325 1a76625f 2018-10-22 stsp else if (a->commits_needed == 0) {
1326 1a76625f 2018-10-22 stsp errcode = pthread_cond_wait(&a->need_commits,
1327 1a76625f 2018-10-22 stsp &tog_mutex);
1328 1a76625f 2018-10-22 stsp if (errcode)
1329 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1332 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1333 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1334 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1336 1a76625f 2018-10-22 stsp return (void *)err;
1339 1a76625f 2018-10-22 stsp static const struct got_error *
1340 1a76625f 2018-10-22 stsp stop_log_thread(struct tog_log_view_state *s)
1342 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1343 1a76625f 2018-10-22 stsp int errcode;
1345 1a76625f 2018-10-22 stsp if (s->thread) {
1346 1a76625f 2018-10-22 stsp s->quit = 1;
1347 1a76625f 2018-10-22 stsp errcode = pthread_cond_signal(&s->thread_args.need_commits);
1348 1a76625f 2018-10-22 stsp if (errcode)
1349 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1350 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
1351 1a76625f 2018-10-22 stsp if (errcode)
1352 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1353 1a76625f 2018-10-22 stsp errcode = pthread_join(s->thread, (void **)&err);
1354 1a76625f 2018-10-22 stsp if (errcode)
1355 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1356 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
1357 1a76625f 2018-10-22 stsp if (errcode)
1358 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
1359 1a76625f 2018-10-22 stsp s->thread = NULL;
1362 1a76625f 2018-10-22 stsp errcode = pthread_cond_destroy(&s->thread_args.need_commits);
1363 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
1364 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1366 1a76625f 2018-10-22 stsp if (s->thread_args.repo) {
1367 1a76625f 2018-10-22 stsp got_repo_close(s->thread_args.repo);
1368 1a76625f 2018-10-22 stsp s->thread_args.repo = NULL;
1371 1a76625f 2018-10-22 stsp if (s->thread_args.graph) {
1372 1a76625f 2018-10-22 stsp got_commit_graph_close(s->thread_args.graph);
1373 1a76625f 2018-10-22 stsp s->thread_args.graph = NULL;
1376 9343a5fb 2018-06-23 stsp return err;
1379 9343a5fb 2018-06-23 stsp static const struct got_error *
1380 1a76625f 2018-10-22 stsp close_log_view(struct tog_view *view)
1382 1a76625f 2018-10-22 stsp const struct got_error *err = NULL;
1383 1a76625f 2018-10-22 stsp struct tog_log_view_state *s = &view->state.log;
1385 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1386 1a76625f 2018-10-22 stsp free_commits(&s->commits);
1387 1a76625f 2018-10-22 stsp free(s->in_repo_path);
1388 797bc7b9 2018-10-22 stsp s->in_repo_path = NULL;
1389 1a76625f 2018-10-22 stsp free(s->start_id);
1390 797bc7b9 2018-10-22 stsp s->start_id = NULL;
1391 1a76625f 2018-10-22 stsp return err;
1394 1a76625f 2018-10-22 stsp static const struct got_error *
1395 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1396 23721109 2018-10-22 stsp struct got_repository *repo, const char *path, int check_disk)
1398 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1399 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1400 1a76625f 2018-10-22 stsp struct got_repository *thread_repo = NULL;
1401 1a76625f 2018-10-22 stsp struct got_commit_graph *thread_graph = NULL;
1402 1a76625f 2018-10-22 stsp int errcode;
1404 23721109 2018-10-22 stsp err = got_repo_map_path(&s->in_repo_path, repo, path, check_disk);
1405 ecb28ae0 2018-07-16 stsp if (err != NULL)
1406 ecb28ae0 2018-07-16 stsp goto done;
1408 93e45b7c 2018-09-24 stsp /* The commit queue only contains commits being displayed. */
1409 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1410 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1412 fb2756b9 2018-08-04 stsp s->repo = repo;
1413 5036bf37 2018-09-24 stsp s->start_id = got_object_id_dup(start_id);
1414 5036bf37 2018-09-24 stsp if (s->start_id == NULL) {
1415 5036bf37 2018-09-24 stsp err = got_error_from_errno();
1416 5036bf37 2018-09-24 stsp goto done;
1419 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1420 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1421 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1423 1a76625f 2018-10-22 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1425 1a76625f 2018-10-22 stsp goto done;
1426 1a76625f 2018-10-22 stsp err = got_commit_graph_open(&thread_graph, start_id, s->in_repo_path,
1427 1a76625f 2018-10-22 stsp 0, thread_repo);
1429 1a76625f 2018-10-22 stsp goto done;
1431 1a76625f 2018-10-22 stsp errcode = pthread_cond_init(&s->thread_args.need_commits, NULL);
1432 1a76625f 2018-10-22 stsp if (errcode) {
1433 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
1434 1a76625f 2018-10-22 stsp goto done;
1437 1a76625f 2018-10-22 stsp s->thread_args.commits_needed = view->nlines;
1438 1a76625f 2018-10-22 stsp s->thread_args.graph = thread_graph;
1439 1a76625f 2018-10-22 stsp s->thread_args.commits = &s->commits;
1440 1a76625f 2018-10-22 stsp s->thread_args.in_repo_path = s->in_repo_path;
1441 1a76625f 2018-10-22 stsp s->thread_args.start_id = s->start_id;
1442 1a76625f 2018-10-22 stsp s->thread_args.repo = thread_repo;
1443 1a76625f 2018-10-22 stsp s->thread_args.log_complete = 0;
1444 1a76625f 2018-10-22 stsp s->thread_args.quit = &s->quit;
1445 1a76625f 2018-10-22 stsp s->thread_args.view = view;
1446 1a76625f 2018-10-22 stsp s->thread_args.first_displayed_entry = &s->first_displayed_entry;
1447 1a76625f 2018-10-22 stsp s->thread_args.selected_entry = &s->selected_entry;
1450 1a76625f 2018-10-22 stsp close_log_view(view);
1451 ba4f502b 2018-08-04 stsp return err;
1454 e5a0f69f 2018-08-18 stsp static const struct got_error *
1455 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1457 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1459 2b380cc8 2018-10-24 stsp if (s->thread == NULL) {
1460 2b380cc8 2018-10-24 stsp int errcode = pthread_create(&s->thread, NULL, log_thread,
1461 2b380cc8 2018-10-24 stsp &s->thread_args);
1462 2b380cc8 2018-10-24 stsp if (errcode)
1463 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
1466 0cf4efb1 2018-09-29 stsp return draw_commits(view, &s->last_displayed_entry,
1467 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1468 1a76625f 2018-10-22 stsp &s->commits, s->selected, view->nlines,
1469 1a76625f 2018-10-22 stsp s->in_repo_path, s->thread_args.commits_needed);
1472 e5a0f69f 2018-08-18 stsp static const struct got_error *
1473 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1474 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
1476 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1477 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1478 5036bf37 2018-09-24 stsp char *parent_path;
1479 669b5ffa 2018-10-07 stsp struct tog_view *diff_view = NULL, *tree_view = NULL;
1480 669b5ffa 2018-10-07 stsp int begin_x = 0;
1482 e5a0f69f 2018-08-18 stsp switch (ch) {
1484 1a76625f 2018-10-22 stsp s->quit = 1;
1487 e5a0f69f 2018-08-18 stsp case KEY_UP:
1488 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1490 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1491 e5a0f69f 2018-08-18 stsp s->selected--;
1492 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1494 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry, 1,
1495 e5a0f69f 2018-08-18 stsp &s->commits);
1497 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1498 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1500 e5a0f69f 2018-08-18 stsp if (TAILQ_FIRST(&s->commits.head) ==
1501 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
1502 e5a0f69f 2018-08-18 stsp s->selected = 0;
1505 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry,
1506 e5a0f69f 2018-08-18 stsp view->nlines, &s->commits);
1509 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1510 2b380cc8 2018-10-24 stsp if (s->first_displayed_entry == NULL)
1512 e5a0f69f 2018-08-18 stsp if (s->selected < MIN(view->nlines - 2,
1513 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1514 e5a0f69f 2018-08-18 stsp s->selected++;
1517 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry, 1,
1518 93e45b7c 2018-09-24 stsp &s->last_displayed_entry, &s->commits,
1519 1a76625f 2018-10-22 stsp &s->thread_args.log_complete,
1520 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1521 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1523 e5a0f69f 2018-08-18 stsp case KEY_NPAGE: {
1524 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *first;
1525 e5a0f69f 2018-08-18 stsp first = s->first_displayed_entry;
1526 2b380cc8 2018-10-24 stsp if (first == NULL)
1528 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry,
1529 93e45b7c 2018-09-24 stsp view->nlines, &s->last_displayed_entry,
1530 1a76625f 2018-10-22 stsp &s->commits, &s->thread_args.log_complete,
1531 1a76625f 2018-10-22 stsp &s->thread_args.commits_needed,
1532 1a76625f 2018-10-22 stsp &s->thread_args.need_commits);
1533 e5a0f69f 2018-08-18 stsp if (first == s->first_displayed_entry &&
1534 e5a0f69f 2018-08-18 stsp s->selected < MIN(view->nlines - 2,
1535 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1536 e5a0f69f 2018-08-18 stsp /* can't scroll further down */
1537 e5a0f69f 2018-08-18 stsp s->selected = MIN(view->nlines - 2,
1538 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1);
1540 e5a0f69f 2018-08-18 stsp err = NULL;
1543 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
1544 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines - 2)
1545 e5a0f69f 2018-08-18 stsp s->selected = view->nlines - 2;
1546 e5a0f69f 2018-08-18 stsp if (s->selected > s->commits.ncommits - 1)
1547 e5a0f69f 2018-08-18 stsp s->selected = s->commits.ncommits - 1;
1549 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
1550 e5a0f69f 2018-08-18 stsp case '\r':
1551 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1553 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1554 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1555 669b5ffa 2018-10-07 stsp err = open_diff_view_for_commit(&diff_view, begin_x,
1556 2a4718d3 2018-09-29 stsp s->selected_entry->id, s->selected_entry->commit,
1560 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1561 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1563 669b5ffa 2018-10-07 stsp return err;
1564 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
1565 669b5ffa 2018-10-07 stsp if (err) {
1566 669b5ffa 2018-10-07 stsp view_close(diff_view);
1569 55566b34 2018-11-05 stsp *focus_view = diff_view;
1570 55566b34 2018-11-05 stsp view->child_focussed = 1;
1572 669b5ffa 2018-10-07 stsp *new_view = diff_view;
1575 2b380cc8 2018-10-24 stsp if (s->selected_entry == NULL)
1577 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1578 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
1579 669b5ffa 2018-10-07 stsp err = browse_commit(&tree_view, begin_x,
1580 0cf4efb1 2018-09-29 stsp s->selected_entry, s->repo);
1583 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
1584 669b5ffa 2018-10-07 stsp err = view_close_child(view);
1586 669b5ffa 2018-10-07 stsp return err;
1587 669b5ffa 2018-10-07 stsp err = view_set_child(view, tree_view);
1588 669b5ffa 2018-10-07 stsp if (err) {
1589 669b5ffa 2018-10-07 stsp view_close(tree_view);
1592 669b5ffa 2018-10-07 stsp *focus_view = tree_view;
1593 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
1595 669b5ffa 2018-10-07 stsp *new_view = tree_view;
1597 5036bf37 2018-09-24 stsp case KEY_BACKSPACE:
1598 5036bf37 2018-09-24 stsp if (strcmp(s->in_repo_path, "/") == 0)
1600 5036bf37 2018-09-24 stsp parent_path = dirname(s->in_repo_path);
1601 5036bf37 2018-09-24 stsp if (parent_path && strcmp(parent_path, ".") != 0) {
1602 5036bf37 2018-09-24 stsp struct tog_view *lv;
1603 1a76625f 2018-10-22 stsp err = stop_log_thread(s);
1605 1a76625f 2018-10-22 stsp return err;
1606 0cf4efb1 2018-09-29 stsp lv = view_open(view->nlines, view->ncols,
1607 0cf4efb1 2018-09-29 stsp view->begin_y, view->begin_x, TOG_VIEW_LOG);
1608 5036bf37 2018-09-24 stsp if (lv == NULL)
1609 5036bf37 2018-09-24 stsp return got_error_from_errno();
1610 5036bf37 2018-09-24 stsp err = open_log_view(lv, s->start_id, s->repo,
1611 23721109 2018-10-22 stsp parent_path, 0);
1613 1a76625f 2018-10-22 stsp return err;;
1614 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
1615 669b5ffa 2018-10-07 stsp *new_view = lv;
1617 669b5ffa 2018-10-07 stsp view_set_child(view->parent, lv);
1618 34095730 2018-10-22 stsp *focus_view = lv;
1620 1a76625f 2018-10-22 stsp return NULL;
1627 80ddbec8 2018-04-29 stsp return err;
1630 4ed7e80c 2018-05-20 stsp static const struct got_error *
1631 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1633 80ddbec8 2018-04-29 stsp const struct got_error *error;
1634 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1635 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1636 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1637 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1639 04cc582a 2018-08-01 stsp struct tog_view *view;
1641 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1642 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
1644 80ddbec8 2018-04-29 stsp err(1, "pledge");
1647 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1648 80ddbec8 2018-04-29 stsp switch (ch) {
1650 80ddbec8 2018-04-29 stsp start_commit = optarg;
1653 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1654 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1655 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1659 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1663 80ddbec8 2018-04-29 stsp argc -= optind;
1664 80ddbec8 2018-04-29 stsp argv += optind;
1666 ecb28ae0 2018-07-16 stsp if (argc == 0)
1667 ecb28ae0 2018-07-16 stsp path = strdup("");
1668 ecb28ae0 2018-07-16 stsp else if (argc == 1)
1669 ecb28ae0 2018-07-16 stsp path = strdup(argv[0]);
1671 80ddbec8 2018-04-29 stsp usage_log();
1672 ecb28ae0 2018-07-16 stsp if (path == NULL)
1673 ecb28ae0 2018-07-16 stsp return got_error_from_errno();
1675 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1676 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1677 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1678 ecb28ae0 2018-07-16 stsp goto done;
1680 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1681 ecb28ae0 2018-07-16 stsp repo_path = strdup(cwd);
1682 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1683 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1684 ecb28ae0 2018-07-16 stsp goto done;
1688 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1689 80ddbec8 2018-04-29 stsp if (error != NULL)
1690 ecb28ae0 2018-07-16 stsp goto done;
1692 80ddbec8 2018-04-29 stsp if (start_commit == NULL) {
1693 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
1694 80ddbec8 2018-04-29 stsp if (error != NULL)
1695 ecb28ae0 2018-07-16 stsp goto done;
1697 80ddbec8 2018-04-29 stsp struct got_object *obj;
1698 80ddbec8 2018-04-29 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
1699 80ddbec8 2018-04-29 stsp if (error == NULL) {
1700 6402fb3c 2018-09-15 stsp start_id = got_object_id_dup(got_object_get_id(obj));
1701 899d86c2 2018-05-10 stsp if (start_id == NULL)
1702 80ddbec8 2018-04-29 stsp error = got_error_from_errno();
1703 ecb28ae0 2018-07-16 stsp goto done;
1706 80ddbec8 2018-04-29 stsp if (error != NULL)
1707 ecb28ae0 2018-07-16 stsp goto done;
1709 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_LOG);
1710 04cc582a 2018-08-01 stsp if (view == NULL) {
1711 04cc582a 2018-08-01 stsp error = got_error_from_errno();
1712 04cc582a 2018-08-01 stsp goto done;
1714 23721109 2018-10-22 stsp error = open_log_view(view, start_id, repo, path, 1);
1715 ba4f502b 2018-08-04 stsp if (error)
1716 ba4f502b 2018-08-04 stsp goto done;
1717 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1719 ecb28ae0 2018-07-16 stsp free(repo_path);
1720 ecb28ae0 2018-07-16 stsp free(cwd);
1721 ecb28ae0 2018-07-16 stsp free(path);
1722 899d86c2 2018-05-10 stsp free(start_id);
1724 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
1725 80ddbec8 2018-04-29 stsp return error;
1728 4ed7e80c 2018-05-20 stsp __dead static void
1729 9f7d7167 2018-04-29 stsp usage_diff(void)
1732 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1733 9f7d7167 2018-04-29 stsp getprogname());
1737 b304db33 2018-05-20 stsp static char *
1738 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
1740 b304db33 2018-05-20 stsp char *line;
1741 b304db33 2018-05-20 stsp size_t linelen;
1742 b304db33 2018-05-20 stsp size_t lineno;
1743 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
1745 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
1747 b304db33 2018-05-20 stsp *len = linelen;
1748 b304db33 2018-05-20 stsp return line;
1751 4ed7e80c 2018-05-20 stsp static const struct got_error *
1752 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1753 a3404814 2018-09-02 stsp int *last_displayed_line, int *eof, int max_lines,
1754 a3404814 2018-09-02 stsp char * header)
1756 61e69b96 2018-05-20 stsp const struct got_error *err;
1757 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
1758 b304db33 2018-05-20 stsp char *line;
1759 b304db33 2018-05-20 stsp size_t len;
1760 61e69b96 2018-05-20 stsp wchar_t *wline;
1761 e0b650dd 2018-05-20 stsp int width;
1763 26ed57b2 2018-05-19 stsp rewind(f);
1764 f7d12f7e 2018-08-01 stsp werase(view->window);
1766 a3404814 2018-09-02 stsp if (header) {
1767 a3404814 2018-09-02 stsp err = format_line(&wline, &width, header, view->ncols);
1768 a3404814 2018-09-02 stsp if (err) {
1769 a3404814 2018-09-02 stsp return err;
1772 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1773 a3404814 2018-09-02 stsp wstandout(view->window);
1774 a3404814 2018-09-02 stsp waddwstr(view->window, wline);
1775 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
1776 a3404814 2018-09-02 stsp wstandend(view->window);
1777 a3404814 2018-09-02 stsp if (width < view->ncols)
1778 a3404814 2018-09-02 stsp waddch(view->window, '\n');
1780 a3404814 2018-09-02 stsp if (max_lines <= 1)
1781 a3404814 2018-09-02 stsp return NULL;
1782 a3404814 2018-09-02 stsp max_lines--;
1786 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
1787 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
1788 26ed57b2 2018-05-19 stsp if (line == NULL) {
1792 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
1793 26ed57b2 2018-05-19 stsp free(line);
1797 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1798 61e69b96 2018-05-20 stsp if (err) {
1799 61e69b96 2018-05-20 stsp free(line);
1800 61e69b96 2018-05-20 stsp return err;
1802 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1803 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1804 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1805 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
1806 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
1807 26ed57b2 2018-05-19 stsp free(line);
1808 2550e4c3 2018-07-13 stsp free(wline);
1809 2550e4c3 2018-07-13 stsp wline = NULL;
1811 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
1813 1a57306a 2018-09-02 stsp view_vborder(view);
1815 26ed57b2 2018-05-19 stsp return NULL;
1818 abd2672a 2018-12-23 stsp static char *
1819 abd2672a 2018-12-23 stsp get_datestr(time_t *time, char *datebuf)
1821 abd2672a 2018-12-23 stsp char *p, *s = ctime_r(time, datebuf);
1822 abd2672a 2018-12-23 stsp p = strchr(s, '\n');
1824 abd2672a 2018-12-23 stsp *p = '\0';
1828 4ed7e80c 2018-05-20 stsp static const struct got_error *
1829 abd2672a 2018-12-23 stsp write_commit_info(struct got_object *obj, struct got_repository *repo,
1830 abd2672a 2018-12-23 stsp FILE *outfile)
1832 abd2672a 2018-12-23 stsp const struct got_error *err = NULL;
1833 abd2672a 2018-12-23 stsp char *id_str;
1834 abd2672a 2018-12-23 stsp char datebuf[26];
1835 abd2672a 2018-12-23 stsp struct got_commit_object *commit = NULL;
1836 45d799e2 2018-12-23 stsp time_t committer_time;
1837 45d799e2 2018-12-23 stsp const char *author, *committer;
1839 abd2672a 2018-12-23 stsp err = got_object_id_str(&id_str, got_object_get_id(obj));
1841 abd2672a 2018-12-23 stsp return err;
1843 abd2672a 2018-12-23 stsp err = got_object_commit_open(&commit, repo, obj);
1845 abd2672a 2018-12-23 stsp if (fprintf(outfile, "commit: %s\n", id_str) < 0) {
1846 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1847 abd2672a 2018-12-23 stsp goto done;
1849 45d799e2 2018-12-23 stsp if (fprintf(outfile, "from: %s\n",
1850 45d799e2 2018-12-23 stsp got_object_commit_get_author(commit)) < 0) {
1851 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1852 abd2672a 2018-12-23 stsp goto done;
1854 45d799e2 2018-12-23 stsp committer_time = got_object_commit_get_committer_time(commit);
1855 abd2672a 2018-12-23 stsp if (fprintf(outfile, "date: %s UTC\n",
1856 45d799e2 2018-12-23 stsp get_datestr(&committer_time, datebuf)) < 0) {
1857 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1858 abd2672a 2018-12-23 stsp goto done;
1860 45d799e2 2018-12-23 stsp author = got_object_commit_get_author(commit);
1861 45d799e2 2018-12-23 stsp committer = got_object_commit_get_committer(commit);
1862 45d799e2 2018-12-23 stsp if (strcmp(author, committer) != 0 &&
1863 45d799e2 2018-12-23 stsp fprintf(outfile, "via: %s\n", committer) < 0) {
1864 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1865 abd2672a 2018-12-23 stsp goto done;
1867 45d799e2 2018-12-23 stsp if (fprintf(outfile, "%s\n",
1868 45d799e2 2018-12-23 stsp got_object_commit_get_logmsg(commit)) < 0) {
1869 abd2672a 2018-12-23 stsp err = got_error_from_errno();
1870 abd2672a 2018-12-23 stsp goto done;
1873 abd2672a 2018-12-23 stsp free(id_str);
1874 abd2672a 2018-12-23 stsp if (commit)
1875 abd2672a 2018-12-23 stsp got_object_commit_close(commit);
1876 abd2672a 2018-12-23 stsp return err;
1879 abd2672a 2018-12-23 stsp static const struct got_error *
1880 48ae06ee 2018-10-18 stsp create_diff(struct tog_diff_view_state *s)
1882 48ae06ee 2018-10-18 stsp const struct got_error *err = NULL;
1883 48ae06ee 2018-10-18 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1884 48ae06ee 2018-10-18 stsp FILE *f = NULL;
1886 48ae06ee 2018-10-18 stsp if (s->id1) {
1887 48ae06ee 2018-10-18 stsp err = got_object_open(&obj1, s->repo, s->id1);
1889 48ae06ee 2018-10-18 stsp return err;
1892 48ae06ee 2018-10-18 stsp err = got_object_open(&obj2, s->repo, s->id2);
1894 48ae06ee 2018-10-18 stsp goto done;
1896 511a516b 2018-05-19 stsp f = got_opentemp();
1897 48ae06ee 2018-10-18 stsp if (f == NULL) {
1898 48ae06ee 2018-10-18 stsp err = got_error_from_errno();
1899 48ae06ee 2018-10-18 stsp goto done;
1902 48ae06ee 2018-10-18 stsp fclose(s->f);
1905 cd0acaa7 2018-05-20 stsp switch (got_object_get_type(obj1 ? obj1 : obj2)) {
1906 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
1907 48ae06ee 2018-10-18 stsp err = got_diff_objects_as_blobs(obj1, obj2, NULL, NULL,
1908 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
1910 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
1911 48ae06ee 2018-10-18 stsp err = got_diff_objects_as_trees(obj1, obj2, "", "",
1912 48ae06ee 2018-10-18 stsp s->diff_context, s->repo, f);
1914 abd2672a 2018-12-23 stsp case GOT_OBJ_TYPE_COMMIT: {
1915 45d799e2 2018-12-23 stsp const struct got_object_id_queue *parent_ids;
1916 abd2672a 2018-12-23 stsp struct got_object_qid *pid;
1917 abd2672a 2018-12-23 stsp struct got_commit_object *commit2;
1919 abd2672a 2018-12-23 stsp err = got_object_commit_open(&commit2, s->repo, obj2);
1922 abd2672a 2018-12-23 stsp /* Show commit info if we're diffing to a parent commit. */
1923 45d799e2 2018-12-23 stsp parent_ids = got_object_commit_get_parent_ids(commit2);
1924 45d799e2 2018-12-23 stsp SIMPLEQ_FOREACH(pid, parent_ids, entry) {
1925 abd2672a 2018-12-23 stsp struct got_object_id *id1 = got_object_get_id(obj1);
1926 abd2672a 2018-12-23 stsp if (got_object_id_cmp(id1, pid->id) == 0) {
1927 abd2672a 2018-12-23 stsp write_commit_info(obj2, s->repo, f);
1931 abd2672a 2018-12-23 stsp got_object_commit_close(commit2);
1933 48ae06ee 2018-10-18 stsp err = got_diff_objects_as_commits(obj1, obj2, s->diff_context,
1934 48ae06ee 2018-10-18 stsp s->repo, f);
1938 48ae06ee 2018-10-18 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1943 48ae06ee 2018-10-18 stsp got_object_close(obj1);
1944 48ae06ee 2018-10-18 stsp got_object_close(obj2);
1946 48ae06ee 2018-10-18 stsp fflush(f);
1947 48ae06ee 2018-10-18 stsp return err;
1950 48ae06ee 2018-10-18 stsp static const struct got_error *
1951 48ae06ee 2018-10-18 stsp open_diff_view(struct tog_view *view, struct got_object *obj1,
1952 48ae06ee 2018-10-18 stsp struct got_object *obj2, struct got_repository *repo)
1954 48ae06ee 2018-10-18 stsp const struct got_error *err;
1956 48ae06ee 2018-10-18 stsp if (obj1 != NULL && obj2 != NULL &&
1957 48ae06ee 2018-10-18 stsp got_object_get_type(obj1) != got_object_get_type(obj2))
1958 48ae06ee 2018-10-18 stsp return got_error(GOT_ERR_OBJ_TYPE);
1960 48ae06ee 2018-10-18 stsp if (obj1) {
1961 48ae06ee 2018-10-18 stsp struct got_object_id *id1;
1962 48ae06ee 2018-10-18 stsp id1 = got_object_id_dup(got_object_get_id(obj1));
1963 48ae06ee 2018-10-18 stsp if (id1 == NULL)
1964 48ae06ee 2018-10-18 stsp return got_error_from_errno();
1965 48ae06ee 2018-10-18 stsp view->state.diff.id1 = id1;
1967 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1969 48ae06ee 2018-10-18 stsp view->state.diff.id2 = got_object_id_dup(got_object_get_id(obj2));
1970 48ae06ee 2018-10-18 stsp if (view->state.diff.id2 == NULL) {
1971 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
1972 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1973 48ae06ee 2018-10-18 stsp return got_error_from_errno();
1975 48ae06ee 2018-10-18 stsp view->state.diff.f = NULL;
1976 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
1977 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
1978 48ae06ee 2018-10-18 stsp view->state.diff.diff_context = 3;
1979 48ae06ee 2018-10-18 stsp view->state.diff.repo = repo;
1981 48ae06ee 2018-10-18 stsp err = create_diff(&view->state.diff);
1982 48ae06ee 2018-10-18 stsp if (err) {
1983 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
1984 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
1985 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
1986 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
1987 48ae06ee 2018-10-18 stsp return err;
1990 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
1991 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
1992 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
1994 5dc9f4bc 2018-08-04 stsp return NULL;
1997 e5a0f69f 2018-08-18 stsp static const struct got_error *
1998 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
2000 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2002 48ae06ee 2018-10-18 stsp free(view->state.diff.id1);
2003 48ae06ee 2018-10-18 stsp view->state.diff.id1 = NULL;
2004 48ae06ee 2018-10-18 stsp free(view->state.diff.id2);
2005 48ae06ee 2018-10-18 stsp view->state.diff.id2 = NULL;
2006 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
2007 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2008 e5a0f69f 2018-08-18 stsp return err;
2011 5dc9f4bc 2018-08-04 stsp static const struct got_error *
2012 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
2014 a3404814 2018-09-02 stsp const struct got_error *err;
2015 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
2016 a3404814 2018-09-02 stsp char *id_str1 = NULL, *id_str2, *header;
2018 a3404814 2018-09-02 stsp if (s->id1) {
2019 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str1, s->id1);
2021 a3404814 2018-09-02 stsp return err;
2023 a3404814 2018-09-02 stsp err = got_object_id_str(&id_str2, s->id2);
2025 a3404814 2018-09-02 stsp return err;
2027 56765ebb 2018-12-23 stsp if (asprintf(&header, "diff %s %s",
2028 a3404814 2018-09-02 stsp id_str1 ? id_str1 : "/dev/null", id_str2) == -1) {
2029 a3404814 2018-09-02 stsp err = got_error_from_errno();
2030 a3404814 2018-09-02 stsp free(id_str1);
2031 a3404814 2018-09-02 stsp free(id_str2);
2032 a3404814 2018-09-02 stsp return err;
2034 a3404814 2018-09-02 stsp free(id_str1);
2035 a3404814 2018-09-02 stsp free(id_str2);
2037 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
2038 a3404814 2018-09-02 stsp &s->last_displayed_line, &s->eof, view->nlines,
2042 0cf4efb1 2018-09-29 stsp static const struct got_error *
2043 bcbd79e2 2018-08-19 stsp input_diff_view(struct tog_view **new_view, struct tog_view **dead_view,
2044 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2046 bcbd79e2 2018-08-19 stsp const struct got_error *err = NULL;
2047 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
2050 e5a0f69f 2018-08-18 stsp switch (ch) {
2052 e5a0f69f 2018-08-18 stsp case KEY_UP:
2053 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > 1)
2054 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2056 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2058 e5a0f69f 2018-08-18 stsp while (i++ < view->nlines - 1 &&
2059 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2060 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2063 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2064 e5a0f69f 2018-08-18 stsp if (!s->eof)
2065 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2067 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2070 e5a0f69f 2018-08-18 stsp while (!s->eof && i++ < view->nlines - 1) {
2071 e5a0f69f 2018-08-18 stsp char *line;
2072 e5a0f69f 2018-08-18 stsp line = parse_next_line(s->f, NULL);
2073 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2074 e5a0f69f 2018-08-18 stsp if (line == NULL)
2079 48ae06ee 2018-10-18 stsp if (s->diff_context > 0) {
2080 48ae06ee 2018-10-18 stsp s->diff_context--;
2081 48ae06ee 2018-10-18 stsp err = create_diff(s);
2085 4a8520aa 2018-10-18 stsp if (s->diff_context < GOT_DIFF_MAX_CONTEXT) {
2086 48ae06ee 2018-10-18 stsp s->diff_context++;
2087 48ae06ee 2018-10-18 stsp err = create_diff(s);
2094 bcbd79e2 2018-08-19 stsp return err;
2097 4ed7e80c 2018-05-20 stsp static const struct got_error *
2098 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
2100 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
2101 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
2102 26ed57b2 2018-05-19 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
2103 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
2104 26ed57b2 2018-05-19 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
2106 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
2108 26ed57b2 2018-05-19 stsp #ifndef PROFILE
2109 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
2111 26ed57b2 2018-05-19 stsp err(1, "pledge");
2114 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
2115 26ed57b2 2018-05-19 stsp switch (ch) {
2118 26ed57b2 2018-05-19 stsp /* NOTREACHED */
2122 26ed57b2 2018-05-19 stsp argc -= optind;
2123 26ed57b2 2018-05-19 stsp argv += optind;
2125 26ed57b2 2018-05-19 stsp if (argc == 0) {
2126 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
2127 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
2128 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
2129 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2130 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2131 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[0];
2132 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[1];
2133 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
2134 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
2135 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
2136 26ed57b2 2018-05-19 stsp return got_error_from_errno();
2137 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[1];
2138 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[2];
2140 26ed57b2 2018-05-19 stsp usage_diff();
2142 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
2143 26ed57b2 2018-05-19 stsp free(repo_path);
2144 26ed57b2 2018-05-19 stsp if (error)
2145 26ed57b2 2018-05-19 stsp goto done;
2147 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
2148 26ed57b2 2018-05-19 stsp if (error)
2149 26ed57b2 2018-05-19 stsp goto done;
2151 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
2152 26ed57b2 2018-05-19 stsp if (error)
2153 26ed57b2 2018-05-19 stsp goto done;
2155 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_DIFF);
2156 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
2157 ea5e7bb5 2018-08-01 stsp error = got_error_from_errno();
2158 ea5e7bb5 2018-08-01 stsp goto done;
2160 5dc9f4bc 2018-08-04 stsp error = open_diff_view(view, obj1, obj2, repo);
2161 5dc9f4bc 2018-08-04 stsp if (error)
2162 5dc9f4bc 2018-08-04 stsp goto done;
2163 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2165 26ed57b2 2018-05-19 stsp got_repo_close(repo);
2167 26ed57b2 2018-05-19 stsp got_object_close(obj1);
2169 26ed57b2 2018-05-19 stsp got_object_close(obj2);
2170 26ed57b2 2018-05-19 stsp return error;
2173 4ed7e80c 2018-05-20 stsp __dead static void
2174 9f7d7167 2018-04-29 stsp usage_blame(void)
2177 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
2178 9f7d7167 2018-04-29 stsp getprogname());
2182 84451b3e 2018-07-10 stsp struct tog_blame_line {
2183 84451b3e 2018-07-10 stsp int annotated;
2184 84451b3e 2018-07-10 stsp struct got_object_id *id;
2187 4ed7e80c 2018-05-20 stsp static const struct got_error *
2188 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
2189 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
2190 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
2191 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
2193 84451b3e 2018-07-10 stsp const struct got_error *err;
2194 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
2195 84451b3e 2018-07-10 stsp char *line;
2196 84451b3e 2018-07-10 stsp size_t len;
2197 84451b3e 2018-07-10 stsp wchar_t *wline;
2198 b700b5d6 2018-07-10 stsp int width, wlimit;
2199 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
2200 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
2201 ab089a2a 2018-07-12 stsp char *id_str;
2203 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
2205 ab089a2a 2018-07-12 stsp return err;
2207 84451b3e 2018-07-10 stsp rewind(f);
2208 f7d12f7e 2018-08-01 stsp werase(view->window);
2210 ab089a2a 2018-07-12 stsp if (asprintf(&line, "commit: %s", id_str) == -1) {
2211 ab089a2a 2018-07-12 stsp err = got_error_from_errno();
2212 ab089a2a 2018-07-12 stsp free(id_str);
2213 ab089a2a 2018-07-12 stsp return err;
2216 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2217 ab089a2a 2018-07-12 stsp free(line);
2218 2550e4c3 2018-07-13 stsp line = NULL;
2219 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2220 a3404814 2018-09-02 stsp wstandout(view->window);
2221 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2222 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2223 a3404814 2018-09-02 stsp wstandend(view->window);
2224 2550e4c3 2018-07-13 stsp free(wline);
2225 2550e4c3 2018-07-13 stsp wline = NULL;
2226 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2227 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2229 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
2230 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
2231 12a0b23b 2018-07-12 stsp blame_complete ? "" : "annotating ", path) == -1) {
2232 ab089a2a 2018-07-12 stsp free(id_str);
2233 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
2235 ab089a2a 2018-07-12 stsp free(id_str);
2236 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2237 3f60a8ef 2018-07-10 stsp free(line);
2238 2550e4c3 2018-07-13 stsp line = NULL;
2240 3f60a8ef 2018-07-10 stsp return err;
2241 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2242 2550e4c3 2018-07-13 stsp free(wline);
2243 2550e4c3 2018-07-13 stsp wline = NULL;
2244 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2245 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2248 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
2249 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
2250 84451b3e 2018-07-10 stsp if (line == NULL) {
2254 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
2255 84451b3e 2018-07-10 stsp free(line);
2259 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
2260 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
2261 84451b3e 2018-07-10 stsp if (err) {
2262 84451b3e 2018-07-10 stsp free(line);
2263 84451b3e 2018-07-10 stsp return err;
2266 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2267 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2269 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
2270 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
2271 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
2272 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
2273 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
2274 84451b3e 2018-07-10 stsp char *id_str;
2275 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
2276 84451b3e 2018-07-10 stsp if (err) {
2277 84451b3e 2018-07-10 stsp free(line);
2278 2550e4c3 2018-07-13 stsp free(wline);
2279 84451b3e 2018-07-10 stsp return err;
2281 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
2282 84451b3e 2018-07-10 stsp free(id_str);
2283 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
2285 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
2286 ee41ec32 2018-07-10 stsp prev_id = NULL;
2289 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2290 b700b5d6 2018-07-10 stsp while (width < wlimit) {
2291 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
2294 0cf4efb1 2018-09-29 stsp if (view->focussed && nprinted == selected_line - 1)
2295 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2296 84451b3e 2018-07-10 stsp if (++nprinted == 1)
2297 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
2298 84451b3e 2018-07-10 stsp free(line);
2299 2550e4c3 2018-07-13 stsp free(wline);
2300 2550e4c3 2018-07-13 stsp wline = NULL;
2302 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
2304 1a57306a 2018-09-02 stsp view_vborder(view);
2306 84451b3e 2018-07-10 stsp return NULL;
2309 84451b3e 2018-07-10 stsp static const struct got_error *
2310 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2312 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
2313 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
2314 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
2315 1a76625f 2018-10-22 stsp int errcode;
2317 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
2318 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
2319 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
2321 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2322 1a76625f 2018-10-22 stsp if (errcode)
2323 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2325 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
2326 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
2327 d68a0a7d 2018-07-10 stsp goto done;
2330 d68a0a7d 2018-07-10 stsp if (lineno == -1)
2331 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
2333 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
2334 d68a0a7d 2018-07-10 stsp if (line->annotated)
2335 d68a0a7d 2018-07-10 stsp goto done;
2337 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
2338 84451b3e 2018-07-10 stsp if (line->id == NULL) {
2339 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2340 84451b3e 2018-07-10 stsp goto done;
2342 84451b3e 2018-07-10 stsp line->annotated = 1;
2344 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2345 1a76625f 2018-10-22 stsp if (errcode)
2346 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2347 84451b3e 2018-07-10 stsp return err;
2350 84451b3e 2018-07-10 stsp static void *
2351 84451b3e 2018-07-10 stsp blame_thread(void *arg)
2353 18430de3 2018-07-10 stsp const struct got_error *err;
2354 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
2355 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
2356 1a76625f 2018-10-22 stsp int errcode;
2358 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
2359 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
2361 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2362 1a76625f 2018-10-22 stsp if (errcode)
2363 1a76625f 2018-10-22 stsp return (void *)got_error_set_errno(errcode);
2365 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
2366 c9beca56 2018-07-22 stsp ta->repo = NULL;
2367 c9beca56 2018-07-22 stsp *ta->complete = 1;
2369 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2370 1a76625f 2018-10-22 stsp if (errcode && err == NULL)
2371 1a76625f 2018-10-22 stsp err = got_error_set_errno(errcode);
2373 18430de3 2018-07-10 stsp return (void *)err;
2376 245d91c1 2018-07-12 stsp static struct got_object_id *
2377 245d91c1 2018-07-12 stsp get_selected_commit_id(struct tog_blame_line *lines,
2378 245d91c1 2018-07-12 stsp int first_displayed_line, int selected_line)
2380 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
2382 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
2383 245d91c1 2018-07-12 stsp if (!line->annotated)
2384 245d91c1 2018-07-12 stsp return NULL;
2386 245d91c1 2018-07-12 stsp return line->id;
2389 84451b3e 2018-07-10 stsp static const struct got_error *
2390 245d91c1 2018-07-12 stsp open_selected_commit(struct got_object **pobj, struct got_object **obj,
2391 b880a918 2018-07-10 stsp struct tog_blame_line *lines, int first_displayed_line,
2392 b880a918 2018-07-10 stsp int selected_line, struct got_repository *repo)
2394 b880a918 2018-07-10 stsp const struct got_error *err = NULL;
2395 b880a918 2018-07-10 stsp struct got_commit_object *commit = NULL;
2396 245d91c1 2018-07-12 stsp struct got_object_id *selected_id;
2397 b880a918 2018-07-10 stsp struct got_object_qid *pid;
2399 b880a918 2018-07-10 stsp *pobj = NULL;
2400 b880a918 2018-07-10 stsp *obj = NULL;
2402 245d91c1 2018-07-12 stsp selected_id = get_selected_commit_id(lines,
2403 245d91c1 2018-07-12 stsp first_displayed_line, selected_line);
2404 245d91c1 2018-07-12 stsp if (selected_id == NULL)
2405 b880a918 2018-07-10 stsp return NULL;
2407 245d91c1 2018-07-12 stsp err = got_object_open(obj, repo, selected_id);
2409 b880a918 2018-07-10 stsp goto done;
2411 b880a918 2018-07-10 stsp err = got_object_commit_open(&commit, repo, *obj);
2413 b880a918 2018-07-10 stsp goto done;
2415 45d799e2 2018-12-23 stsp pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2416 b880a918 2018-07-10 stsp if (pid) {
2417 b880a918 2018-07-10 stsp err = got_object_open(pobj, repo, pid->id);
2419 b880a918 2018-07-10 stsp goto done;
2422 b880a918 2018-07-10 stsp if (commit)
2423 b880a918 2018-07-10 stsp got_object_commit_close(commit);
2424 b880a918 2018-07-10 stsp return err;
2427 b880a918 2018-07-10 stsp static const struct got_error *
2428 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
2430 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
2433 245d91c1 2018-07-12 stsp if (blame->thread) {
2434 1a76625f 2018-10-22 stsp int errcode;
2435 1a76625f 2018-10-22 stsp errcode = pthread_mutex_unlock(&tog_mutex);
2436 1a76625f 2018-10-22 stsp if (errcode)
2437 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2438 1a76625f 2018-10-22 stsp errcode = pthread_join(blame->thread, (void **)&err);
2439 1a76625f 2018-10-22 stsp if (errcode)
2440 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2441 1a76625f 2018-10-22 stsp errcode = pthread_mutex_lock(&tog_mutex);
2442 1a76625f 2018-10-22 stsp if (errcode)
2443 1a76625f 2018-10-22 stsp return got_error_set_errno(errcode);
2444 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
2445 245d91c1 2018-07-12 stsp err = NULL;
2446 245d91c1 2018-07-12 stsp blame->thread = NULL;
2448 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
2449 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
2450 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
2452 245d91c1 2018-07-12 stsp if (blame->f) {
2453 245d91c1 2018-07-12 stsp fclose(blame->f);
2454 245d91c1 2018-07-12 stsp blame->f = NULL;
2456 245d91c1 2018-07-12 stsp for (i = 0; i < blame->nlines; i++)
2457 245d91c1 2018-07-12 stsp free(blame->lines[i].id);
2458 245d91c1 2018-07-12 stsp free(blame->lines);
2459 245d91c1 2018-07-12 stsp blame->lines = NULL;
2460 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
2461 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
2463 245d91c1 2018-07-12 stsp return err;
2466 245d91c1 2018-07-12 stsp static const struct got_error *
2467 1a76625f 2018-10-22 stsp run_blame(struct tog_blame *blame, struct tog_view *view, int *blame_complete,
2468 1a76625f 2018-10-22 stsp int *first_displayed_line, int *last_displayed_line, int *selected_line,
2469 1a76625f 2018-10-22 stsp int *done, int *eof, const char *path, struct got_object_id *commit_id,
2470 245d91c1 2018-07-12 stsp struct got_repository *repo)
2472 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
2473 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
2474 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
2475 27d434c2 2018-09-15 stsp struct got_object_id *obj_id = NULL;
2476 27d434c2 2018-09-15 stsp struct got_object *obj = NULL;
2478 27d434c2 2018-09-15 stsp err = got_object_id_by_path(&obj_id, repo, commit_id, path);
2480 27d434c2 2018-09-15 stsp goto done;
2482 27d434c2 2018-09-15 stsp err = got_object_open(&obj, repo, obj_id);
2484 84451b3e 2018-07-10 stsp goto done;
2486 84451b3e 2018-07-10 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_BLOB) {
2487 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
2488 84451b3e 2018-07-10 stsp goto done;
2491 84451b3e 2018-07-10 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
2493 a70480e0 2018-06-23 stsp goto done;
2494 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
2495 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
2496 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2497 84451b3e 2018-07-10 stsp goto done;
2499 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
2500 245d91c1 2018-07-12 stsp blame->f, blob);
2502 84451b3e 2018-07-10 stsp goto done;
2504 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
2505 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
2506 84451b3e 2018-07-10 stsp err = got_error_from_errno();
2507 84451b3e 2018-07-10 stsp goto done;
2510 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
2512 bd24772e 2018-07-11 stsp goto done;
2514 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
2515 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
2516 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
2517 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
2518 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
2519 245d91c1 2018-07-12 stsp err = got_error_from_errno();
2520 245d91c1 2018-07-12 stsp goto done;
2522 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
2524 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
2525 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
2526 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
2527 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
2528 245d91c1 2018-07-12 stsp *blame_complete = 0;
2532 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
2533 27d434c2 2018-09-15 stsp free(obj_id);
2535 245d91c1 2018-07-12 stsp got_object_close(obj);
2537 245d91c1 2018-07-12 stsp stop_blame(blame);
2538 245d91c1 2018-07-12 stsp return err;
2541 245d91c1 2018-07-12 stsp static const struct got_error *
2542 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
2543 e1cd8fed 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
2545 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
2546 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2548 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
2550 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
2552 7cbe629d 2018-08-04 stsp return err;
2554 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
2555 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
2556 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
2557 fb2756b9 2018-08-04 stsp s->selected_line = 1;
2558 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
2559 fb2756b9 2018-08-04 stsp s->path = path;
2560 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
2561 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2562 fb2756b9 2018-08-04 stsp s->repo = repo;
2563 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
2564 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
2566 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
2567 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
2568 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
2570 1a76625f 2018-10-22 stsp return run_blame(&s->blame, view, &s->blame_complete,
2571 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
2572 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2573 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2576 e5a0f69f 2018-08-18 stsp static const struct got_error *
2577 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
2579 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2580 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2582 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
2583 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
2585 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
2586 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
2587 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
2588 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2589 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
2592 e5a0f69f 2018-08-18 stsp free(s->path);
2594 e5a0f69f 2018-08-18 stsp return err;
2597 7cbe629d 2018-08-04 stsp static const struct got_error *
2598 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
2600 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2601 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
2602 2b380cc8 2018-10-24 stsp int errcode;
2604 2b380cc8 2018-10-24 stsp if (s->blame.thread == NULL) {
2605 2b380cc8 2018-10-24 stsp errcode = pthread_create(&s->blame.thread, NULL, blame_thread,
2606 2b380cc8 2018-10-24 stsp &s->blame.thread_args);
2607 2b380cc8 2018-10-24 stsp if (errcode)
2608 2b380cc8 2018-10-24 stsp return got_error_set_errno(errcode);
2611 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
2612 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
2613 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
2614 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
2616 669b5ffa 2018-10-07 stsp view_vborder(view);
2617 e5a0f69f 2018-08-18 stsp return err;
2620 e5a0f69f 2018-08-18 stsp static const struct got_error *
2621 878940b7 2018-09-29 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
2622 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
2624 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
2625 7cbe629d 2018-08-04 stsp struct got_object *obj = NULL, *pobj = NULL;
2626 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
2627 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2628 669b5ffa 2018-10-07 stsp int begin_x = 0;
2630 e5a0f69f 2018-08-18 stsp switch (ch) {
2632 e5a0f69f 2018-08-18 stsp s->done = 1;
2635 e5a0f69f 2018-08-18 stsp case KEY_UP:
2636 e5a0f69f 2018-08-18 stsp if (s->selected_line > 1)
2637 e5a0f69f 2018-08-18 stsp s->selected_line--;
2638 e5a0f69f 2018-08-18 stsp else if (s->selected_line == 1 &&
2639 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2640 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2642 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2643 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line == 1) {
2644 e5a0f69f 2018-08-18 stsp s->selected_line = 1;
2647 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > view->nlines - 2)
2648 e5a0f69f 2018-08-18 stsp s->first_displayed_line -=
2649 e5a0f69f 2018-08-18 stsp (view->nlines - 2);
2651 e5a0f69f 2018-08-18 stsp s->first_displayed_line = 1;
2654 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2655 e5a0f69f 2018-08-18 stsp if (s->selected_line < view->nlines - 2 &&
2656 e5a0f69f 2018-08-18 stsp s->first_displayed_line +
2657 e5a0f69f 2018-08-18 stsp s->selected_line <= s->blame.nlines)
2658 e5a0f69f 2018-08-18 stsp s->selected_line++;
2659 e5a0f69f 2018-08-18 stsp else if (s->last_displayed_line <
2660 e5a0f69f 2018-08-18 stsp s->blame.nlines)
2661 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2664 e5a0f69f 2018-08-18 stsp case 'p': {
2665 e5a0f69f 2018-08-18 stsp struct got_object_id *id;
2666 e5a0f69f 2018-08-18 stsp id = get_selected_commit_id(s->blame.lines,
2667 e5a0f69f 2018-08-18 stsp s->first_displayed_line, s->selected_line);
2668 e5a0f69f 2018-08-18 stsp if (id == NULL || got_object_id_cmp(id,
2669 e5a0f69f 2018-08-18 stsp s->blamed_commit->id) == 0)
2671 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2672 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2673 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2676 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2678 e5a0f69f 2018-08-18 stsp if (ch == 'p' && pobj == NULL)
2680 e5a0f69f 2018-08-18 stsp s->done = 1;
2681 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2682 e5a0f69f 2018-08-18 stsp s->done = 0;
2683 e5a0f69f 2018-08-18 stsp if (thread_err)
2685 e5a0f69f 2018-08-18 stsp id = got_object_get_id(ch == 'b' ? obj : pobj);
2686 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2687 e5a0f69f 2018-08-18 stsp obj = NULL;
2688 e5a0f69f 2018-08-18 stsp if (pobj) {
2689 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2690 e5a0f69f 2018-08-18 stsp pobj = NULL;
2692 6402fb3c 2018-09-15 stsp err = got_object_qid_alloc(&s->blamed_commit, id);
2694 e5a0f69f 2018-08-18 stsp goto done;
2695 e5a0f69f 2018-08-18 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2696 e5a0f69f 2018-08-18 stsp s->blamed_commit, entry);
2697 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2698 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2699 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof,
2700 e5a0f69f 2018-08-18 stsp s->path, s->blamed_commit->id, s->repo);
2705 e5a0f69f 2018-08-18 stsp case 'B': {
2706 e5a0f69f 2018-08-18 stsp struct got_object_qid *first;
2707 e5a0f69f 2018-08-18 stsp first = SIMPLEQ_FIRST(&s->blamed_commits);
2708 e5a0f69f 2018-08-18 stsp if (!got_object_id_cmp(first->id, s->commit_id))
2710 e5a0f69f 2018-08-18 stsp s->done = 1;
2711 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2712 e5a0f69f 2018-08-18 stsp s->done = 0;
2713 e5a0f69f 2018-08-18 stsp if (thread_err)
2715 e5a0f69f 2018-08-18 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2716 e5a0f69f 2018-08-18 stsp got_object_qid_free(s->blamed_commit);
2717 e5a0f69f 2018-08-18 stsp s->blamed_commit =
2718 e5a0f69f 2018-08-18 stsp SIMPLEQ_FIRST(&s->blamed_commits);
2719 1a76625f 2018-10-22 stsp err = run_blame(&s->blame, view, &s->blame_complete,
2720 1a76625f 2018-10-22 stsp &s->first_displayed_line, &s->last_displayed_line,
2721 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2722 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2727 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2728 e5a0f69f 2018-08-18 stsp case '\r':
2729 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2730 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2731 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2734 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2737 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
2738 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
2739 669b5ffa 2018-10-07 stsp diff_view = view_open(0, 0, 0, begin_x, TOG_VIEW_DIFF);
2740 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
2741 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2744 669b5ffa 2018-10-07 stsp err = open_diff_view(diff_view, pobj, obj, s->repo);
2745 e5a0f69f 2018-08-18 stsp if (err) {
2746 e5a0f69f 2018-08-18 stsp view_close(diff_view);
2749 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
2750 669b5ffa 2018-10-07 stsp err = view_close_child(view);
2752 669b5ffa 2018-10-07 stsp return err;
2753 669b5ffa 2018-10-07 stsp err = view_set_child(view, diff_view);
2754 669b5ffa 2018-10-07 stsp if (err) {
2755 669b5ffa 2018-10-07 stsp view_close(diff_view);
2758 51c68690 2018-11-07 stsp *focus_view = diff_view;
2759 51c68690 2018-11-07 stsp view->child_focussed = 1;
2761 669b5ffa 2018-10-07 stsp *new_view = diff_view;
2762 e5a0f69f 2018-08-18 stsp if (pobj) {
2763 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2764 e5a0f69f 2018-08-18 stsp pobj = NULL;
2766 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2767 e5a0f69f 2018-08-18 stsp obj = NULL;
2771 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2773 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line >= s->blame.nlines &&
2774 e5a0f69f 2018-08-18 stsp s->selected_line < view->nlines - 2) {
2775 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2776 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2779 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line + view->nlines - 2
2780 e5a0f69f 2018-08-18 stsp <= s->blame.nlines)
2781 e5a0f69f 2018-08-18 stsp s->first_displayed_line +=
2782 e5a0f69f 2018-08-18 stsp view->nlines - 2;
2784 e5a0f69f 2018-08-18 stsp s->first_displayed_line =
2785 e5a0f69f 2018-08-18 stsp s->blame.nlines -
2786 e5a0f69f 2018-08-18 stsp (view->nlines - 3);
2788 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
2789 e5a0f69f 2018-08-18 stsp if (s->selected_line > view->nlines - 2) {
2790 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2791 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2799 b880a918 2018-07-10 stsp got_object_close(pobj);
2800 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
2803 a70480e0 2018-06-23 stsp static const struct got_error *
2804 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
2806 a70480e0 2018-06-23 stsp const struct got_error *error;
2807 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
2808 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2809 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
2810 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
2812 e1cd8fed 2018-08-01 stsp struct tog_view *view;
2814 a70480e0 2018-06-23 stsp #ifndef PROFILE
2815 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
2817 a70480e0 2018-06-23 stsp err(1, "pledge");
2820 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2821 a70480e0 2018-06-23 stsp switch (ch) {
2823 a70480e0 2018-06-23 stsp commit_id_str = optarg;
2826 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2827 69069811 2018-08-02 stsp if (repo_path == NULL)
2828 69069811 2018-08-02 stsp err(1, "-r option");
2832 a70480e0 2018-06-23 stsp /* NOTREACHED */
2836 a70480e0 2018-06-23 stsp argc -= optind;
2837 a70480e0 2018-06-23 stsp argv += optind;
2839 69069811 2018-08-02 stsp if (argc == 1)
2840 69069811 2018-08-02 stsp path = argv[0];
2842 a70480e0 2018-06-23 stsp usage_blame();
2844 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
2845 69069811 2018-08-02 stsp if (cwd == NULL) {
2846 69069811 2018-08-02 stsp error = got_error_from_errno();
2847 69069811 2018-08-02 stsp goto done;
2849 69069811 2018-08-02 stsp if (repo_path == NULL) {
2850 69069811 2018-08-02 stsp repo_path = strdup(cwd);
2851 69069811 2018-08-02 stsp if (repo_path == NULL) {
2852 69069811 2018-08-02 stsp error = got_error_from_errno();
2853 69069811 2018-08-02 stsp goto done;
2858 69069811 2018-08-02 stsp error = got_repo_open(&repo, repo_path);
2859 a70480e0 2018-06-23 stsp if (error != NULL)
2860 66b4983c 2018-06-23 stsp return error;
2862 23721109 2018-10-22 stsp error = got_repo_map_path(&in_repo_path, repo, path, 1);
2863 69069811 2018-08-02 stsp if (error != NULL)
2864 69069811 2018-08-02 stsp goto done;
2866 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
2867 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
2868 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
2869 a70480e0 2018-06-23 stsp if (error != NULL)
2870 66b4983c 2018-06-23 stsp goto done;
2871 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2872 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
2874 a70480e0 2018-06-23 stsp struct got_object *obj;
2875 a70480e0 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_str);
2876 a70480e0 2018-06-23 stsp if (error != NULL)
2877 66b4983c 2018-06-23 stsp goto done;
2878 6402fb3c 2018-09-15 stsp commit_id = got_object_id_dup(got_object_get_id(obj));
2879 a19e88aa 2018-06-23 stsp if (commit_id == NULL)
2880 66b4983c 2018-06-23 stsp error = got_error_from_errno();
2881 a19e88aa 2018-06-23 stsp got_object_close(obj);
2883 a19e88aa 2018-06-23 stsp if (error != NULL)
2884 a19e88aa 2018-06-23 stsp goto done;
2886 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_BLAME);
2887 e1cd8fed 2018-08-01 stsp if (view == NULL) {
2888 e1cd8fed 2018-08-01 stsp error = got_error_from_errno();
2889 e1cd8fed 2018-08-01 stsp goto done;
2891 7cbe629d 2018-08-04 stsp error = open_blame_view(view, in_repo_path, commit_id, repo);
2892 7cbe629d 2018-08-04 stsp if (error)
2893 7cbe629d 2018-08-04 stsp goto done;
2894 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2896 69069811 2018-08-02 stsp free(repo_path);
2897 69069811 2018-08-02 stsp free(cwd);
2898 a70480e0 2018-06-23 stsp free(commit_id);
2900 a70480e0 2018-06-23 stsp got_repo_close(repo);
2901 a70480e0 2018-06-23 stsp return error;
2904 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2905 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
2906 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
2907 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
2908 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
2909 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
2910 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
2912 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
2913 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
2914 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
2915 ffd1d5e5 2018-06-23 stsp int width, n;
2917 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
2919 f7d12f7e 2018-08-01 stsp werase(view->window);
2921 ffd1d5e5 2018-06-23 stsp if (limit == 0)
2922 ffd1d5e5 2018-06-23 stsp return NULL;
2924 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
2926 ffd1d5e5 2018-06-23 stsp return err;
2927 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2928 a3404814 2018-09-02 stsp wstandout(view->window);
2929 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2930 a3404814 2018-09-02 stsp if (view_needs_focus_indication(view))
2931 a3404814 2018-09-02 stsp wstandend(view->window);
2932 2550e4c3 2018-07-13 stsp free(wline);
2933 2550e4c3 2018-07-13 stsp wline = NULL;
2934 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2935 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2936 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2937 ffd1d5e5 2018-06-23 stsp return NULL;
2938 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
2940 ce52c690 2018-06-23 stsp return err;
2941 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2942 2550e4c3 2018-07-13 stsp free(wline);
2943 2550e4c3 2018-07-13 stsp wline = NULL;
2944 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2945 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2946 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2947 ffd1d5e5 2018-06-23 stsp return NULL;
2948 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2949 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
2950 a1eca9bb 2018-06-23 stsp return NULL;
2952 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2953 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
2954 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
2955 0cf4efb1 2018-09-29 stsp if (view->focussed)
2956 0cf4efb1 2018-09-29 stsp wstandout(view->window);
2957 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
2959 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
2960 0cf4efb1 2018-09-29 stsp if (selected == 0 && view->focussed)
2961 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2962 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2963 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2964 ffd1d5e5 2018-06-23 stsp return NULL;
2968 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
2969 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2972 ffd1d5e5 2018-06-23 stsp while (te) {
2973 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
2975 1d13200f 2018-07-12 stsp if (show_ids) {
2976 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
2978 1d13200f 2018-07-12 stsp return got_error_from_errno();
2980 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
2981 1d13200f 2018-07-12 stsp te->name, S_ISDIR(te->mode) ? "/" : "") == -1) {
2982 1d13200f 2018-07-12 stsp free(id_str);
2983 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2985 1d13200f 2018-07-12 stsp free(id_str);
2986 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2987 ffd1d5e5 2018-06-23 stsp if (err) {
2988 ffd1d5e5 2018-06-23 stsp free(line);
2991 ffd1d5e5 2018-06-23 stsp if (n == selected) {
2992 0cf4efb1 2018-09-29 stsp if (view->focussed)
2993 0cf4efb1 2018-09-29 stsp wstandout(view->window);
2994 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
2996 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2997 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2998 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2999 0cf4efb1 2018-09-29 stsp if (n == selected && view->focussed)
3000 f7d12f7e 2018-08-01 stsp wstandend(view->window);
3001 ffd1d5e5 2018-06-23 stsp free(line);
3002 2550e4c3 2018-07-13 stsp free(wline);
3003 2550e4c3 2018-07-13 stsp wline = NULL;
3005 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
3006 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
3007 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
3009 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3012 ffd1d5e5 2018-06-23 stsp return err;
3015 ffd1d5e5 2018-06-23 stsp static void
3016 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
3017 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
3019 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
3022 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
3025 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3026 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
3027 ffd1d5e5 2018-06-23 stsp if (!isroot)
3028 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3032 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
3033 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
3034 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
3035 ffd1d5e5 2018-06-23 stsp prev = te;
3036 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
3038 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
3039 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
3041 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
3042 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
3045 ffd1d5e5 2018-06-23 stsp static void
3046 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
3047 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
3048 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
3050 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *next;
3051 ffd1d5e5 2018-06-23 stsp int n = 0;
3053 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_NEXT(last_displayed_entry, entry) == NULL)
3056 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
3057 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
3059 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
3060 ffd1d5e5 2018-06-23 stsp while (next) {
3061 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = next;
3062 ffd1d5e5 2018-06-23 stsp if (++n >= maxscroll)
3064 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(next, entry);
3068 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3069 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
3070 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
3072 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
3073 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
3074 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
3076 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
3077 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
3079 ce52c690 2018-06-23 stsp len += strlen(te->name);
3081 ce52c690 2018-06-23 stsp *path = calloc(1, len);
3082 ffd1d5e5 2018-06-23 stsp if (path == NULL)
3083 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3085 ce52c690 2018-06-23 stsp (*path)[0] = '/';
3086 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
3087 d9765a41 2018-06-23 stsp while (pt) {
3088 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
3089 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3090 cb2ebc8a 2018-06-23 stsp goto done;
3092 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
3093 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3094 cb2ebc8a 2018-06-23 stsp goto done;
3096 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
3099 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
3100 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
3101 ce52c690 2018-06-23 stsp goto done;
3105 ce52c690 2018-06-23 stsp if (err) {
3106 ce52c690 2018-06-23 stsp free(*path);
3107 ce52c690 2018-06-23 stsp *path = NULL;
3109 ce52c690 2018-06-23 stsp return err;
3112 ce52c690 2018-06-23 stsp static const struct got_error *
3113 0cf4efb1 2018-09-29 stsp blame_tree_entry(struct tog_view **new_view, int begin_x,
3114 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3115 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
3117 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
3118 ce52c690 2018-06-23 stsp char *path;
3119 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
3121 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
3123 ce52c690 2018-06-23 stsp return err;
3125 669b5ffa 2018-10-07 stsp blame_view = view_open(0, 0, 0, begin_x, TOG_VIEW_BLAME);
3126 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
3127 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3129 e5a0f69f 2018-08-18 stsp err = open_blame_view(blame_view, path, commit_id, repo);
3130 e5a0f69f 2018-08-18 stsp if (err) {
3131 e5a0f69f 2018-08-18 stsp view_close(blame_view);
3132 e5a0f69f 2018-08-18 stsp free(path);
3134 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
3135 69efd4c4 2018-07-18 stsp return err;
3138 69efd4c4 2018-07-18 stsp static const struct got_error *
3139 669b5ffa 2018-10-07 stsp log_tree_entry(struct tog_view **new_view, int begin_x,
3140 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
3141 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
3143 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
3144 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
3145 69efd4c4 2018-07-18 stsp char *path;
3147 669b5ffa 2018-10-07 stsp log_view = view_open(0, 0, 0, begin_x, TOG_VIEW_LOG);
3148 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
3149 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
3151 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
3153 69efd4c4 2018-07-18 stsp return err;
3155 23721109 2018-10-22 stsp err = open_log_view(log_view, commit_id, repo, path, 0);
3157 e5a0f69f 2018-08-18 stsp view_close(log_view);
3159 e5a0f69f 2018-08-18 stsp *new_view = log_view;
3160 cb2ebc8a 2018-06-23 stsp free(path);
3161 cb2ebc8a 2018-06-23 stsp return err;
3164 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3165 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
3166 5221c383 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
3168 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
3169 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
3170 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3172 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
3174 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
3175 ffd1d5e5 2018-06-23 stsp if (err != NULL)
3176 ffd1d5e5 2018-06-23 stsp goto done;
3178 fb2756b9 2018-08-04 stsp if (asprintf(&s->tree_label, "commit: %s", commit_id_str) == -1) {
3179 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
3180 ffd1d5e5 2018-06-23 stsp goto done;
3183 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
3184 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
3185 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
3186 6484ec90 2018-09-29 stsp s->commit_id = got_object_id_dup(commit_id);
3187 6484ec90 2018-09-29 stsp if (s->commit_id == NULL) {
3188 6484ec90 2018-09-29 stsp err = got_error_from_errno();
3189 6484ec90 2018-09-29 stsp goto done;
3191 fb2756b9 2018-08-04 stsp s->repo = repo;
3193 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
3194 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
3195 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
3197 ad80ab7b 2018-08-04 stsp free(commit_id_str);
3198 6484ec90 2018-09-29 stsp if (err) {
3199 fb2756b9 2018-08-04 stsp free(s->tree_label);
3200 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3202 ad80ab7b 2018-08-04 stsp return err;
3205 e5a0f69f 2018-08-18 stsp static const struct got_error *
3206 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
3208 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3210 fb2756b9 2018-08-04 stsp free(s->tree_label);
3211 6484ec90 2018-09-29 stsp s->tree_label = NULL;
3212 6484ec90 2018-09-29 stsp free(s->commit_id);
3213 6484ec90 2018-09-29 stsp s->commit_id = NULL;
3214 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
3215 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
3216 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
3217 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
3218 ad80ab7b 2018-08-04 stsp free(parent);
3221 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
3222 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
3223 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
3225 e5a0f69f 2018-08-18 stsp return NULL;
3228 ad80ab7b 2018-08-04 stsp static const struct got_error *
3229 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
3231 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
3232 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
3233 e5a0f69f 2018-08-18 stsp char *parent_path;
3235 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
3237 e5a0f69f 2018-08-18 stsp return err;
3239 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
3240 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
3241 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
3242 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
3243 e5a0f69f 2018-08-18 stsp free(parent_path);
3245 669b5ffa 2018-10-07 stsp view_vborder(view);
3246 e5a0f69f 2018-08-18 stsp return err;
3249 e5a0f69f 2018-08-18 stsp static const struct got_error *
3250 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
3251 878940b7 2018-09-29 stsp struct tog_view **focus_view, struct tog_view *view, int ch)
3253 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
3254 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
3255 669b5ffa 2018-10-07 stsp struct tog_view *log_view;
3256 669b5ffa 2018-10-07 stsp int begin_x = 0;
3258 e5a0f69f 2018-08-18 stsp switch (ch) {
3260 e5a0f69f 2018-08-18 stsp s->show_ids = !s->show_ids;
3263 669b5ffa 2018-10-07 stsp if (!s->selected_entry)
3265 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view))
3266 669b5ffa 2018-10-07 stsp begin_x = view_split_begin_x(view->begin_x);
3267 669b5ffa 2018-10-07 stsp err = log_tree_entry(&log_view, begin_x,
3268 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents,
3269 669b5ffa 2018-10-07 stsp s->commit_id, s->repo);
3270 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3271 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3273 669b5ffa 2018-10-07 stsp return err;
3274 669b5ffa 2018-10-07 stsp err = view_set_child(view, log_view);
3275 669b5ffa 2018-10-07 stsp if (err) {
3276 669b5ffa 2018-10-07 stsp view_close(log_view);
3279 669b5ffa 2018-10-07 stsp *focus_view = log_view;
3280 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3282 669b5ffa 2018-10-07 stsp *new_view = log_view;
3285 e5a0f69f 2018-08-18 stsp case KEY_UP:
3286 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
3287 e5a0f69f 2018-08-18 stsp s->selected--;
3288 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
3290 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry, 1,
3291 e5a0f69f 2018-08-18 stsp s->entries, s->tree == s->root);
3293 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
3294 8a0ead39 2018-11-03 stsp s->selected = 0;
3295 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_FIRST(&s->entries->head) ==
3296 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
3297 e5a0f69f 2018-08-18 stsp if (s->tree != s->root)
3298 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3301 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry,
3302 e5a0f69f 2018-08-18 stsp view->nlines, s->entries,
3303 e5a0f69f 2018-08-18 stsp s->tree == s->root);
3306 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
3307 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1) {
3308 e5a0f69f 2018-08-18 stsp s->selected++;
3311 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry, 1,
3312 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, s->entries);
3314 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
3315 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry,
3316 e5a0f69f 2018-08-18 stsp view->nlines, s->last_displayed_entry,
3317 e5a0f69f 2018-08-18 stsp s->entries);
3318 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry,
3321 e5a0f69f 2018-08-18 stsp /* can't scroll any further; move cursor down */
3322 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1)
3323 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3325 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
3326 e5a0f69f 2018-08-18 stsp case '\r':
3327 e5a0f69f 2018-08-18 stsp if (s->selected_entry == NULL) {
3328 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3329 7837eeac 2018-09-24 stsp case KEY_BACKSPACE:
3330 e5a0f69f 2018-08-18 stsp /* user selected '..' */
3331 e5a0f69f 2018-08-18 stsp if (s->tree == s->root)
3333 e5a0f69f 2018-08-18 stsp parent = TAILQ_FIRST(&s->parents);
3334 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&s->parents, parent,
3336 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->tree);
3337 e5a0f69f 2018-08-18 stsp s->tree = parent->tree;
3338 e5a0f69f 2018-08-18 stsp s->entries =
3339 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3340 e5a0f69f 2018-08-18 stsp s->first_displayed_entry =
3341 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry;
3342 e5a0f69f 2018-08-18 stsp s->selected_entry =
3343 e5a0f69f 2018-08-18 stsp parent->selected_entry;
3344 e5a0f69f 2018-08-18 stsp s->selected = parent->selected;
3345 e5a0f69f 2018-08-18 stsp free(parent);
3346 e5a0f69f 2018-08-18 stsp } else if (S_ISDIR(s->selected_entry->mode)) {
3347 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
3348 e5a0f69f 2018-08-18 stsp struct got_tree_object *child;
3349 e5a0f69f 2018-08-18 stsp err = got_object_open_as_tree(&child,
3350 e5a0f69f 2018-08-18 stsp s->repo, s->selected_entry->id);
3353 e5a0f69f 2018-08-18 stsp parent = calloc(1, sizeof(*parent));
3354 e5a0f69f 2018-08-18 stsp if (parent == NULL) {
3355 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
3358 e5a0f69f 2018-08-18 stsp parent->tree = s->tree;
3359 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry =
3360 e5a0f69f 2018-08-18 stsp s->first_displayed_entry;
3361 e5a0f69f 2018-08-18 stsp parent->selected_entry = s->selected_entry;
3362 e5a0f69f 2018-08-18 stsp parent->selected = s->selected;
3363 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
3364 e5a0f69f 2018-08-18 stsp s->tree = child;
3365 e5a0f69f 2018-08-18 stsp s->entries =
3366 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
3367 e5a0f69f 2018-08-18 stsp s->selected = 0;
3368 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
3369 e5a0f69f 2018-08-18 stsp } else if (S_ISREG(s->selected_entry->mode)) {
3370 669b5ffa 2018-10-07 stsp struct tog_view *blame_view;
3371 669b5ffa 2018-10-07 stsp int begin_x = view_is_parent_view(view) ?
3372 669b5ffa 2018-10-07 stsp view_split_begin_x(view->begin_x) : 0;
3374 669b5ffa 2018-10-07 stsp err = blame_tree_entry(&blame_view, begin_x,
3375 669b5ffa 2018-10-07 stsp s->selected_entry, &s->parents, s->commit_id,
3379 669b5ffa 2018-10-07 stsp if (view_is_parent_view(view)) {
3380 669b5ffa 2018-10-07 stsp err = view_close_child(view);
3382 669b5ffa 2018-10-07 stsp return err;
3383 669b5ffa 2018-10-07 stsp err = view_set_child(view, blame_view);
3384 669b5ffa 2018-10-07 stsp if (err) {
3385 669b5ffa 2018-10-07 stsp view_close(blame_view);
3388 669b5ffa 2018-10-07 stsp *focus_view = blame_view;
3389 669b5ffa 2018-10-07 stsp view->child_focussed = 1;
3391 669b5ffa 2018-10-07 stsp *new_view = blame_view;
3394 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
3395 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines)
3396 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
3402 ffd1d5e5 2018-06-23 stsp return err;
3405 ffd1d5e5 2018-06-23 stsp __dead static void
3406 ffd1d5e5 2018-06-23 stsp usage_tree(void)
3409 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
3410 ffd1d5e5 2018-06-23 stsp getprogname());
3414 ffd1d5e5 2018-06-23 stsp static const struct got_error *
3415 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
3417 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
3418 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
3419 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
3420 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
3421 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
3422 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
3423 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
3425 5221c383 2018-08-01 stsp struct tog_view *view;
3427 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
3428 ad242220 2018-09-08 stsp if (pledge("stdio rpath wpath cpath flock proc tty exec sendfd", NULL)
3430 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
3433 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
3434 ffd1d5e5 2018-06-23 stsp switch (ch) {
3436 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
3440 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
3444 ffd1d5e5 2018-06-23 stsp argc -= optind;
3445 ffd1d5e5 2018-06-23 stsp argv += optind;
3447 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
3448 ffd1d5e5 2018-06-23 stsp repo_path = getcwd(NULL, 0);
3449 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3450 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3451 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
3452 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
3453 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
3454 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
3456 ffd1d5e5 2018-06-23 stsp usage_log();
3458 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
3459 ffd1d5e5 2018-06-23 stsp free(repo_path);
3460 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3461 ffd1d5e5 2018-06-23 stsp return error;
3463 ffd1d5e5 2018-06-23 stsp if (commit_id_arg == NULL) {
3464 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
3465 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3466 ffd1d5e5 2018-06-23 stsp goto done;
3468 ffd1d5e5 2018-06-23 stsp struct got_object *obj;
3469 ffd1d5e5 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_arg);
3470 ffd1d5e5 2018-06-23 stsp if (error == NULL) {
3471 6402fb3c 2018-09-15 stsp commit_id = got_object_id_dup(got_object_get_id(obj));
3472 ffd1d5e5 2018-06-23 stsp if (commit_id == NULL)
3473 ffd1d5e5 2018-06-23 stsp error = got_error_from_errno();
3476 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3477 ffd1d5e5 2018-06-23 stsp goto done;
3479 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
3480 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3481 ffd1d5e5 2018-06-23 stsp goto done;
3483 45d799e2 2018-12-23 stsp error = got_object_open_as_tree(&tree, repo,
3484 45d799e2 2018-12-23 stsp got_object_commit_get_tree_id(commit));
3485 ffd1d5e5 2018-06-23 stsp if (error != NULL)
3486 ffd1d5e5 2018-06-23 stsp goto done;
3488 0cf4efb1 2018-09-29 stsp view = view_open(0, 0, 0, 0, TOG_VIEW_TREE);
3489 5221c383 2018-08-01 stsp if (view == NULL) {
3490 5221c383 2018-08-01 stsp error = got_error_from_errno();
3491 5221c383 2018-08-01 stsp goto done;
3493 ad80ab7b 2018-08-04 stsp error = open_tree_view(view, tree, commit_id, repo);
3494 ad80ab7b 2018-08-04 stsp if (error)
3495 ad80ab7b 2018-08-04 stsp goto done;
3496 e5a0f69f 2018-08-18 stsp error = view_loop(view);
3498 ffd1d5e5 2018-06-23 stsp free(commit_id);
3499 ffd1d5e5 2018-06-23 stsp if (commit)
3500 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
3502 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
3504 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
3505 ffd1d5e5 2018-06-23 stsp return error;
3508 5c5136c5 2018-05-20 stsp static void
3509 9f7d7167 2018-04-29 stsp init_curses(void)
3511 9f7d7167 2018-04-29 stsp initscr();
3513 fd823528 2018-10-22 stsp halfdelay(1); /* Do fast refresh while initial view is loading. */
3516 9f7d7167 2018-04-29 stsp intrflush(stdscr, FALSE);
3517 9f7d7167 2018-04-29 stsp keypad(stdscr, TRUE);
3518 1f475ad8 2018-05-10 stsp curs_set(0);
3519 25791caa 2018-10-24 stsp signal(SIGWINCH, tog_sigwinch);
3522 4ed7e80c 2018-05-20 stsp __dead static void
3523 9f7d7167 2018-04-29 stsp usage(void)
3527 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
3528 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
3529 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3530 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
3531 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
3536 c2301be8 2018-04-30 stsp static char **
3537 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
3539 c2301be8 2018-04-30 stsp char **argv;
3540 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
3542 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
3543 c2301be8 2018-04-30 stsp if (argv == NULL)
3544 c2301be8 2018-04-30 stsp err(1, "calloc");
3545 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
3546 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
3547 c2301be8 2018-04-30 stsp err(1, "calloc");
3548 c2301be8 2018-04-30 stsp if (arg1) {
3549 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
3550 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
3551 c2301be8 2018-04-30 stsp err(1, "calloc");
3554 c2301be8 2018-04-30 stsp return argv;
3558 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
3560 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
3561 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
3562 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
3563 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
3565 9f7d7167 2018-04-29 stsp setlocale(LC_ALL, "");
3567 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
3568 9f7d7167 2018-04-29 stsp switch (ch) {
3570 9f7d7167 2018-04-29 stsp hflag = 1;
3574 9f7d7167 2018-04-29 stsp /* NOTREACHED */
3578 9f7d7167 2018-04-29 stsp argc -= optind;
3579 9f7d7167 2018-04-29 stsp argv += optind;
3580 9f7d7167 2018-04-29 stsp optind = 0;
3581 c2301be8 2018-04-30 stsp optreset = 1;
3583 c2301be8 2018-04-30 stsp if (argc == 0) {
3584 f29d3e89 2018-06-23 stsp if (hflag)
3586 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
3587 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
3588 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
3593 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
3594 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
3595 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
3596 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
3597 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
3598 9f7d7167 2018-04-29 stsp if (hflag)
3599 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
3603 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
3604 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
3605 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
3606 c2301be8 2018-04-30 stsp if (repo_path) {
3607 c2301be8 2018-04-30 stsp struct got_repository *repo;
3608 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
3609 c2301be8 2018-04-30 stsp if (error == NULL)
3610 c2301be8 2018-04-30 stsp got_repo_close(repo);
3612 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
3613 c2301be8 2018-04-30 stsp if (error) {
3614 f29d3e89 2018-06-23 stsp if (hflag) {
3615 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
3616 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
3620 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
3621 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
3622 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
3623 ad7de8d9 2018-04-30 stsp free(repo_path);
3626 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
3627 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
3629 c2301be8 2018-04-30 stsp free(repo_path);
3633 5c5136c5 2018-05-20 stsp init_curses();
3635 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
3636 9f7d7167 2018-04-29 stsp if (error)
3637 9f7d7167 2018-04-29 stsp goto done;
3640 c2301be8 2018-04-30 stsp free(cmd_argv);
3641 9f7d7167 2018-04-29 stsp if (error)
3642 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
