2 9f7d7167 2018-04-29 stsp * Copyright (c) 2018 Stefan Sperling <stsp@openbsd.org>
4 9f7d7167 2018-04-29 stsp * Permission to use, copy, modify, and distribute this software for any
5 9f7d7167 2018-04-29 stsp * purpose with or without fee is hereby granted, provided that the above
6 9f7d7167 2018-04-29 stsp * copyright notice and this permission notice appear in all copies.
8 9f7d7167 2018-04-29 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 9f7d7167 2018-04-29 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 9f7d7167 2018-04-29 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 9f7d7167 2018-04-29 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 9f7d7167 2018-04-29 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 9f7d7167 2018-04-29 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 9f7d7167 2018-04-29 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 80ddbec8 2018-04-29 stsp #include <sys/queue.h>
18 ffd1d5e5 2018-06-23 stsp #include <sys/stat.h>
20 31120ada 2018-04-30 stsp #include <errno.h>
21 61e69b96 2018-05-20 stsp #define _XOPEN_SOURCE_EXTENDED
22 9f7d7167 2018-04-29 stsp #include <curses.h>
23 61e69b96 2018-05-20 stsp #undef _XOPEN_SOURCE_EXTENDED
24 9f7d7167 2018-04-29 stsp #include <panel.h>
25 9f7d7167 2018-04-29 stsp #include <locale.h>
26 9f7d7167 2018-04-29 stsp #include <stdlib.h>
27 26ed57b2 2018-05-19 stsp #include <stdio.h>
28 9f7d7167 2018-04-29 stsp #include <getopt.h>
29 9f7d7167 2018-04-29 stsp #include <string.h>
30 9f7d7167 2018-04-29 stsp #include <err.h>
31 80ddbec8 2018-04-29 stsp #include <unistd.h>
32 26ed57b2 2018-05-19 stsp #include <util.h>
33 26ed57b2 2018-05-19 stsp #include <limits.h>
34 61e69b96 2018-05-20 stsp #include <wchar.h>
35 788c352e 2018-06-16 stsp #include <time.h>
36 84451b3e 2018-07-10 stsp #include <pthread.h>
38 9f7d7167 2018-04-29 stsp #include "got_error.h"
39 80ddbec8 2018-04-29 stsp #include "got_object.h"
40 80ddbec8 2018-04-29 stsp #include "got_reference.h"
41 80ddbec8 2018-04-29 stsp #include "got_repository.h"
42 80ddbec8 2018-04-29 stsp #include "got_diff.h"
43 511a516b 2018-05-19 stsp #include "got_opentemp.h"
44 9ba79e04 2018-06-11 stsp #include "got_commit_graph.h"
45 00dfcb92 2018-06-11 stsp #include "got_utf8.h"
46 a70480e0 2018-06-23 stsp #include "got_blame.h"
49 881b2d3e 2018-04-30 stsp #define MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
52 9f7d7167 2018-04-29 stsp #ifndef nitems
53 9f7d7167 2018-04-29 stsp #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
56 9f7d7167 2018-04-29 stsp struct tog_cmd {
57 c2301be8 2018-04-30 stsp const char *name;
58 9f7d7167 2018-04-29 stsp const struct got_error *(*cmd_main)(int, char *[]);
59 9f7d7167 2018-04-29 stsp void (*cmd_usage)(void);
60 c2301be8 2018-04-30 stsp const char *descr;
63 4ed7e80c 2018-05-20 stsp __dead static void usage(void);
64 4ed7e80c 2018-05-20 stsp __dead static void usage_log(void);
65 4ed7e80c 2018-05-20 stsp __dead static void usage_diff(void);
66 4ed7e80c 2018-05-20 stsp __dead static void usage_blame(void);
67 ffd1d5e5 2018-06-23 stsp __dead static void usage_tree(void);
69 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_log(int, char *[]);
70 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_diff(int, char *[]);
71 4ed7e80c 2018-05-20 stsp static const struct got_error* cmd_blame(int, char *[]);
72 ffd1d5e5 2018-06-23 stsp static const struct got_error* cmd_tree(int, char *[]);
74 4ed7e80c 2018-05-20 stsp static struct tog_cmd tog_commands[] = {
75 cbb6b58a 2018-05-20 stsp { "log", cmd_log, usage_log,
76 9f7d7167 2018-04-29 stsp "show repository history" },
77 cbb6b58a 2018-05-20 stsp { "diff", cmd_diff, usage_diff,
78 9f7d7167 2018-04-29 stsp "compare files and directories" },
79 cbb6b58a 2018-05-20 stsp { "blame", cmd_blame, usage_blame,
80 9f7d7167 2018-04-29 stsp "show line-by-line file history" },
81 ffd1d5e5 2018-06-23 stsp { "tree", cmd_tree, usage_tree,
82 ffd1d5e5 2018-06-23 stsp "browse trees in repository" },
85 d6b05b5b 2018-08-04 stsp enum tog_view_type {
86 d6b05b5b 2018-08-04 stsp TOG_VIEW_DIFF,
87 d6b05b5b 2018-08-04 stsp TOG_VIEW_LOG,
88 ad80ab7b 2018-08-04 stsp TOG_VIEW_BLAME,
89 ad80ab7b 2018-08-04 stsp TOG_VIEW_TREE
92 ad80ab7b 2018-08-04 stsp struct tog_diff_view_state {
94 ad80ab7b 2018-08-04 stsp int first_displayed_line;
95 ad80ab7b 2018-08-04 stsp int last_displayed_line;
99 ba4f502b 2018-08-04 stsp struct commit_queue_entry {
100 ba4f502b 2018-08-04 stsp TAILQ_ENTRY(commit_queue_entry) entry;
101 ba4f502b 2018-08-04 stsp struct got_object_id *id;
102 ba4f502b 2018-08-04 stsp struct got_commit_object *commit;
104 ba4f502b 2018-08-04 stsp TAILQ_HEAD(commit_queue_head, commit_queue_entry);
105 ba4f502b 2018-08-04 stsp struct commit_queue {
106 ba4f502b 2018-08-04 stsp int ncommits;
107 ba4f502b 2018-08-04 stsp struct commit_queue_head head;
110 b01e7d3b 2018-08-04 stsp struct tog_log_view_state {
111 b01e7d3b 2018-08-04 stsp struct got_commit_graph *graph;
112 b01e7d3b 2018-08-04 stsp struct commit_queue commits;
113 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *first_displayed_entry;
114 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *last_displayed_entry;
115 b01e7d3b 2018-08-04 stsp struct commit_queue_entry *selected_entry;
116 b01e7d3b 2018-08-04 stsp int selected;
117 b01e7d3b 2018-08-04 stsp char *in_repo_path;
118 b01e7d3b 2018-08-04 stsp struct got_repository *repo;
121 e9424729 2018-08-04 stsp struct tog_blame_cb_args {
122 e9424729 2018-08-04 stsp pthread_mutex_t *mutex;
123 e9424729 2018-08-04 stsp struct tog_blame_line *lines; /* one per line */
124 e9424729 2018-08-04 stsp int nlines;
126 e9424729 2018-08-04 stsp struct tog_view *view;
127 e9424729 2018-08-04 stsp struct got_object_id *commit_id;
129 e9424729 2018-08-04 stsp const char *path;
130 e9424729 2018-08-04 stsp int *first_displayed_line;
131 e9424729 2018-08-04 stsp int *last_displayed_line;
132 e9424729 2018-08-04 stsp int *selected_line;
137 e9424729 2018-08-04 stsp struct tog_blame_thread_args {
138 e9424729 2018-08-04 stsp const char *path;
139 e9424729 2018-08-04 stsp struct got_repository *repo;
140 e9424729 2018-08-04 stsp struct tog_blame_cb_args *cb_args;
141 e9424729 2018-08-04 stsp int *complete;
144 e9424729 2018-08-04 stsp struct tog_blame {
146 e9424729 2018-08-04 stsp size_t filesize;
147 e9424729 2018-08-04 stsp struct tog_blame_line *lines;
148 e9424729 2018-08-04 stsp size_t nlines;
149 e9424729 2018-08-04 stsp pthread_t thread;
150 e9424729 2018-08-04 stsp struct tog_blame_thread_args thread_args;
151 e9424729 2018-08-04 stsp struct tog_blame_cb_args cb_args;
152 e9424729 2018-08-04 stsp const char *path;
155 7cbe629d 2018-08-04 stsp struct tog_blame_view_state {
156 7cbe629d 2018-08-04 stsp int first_displayed_line;
157 7cbe629d 2018-08-04 stsp int last_displayed_line;
158 7cbe629d 2018-08-04 stsp int selected_line;
159 7cbe629d 2018-08-04 stsp int blame_complete;
162 7cbe629d 2018-08-04 stsp pthread_mutex_t mutex;
163 7cbe629d 2018-08-04 stsp struct got_object_id_queue blamed_commits;
164 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
165 e5a0f69f 2018-08-18 stsp char *path;
166 7cbe629d 2018-08-04 stsp struct got_repository *repo;
167 ad80ab7b 2018-08-04 stsp struct got_object_id *commit_id;
168 e9424729 2018-08-04 stsp struct tog_blame blame;
171 ad80ab7b 2018-08-04 stsp struct tog_parent_tree {
172 ad80ab7b 2018-08-04 stsp TAILQ_ENTRY(tog_parent_tree) entry;
173 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
174 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
175 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
176 ad80ab7b 2018-08-04 stsp int selected;
179 ad80ab7b 2018-08-04 stsp TAILQ_HEAD(tog_parent_trees, tog_parent_tree);
181 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state {
182 ad80ab7b 2018-08-04 stsp char *tree_label;
183 ad80ab7b 2018-08-04 stsp struct got_tree_object *root;
184 ad80ab7b 2018-08-04 stsp struct got_tree_object *tree;
185 ad80ab7b 2018-08-04 stsp const struct got_tree_entries *entries;
186 ad80ab7b 2018-08-04 stsp struct got_tree_entry *first_displayed_entry;
187 ad80ab7b 2018-08-04 stsp struct got_tree_entry *last_displayed_entry;
188 ad80ab7b 2018-08-04 stsp struct got_tree_entry *selected_entry;
189 ad80ab7b 2018-08-04 stsp int nentries, ndisplayed, selected, show_ids;
190 ad80ab7b 2018-08-04 stsp struct tog_parent_trees parents;
191 7cbe629d 2018-08-04 stsp struct got_object_id *commit_id;
192 ad80ab7b 2018-08-04 stsp struct got_repository *repo;
195 cc3c9aac 2018-08-01 stsp struct tog_view {
196 e5a0f69f 2018-08-18 stsp TAILQ_ENTRY(tog_view) entry;
197 26ed57b2 2018-05-19 stsp WINDOW *window;
198 26ed57b2 2018-05-19 stsp PANEL *panel;
199 97ddc146 2018-08-01 stsp int nlines, ncols, begin_y, begin_x;
200 f7d12f7e 2018-08-01 stsp int lines, cols; /* copies of LINES and COLS */
201 6d0fee91 2018-08-01 stsp struct tog_view *parent;
203 5dc9f4bc 2018-08-04 stsp /* type-specific state */
204 d6b05b5b 2018-08-04 stsp enum tog_view_type type;
206 b01e7d3b 2018-08-04 stsp struct tog_diff_view_state diff;
207 b01e7d3b 2018-08-04 stsp struct tog_log_view_state log;
208 7cbe629d 2018-08-04 stsp struct tog_blame_view_state blame;
209 ad80ab7b 2018-08-04 stsp struct tog_tree_view_state tree;
212 e5a0f69f 2018-08-18 stsp const struct got_error *(*show)(struct tog_view *);
213 e5a0f69f 2018-08-18 stsp const struct got_error *(*input)(struct tog_view **,
214 e5a0f69f 2018-08-18 stsp struct tog_view **, struct tog_view *, int);
215 e5a0f69f 2018-08-18 stsp const struct got_error *(*close)(struct tog_view *);
217 e5a0f69f 2018-08-18 stsp TAILQ_HEAD(tog_view_list_head, tog_view);
219 ba4f502b 2018-08-04 stsp static const struct got_error *open_diff_view(struct tog_view *,
220 ba4f502b 2018-08-04 stsp struct got_object *, struct got_object *, struct got_repository *);
221 5dc9f4bc 2018-08-04 stsp static const struct got_error *show_diff_view(struct tog_view *);
222 e5a0f69f 2018-08-18 stsp static const struct got_error *input_diff_view(struct tog_view **,
223 e5a0f69f 2018-08-18 stsp struct tog_view **, struct tog_view *, int);
224 e5a0f69f 2018-08-18 stsp static const struct got_error* close_diff_view(struct tog_view *);
226 ba4f502b 2018-08-04 stsp static const struct got_error *open_log_view(struct tog_view *,
227 ba4f502b 2018-08-04 stsp struct got_object_id *, struct got_repository *, const char *);
228 ba4f502b 2018-08-04 stsp static const struct got_error * show_log_view(struct tog_view *);
229 e5a0f69f 2018-08-18 stsp static const struct got_error *input_log_view(struct tog_view **,
230 e5a0f69f 2018-08-18 stsp struct tog_view **, struct tog_view *, int);
231 e5a0f69f 2018-08-18 stsp static const struct got_error *close_log_view(struct tog_view *);
233 e5a0f69f 2018-08-18 stsp static const struct got_error *open_blame_view(struct tog_view *, char *,
234 5221c383 2018-08-01 stsp struct got_object_id *, struct got_repository *);
235 7cbe629d 2018-08-04 stsp static const struct got_error *show_blame_view(struct tog_view *);
236 e5a0f69f 2018-08-18 stsp static const struct got_error *input_blame_view(struct tog_view **,
237 e5a0f69f 2018-08-18 stsp struct tog_view **, struct tog_view *, int);
238 e5a0f69f 2018-08-18 stsp static const struct got_error *close_blame_view(struct tog_view *);
240 ad80ab7b 2018-08-04 stsp static const struct got_error *open_tree_view(struct tog_view *,
241 4fc679ca 2018-08-04 stsp struct got_tree_object *, struct got_object_id *, struct got_repository *);
242 ad80ab7b 2018-08-04 stsp static const struct got_error *show_tree_view(struct tog_view *);
243 e5a0f69f 2018-08-18 stsp static const struct got_error *input_tree_view(struct tog_view **,
244 e5a0f69f 2018-08-18 stsp struct tog_view **, struct tog_view *, int);
245 e5a0f69f 2018-08-18 stsp static const struct got_error *close_tree_view(struct tog_view *);
247 e5a0f69f 2018-08-18 stsp static const struct got_error *
248 96a765a8 2018-08-04 stsp view_close(struct tog_view *view)
250 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
252 e5a0f69f 2018-08-18 stsp if (view->close)
253 e5a0f69f 2018-08-18 stsp err = view->close(view);
254 ea5e7bb5 2018-08-01 stsp if (view->panel)
255 ea5e7bb5 2018-08-01 stsp del_panel(view->panel);
256 ea5e7bb5 2018-08-01 stsp if (view->window)
257 ea5e7bb5 2018-08-01 stsp delwin(view->window);
258 ea5e7bb5 2018-08-01 stsp free(view);
259 e5a0f69f 2018-08-18 stsp return err;
262 ea5e7bb5 2018-08-01 stsp static struct tog_view *
263 b3665f43 2018-08-04 stsp view_open(int nlines, int ncols, int begin_y, int begin_x,
264 d6b05b5b 2018-08-04 stsp struct tog_view *parent, enum tog_view_type type)
266 ad80ab7b 2018-08-04 stsp struct tog_view *view = calloc(1, sizeof(*view));
268 ea5e7bb5 2018-08-01 stsp if (view == NULL)
269 ea5e7bb5 2018-08-01 stsp return NULL;
271 6d0fee91 2018-08-01 stsp view->parent = parent;
272 d6b05b5b 2018-08-04 stsp view->type = type;
273 f7d12f7e 2018-08-01 stsp view->lines = LINES;
274 f7d12f7e 2018-08-01 stsp view->cols = COLS;
275 207b9029 2018-08-01 stsp view->nlines = nlines ? nlines : LINES - begin_y;
276 207b9029 2018-08-01 stsp view->ncols = ncols ? ncols : COLS - begin_x;
277 97ddc146 2018-08-01 stsp view->begin_y = begin_y;
278 97ddc146 2018-08-01 stsp view->begin_x = begin_x;
279 842167bf 2018-08-01 stsp view->window = newwin(nlines, ncols, begin_y, begin_x);
280 ea5e7bb5 2018-08-01 stsp if (view->window == NULL) {
281 96a765a8 2018-08-04 stsp view_close(view);
282 ea5e7bb5 2018-08-01 stsp return NULL;
284 ea5e7bb5 2018-08-01 stsp view->panel = new_panel(view->window);
285 ea5e7bb5 2018-08-01 stsp if (view->panel == NULL) {
286 96a765a8 2018-08-04 stsp view_close(view);
287 ea5e7bb5 2018-08-01 stsp return NULL;
290 ea5e7bb5 2018-08-01 stsp keypad(view->window, TRUE);
291 ea5e7bb5 2018-08-01 stsp return view;
294 e5a0f69f 2018-08-18 stsp const struct got_error *
295 6acd1bd1 2018-08-04 stsp view_show(struct tog_view *view)
297 e5a0f69f 2018-08-18 stsp const struct got_error *err;
299 e5a0f69f 2018-08-18 stsp err = view->show(view);
301 e5a0f69f 2018-08-18 stsp return err;
302 cdf1ee82 2018-08-01 stsp show_panel(view->panel);
303 cdf1ee82 2018-08-01 stsp update_panels();
304 e5a0f69f 2018-08-18 stsp doupdate();
306 e5a0f69f 2018-08-18 stsp return err;
309 f7d12f7e 2018-08-01 stsp const struct got_error *
310 f7d12f7e 2018-08-01 stsp view_resize(struct tog_view *view)
312 f7d12f7e 2018-08-01 stsp int nlines, ncols;
314 6d0fee91 2018-08-01 stsp while (view) {
315 6d0fee91 2018-08-01 stsp if (view->lines > LINES)
316 6d0fee91 2018-08-01 stsp nlines = view->nlines - (view->lines - LINES);
318 6d0fee91 2018-08-01 stsp nlines = view->nlines + (LINES - view->lines);
320 6d0fee91 2018-08-01 stsp if (view->cols > COLS)
321 6d0fee91 2018-08-01 stsp ncols = view->ncols - (view->cols - COLS);
323 6d0fee91 2018-08-01 stsp ncols = view->ncols + (COLS - view->cols);
325 6d0fee91 2018-08-01 stsp if (wresize(view->window, nlines, ncols) == ERR)
326 6d0fee91 2018-08-01 stsp return got_error_from_errno();
327 77a567dd 2018-08-01 stsp replace_panel(view->panel, view->window);
329 6d0fee91 2018-08-01 stsp view->nlines = nlines;
330 6d0fee91 2018-08-01 stsp view->ncols = ncols;
331 6d0fee91 2018-08-01 stsp view->lines = LINES;
332 6d0fee91 2018-08-01 stsp view->cols = COLS;
334 6d0fee91 2018-08-01 stsp view = view->parent;
337 f7d12f7e 2018-08-01 stsp return NULL;
340 e5a0f69f 2018-08-18 stsp static const struct got_error *
341 48fcc512 2018-08-18 stsp view_input(struct tog_view **new, struct tog_view **dead,
342 e4197bf9 2018-08-18 stsp struct tog_view **focus, int *done, struct tog_view *view,
343 48fcc512 2018-08-18 stsp struct tog_view_list_head *views)
345 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
346 48fcc512 2018-08-18 stsp struct tog_view *next;
349 e5a0f69f 2018-08-18 stsp *new = NULL;
350 e5a0f69f 2018-08-18 stsp *dead = NULL;
352 e5a0f69f 2018-08-18 stsp nodelay(stdscr, FALSE);
353 e5a0f69f 2018-08-18 stsp ch = wgetch(view->window);
354 e5a0f69f 2018-08-18 stsp nodelay(stdscr, TRUE);
355 e5a0f69f 2018-08-18 stsp switch (ch) {
359 48fcc512 2018-08-18 stsp next = TAILQ_NEXT(view, entry);
361 48fcc512 2018-08-18 stsp *focus = next;
363 48fcc512 2018-08-18 stsp *focus = TAILQ_FIRST(views);
366 e5a0f69f 2018-08-18 stsp err = view->input(new, dead, view, ch);
367 e5a0f69f 2018-08-18 stsp *dead = view;
372 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
373 e5a0f69f 2018-08-18 stsp err = view_resize(view);
375 e5a0f69f 2018-08-18 stsp return err;
376 e5a0f69f 2018-08-18 stsp err = view->input(new, dead, view, ch);
379 e5a0f69f 2018-08-18 stsp err = view->input(new, dead, view, ch);
383 e5a0f69f 2018-08-18 stsp return err;
386 e5a0f69f 2018-08-18 stsp static const struct got_error *
387 e5a0f69f 2018-08-18 stsp view_loop(struct tog_view *view)
389 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
390 e5a0f69f 2018-08-18 stsp struct tog_view_list_head views;
391 e5a0f69f 2018-08-18 stsp struct tog_view *new_view, *dead_view;
392 e4197bf9 2018-08-18 stsp int done = 0;
394 e5a0f69f 2018-08-18 stsp TAILQ_INIT(&views);
395 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&views, view, entry);
397 e4197bf9 2018-08-18 stsp while (!TAILQ_EMPTY(&views) && !done) {
398 e5a0f69f 2018-08-18 stsp err = view_show(view);
401 e4197bf9 2018-08-18 stsp err = view_input(&new_view, &dead_view, &view, &done,
402 e4197bf9 2018-08-18 stsp view, &views);
405 e5a0f69f 2018-08-18 stsp if (new_view) {
406 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_TAIL(&views, new_view, entry);
407 e5a0f69f 2018-08-18 stsp view = new_view;
409 e5a0f69f 2018-08-18 stsp if (dead_view) {
410 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, dead_view, entry);
411 e5a0f69f 2018-08-18 stsp TAILQ_FOREACH(view, &views, entry) {
412 e5a0f69f 2018-08-18 stsp if (view->parent == dead_view)
413 e5a0f69f 2018-08-18 stsp view->parent = NULL;
415 e5a0f69f 2018-08-18 stsp if (dead_view->parent)
416 e5a0f69f 2018-08-18 stsp view = dead_view->parent;
418 e5a0f69f 2018-08-18 stsp view = TAILQ_LAST(&views, tog_view_list_head);
419 e5a0f69f 2018-08-18 stsp err = view_close(dead_view);
425 e5a0f69f 2018-08-18 stsp while (!TAILQ_EMPTY(&views)) {
426 e5a0f69f 2018-08-18 stsp view = TAILQ_FIRST(&views);
427 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&views, view, entry);
428 e5a0f69f 2018-08-18 stsp view_close(view);
430 e5a0f69f 2018-08-18 stsp return err;
433 4ed7e80c 2018-05-20 stsp __dead static void
434 9f7d7167 2018-04-29 stsp usage_log(void)
437 c70c5802 2018-08-01 stsp fprintf(stderr,
438 c70c5802 2018-08-01 stsp "usage: %s log [-c commit] [-r repository-path] [path]\n",
439 9f7d7167 2018-04-29 stsp getprogname());
443 963b370f 2018-05-20 stsp /* Create newly allocated wide-character string equivalent to a byte string. */
444 80ddbec8 2018-04-29 stsp static const struct got_error *
445 963b370f 2018-05-20 stsp mbs2ws(wchar_t **ws, size_t *wlen, const char *s)
447 00dfcb92 2018-06-11 stsp char *vis = NULL;
448 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
450 963b370f 2018-05-20 stsp *ws = NULL;
451 963b370f 2018-05-20 stsp *wlen = mbstowcs(NULL, s, 0);
452 00dfcb92 2018-06-11 stsp if (*wlen == (size_t)-1) {
453 00dfcb92 2018-06-11 stsp int vislen;
454 00dfcb92 2018-06-11 stsp if (errno != EILSEQ)
455 00dfcb92 2018-06-11 stsp return got_error_from_errno();
457 00dfcb92 2018-06-11 stsp /* byte string invalid in current encoding; try to "fix" it */
458 00dfcb92 2018-06-11 stsp err = got_mbsavis(&vis, &vislen, s);
460 00dfcb92 2018-06-11 stsp return err;
461 00dfcb92 2018-06-11 stsp *wlen = mbstowcs(NULL, vis, 0);
462 a7f50699 2018-06-11 stsp if (*wlen == (size_t)-1) {
463 a7f50699 2018-06-11 stsp err = got_error_from_errno(); /* give up */
468 963b370f 2018-05-20 stsp *ws = calloc(*wlen + 1, sizeof(*ws));
469 a7f50699 2018-06-11 stsp if (*ws == NULL) {
470 a7f50699 2018-06-11 stsp err = got_error_from_errno();
474 00dfcb92 2018-06-11 stsp if (mbstowcs(*ws, vis ? vis : s, *wlen) != *wlen)
475 963b370f 2018-05-20 stsp err = got_error_from_errno();
480 963b370f 2018-05-20 stsp *ws = NULL;
483 963b370f 2018-05-20 stsp return err;
486 963b370f 2018-05-20 stsp /* Format a line for display, ensuring that it won't overflow a width limit. */
487 963b370f 2018-05-20 stsp static const struct got_error *
488 ffd1d5e5 2018-06-23 stsp format_line(wchar_t **wlinep, int *widthp, const char *line, int wlimit)
490 963b370f 2018-05-20 stsp const struct got_error *err = NULL;
491 963b370f 2018-05-20 stsp int cols = 0;
492 963b370f 2018-05-20 stsp wchar_t *wline = NULL;
493 963b370f 2018-05-20 stsp size_t wlen;
496 963b370f 2018-05-20 stsp *wlinep = NULL;
497 b700b5d6 2018-07-10 stsp *widthp = 0;
499 963b370f 2018-05-20 stsp err = mbs2ws(&wline, &wlen, line);
501 963b370f 2018-05-20 stsp return err;
504 b700b5d6 2018-07-10 stsp while (i < wlen && cols < wlimit) {
505 963b370f 2018-05-20 stsp int width = wcwidth(wline[i]);
506 963b370f 2018-05-20 stsp switch (width) {
512 b700b5d6 2018-07-10 stsp if (cols + width <= wlimit) {
513 b700b5d6 2018-07-10 stsp cols += width;
518 963b370f 2018-05-20 stsp if (wline[i] == L'\t')
519 b700b5d6 2018-07-10 stsp cols += TABSIZE - ((cols + 1) % TABSIZE);
523 963b370f 2018-05-20 stsp err = got_error_from_errno();
527 963b370f 2018-05-20 stsp wline[i] = L'\0';
528 b700b5d6 2018-07-10 stsp if (widthp)
529 b700b5d6 2018-07-10 stsp *widthp = cols;
532 963b370f 2018-05-20 stsp free(wline);
534 963b370f 2018-05-20 stsp *wlinep = wline;
535 963b370f 2018-05-20 stsp return err;
538 963b370f 2018-05-20 stsp static const struct got_error *
539 2814baeb 2018-08-01 stsp draw_commit(struct tog_view *view, struct got_commit_object *commit,
540 2814baeb 2018-08-01 stsp struct got_object_id *id)
542 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
543 b39d25c7 2018-07-10 stsp char datebuf[10]; /* YY-MM-DD + SPACE + NUL */
544 80ddbec8 2018-04-29 stsp char *logmsg0 = NULL, *logmsg = NULL;
545 6d9fbc00 2018-04-29 stsp char *author0 = NULL, *author = NULL;
546 bb737323 2018-05-20 stsp wchar_t *wlogmsg = NULL, *wauthor = NULL;
547 bb737323 2018-05-20 stsp int author_width, logmsg_width;
548 6d9fbc00 2018-04-29 stsp char *newline, *smallerthan;
549 80ddbec8 2018-04-29 stsp char *line = NULL;
550 bb737323 2018-05-20 stsp int col, limit;
551 b39d25c7 2018-07-10 stsp static const size_t date_display_cols = 9;
552 bb737323 2018-05-20 stsp static const size_t author_display_cols = 16;
553 f7d12f7e 2018-08-01 stsp const int avail = view->ncols;
555 c70c5802 2018-08-01 stsp if (strftime(datebuf, sizeof(datebuf), "%g/%m/%d ",
556 c70c5802 2018-08-01 stsp &commit->tm_committer) >= sizeof(datebuf))
557 b39d25c7 2018-07-10 stsp return got_error(GOT_ERR_NO_SPACE);
559 b39d25c7 2018-07-10 stsp if (avail < date_display_cols)
560 b39d25c7 2018-07-10 stsp limit = MIN(sizeof(datebuf) - 1, avail);
562 b39d25c7 2018-07-10 stsp limit = MIN(date_display_cols, sizeof(datebuf) - 1);
563 2814baeb 2018-08-01 stsp waddnstr(view->window, datebuf, limit);
564 b39d25c7 2018-07-10 stsp col = limit + 1;
565 b39d25c7 2018-07-10 stsp if (col > avail)
568 6d9fbc00 2018-04-29 stsp author0 = strdup(commit->author);
569 6d9fbc00 2018-04-29 stsp if (author0 == NULL) {
570 80ddbec8 2018-04-29 stsp err = got_error_from_errno();
573 6d9fbc00 2018-04-29 stsp author = author0;
574 6d9fbc00 2018-04-29 stsp smallerthan = strchr(author, '<');
575 6d9fbc00 2018-04-29 stsp if (smallerthan)
576 6d9fbc00 2018-04-29 stsp *smallerthan = '\0';
578 6d9fbc00 2018-04-29 stsp char *at = strchr(author, '@');
580 6d9fbc00 2018-04-29 stsp *at = '\0';
582 b39d25c7 2018-07-10 stsp limit = avail - col;
583 bb737323 2018-05-20 stsp err = format_line(&wauthor, &author_width, author, limit);
586 2814baeb 2018-08-01 stsp waddwstr(view->window, wauthor);
587 bb737323 2018-05-20 stsp col += author_width;
588 9c2eaf34 2018-05-20 stsp while (col <= avail && author_width < author_display_cols + 1) {
589 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
591 bb737323 2018-05-20 stsp author_width++;
593 9c2eaf34 2018-05-20 stsp if (col > avail)
596 bb737323 2018-05-20 stsp logmsg0 = strdup(commit->logmsg);
597 bb737323 2018-05-20 stsp if (logmsg0 == NULL) {
598 6d9fbc00 2018-04-29 stsp err = got_error_from_errno();
601 bb737323 2018-05-20 stsp logmsg = logmsg0;
602 bb737323 2018-05-20 stsp while (*logmsg == '\n')
604 bb737323 2018-05-20 stsp newline = strchr(logmsg, '\n');
605 bb737323 2018-05-20 stsp if (newline)
606 bb737323 2018-05-20 stsp *newline = '\0';
607 bb737323 2018-05-20 stsp limit = avail - col;
608 bb737323 2018-05-20 stsp err = format_line(&wlogmsg, &logmsg_width, logmsg, limit);
611 2814baeb 2018-08-01 stsp waddwstr(view->window, wlogmsg);
612 bb737323 2018-05-20 stsp col += logmsg_width;
613 bb737323 2018-05-20 stsp while (col <= avail) {
614 2814baeb 2018-08-01 stsp waddch(view->window, ' ');
618 80ddbec8 2018-04-29 stsp free(logmsg0);
619 bb737323 2018-05-20 stsp free(wlogmsg);
620 6d9fbc00 2018-04-29 stsp free(author0);
621 bb737323 2018-05-20 stsp free(wauthor);
622 80ddbec8 2018-04-29 stsp free(line);
623 80ddbec8 2018-04-29 stsp return err;
626 899d86c2 2018-05-10 stsp static struct commit_queue_entry *
627 899d86c2 2018-05-10 stsp alloc_commit_queue_entry(struct got_commit_object *commit,
628 899d86c2 2018-05-10 stsp struct got_object_id *id)
630 80ddbec8 2018-04-29 stsp struct commit_queue_entry *entry;
632 80ddbec8 2018-04-29 stsp entry = calloc(1, sizeof(*entry));
633 80ddbec8 2018-04-29 stsp if (entry == NULL)
634 899d86c2 2018-05-10 stsp return NULL;
636 899d86c2 2018-05-10 stsp entry->id = id;
637 99db9666 2018-05-07 stsp entry->commit = commit;
638 899d86c2 2018-05-10 stsp return entry;
641 99db9666 2018-05-07 stsp static void
642 99db9666 2018-05-07 stsp pop_commit(struct commit_queue *commits)
644 99db9666 2018-05-07 stsp struct commit_queue_entry *entry;
646 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
647 ecb28ae0 2018-07-16 stsp TAILQ_REMOVE(&commits->head, entry, entry);
648 99db9666 2018-05-07 stsp got_object_commit_close(entry->commit);
649 ecb28ae0 2018-07-16 stsp commits->ncommits--;
650 9ba79e04 2018-06-11 stsp /* Don't free entry->id! It is owned by the commit graph. */
651 99db9666 2018-05-07 stsp free(entry);
654 99db9666 2018-05-07 stsp static void
655 99db9666 2018-05-07 stsp free_commits(struct commit_queue *commits)
657 ecb28ae0 2018-07-16 stsp while (!TAILQ_EMPTY(&commits->head))
658 99db9666 2018-05-07 stsp pop_commit(commits);
661 c4972b91 2018-05-07 stsp static const struct got_error *
662 9ba79e04 2018-06-11 stsp queue_commits(struct got_commit_graph *graph, struct commit_queue *commits,
663 ecb28ae0 2018-07-16 stsp struct got_object_id *start_id, int minqueue, int init,
664 ecb28ae0 2018-07-16 stsp struct got_repository *repo, const char *path)
666 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
667 899d86c2 2018-05-10 stsp struct got_object_id *id;
668 9ba79e04 2018-06-11 stsp struct commit_queue_entry *entry;
669 ecb28ae0 2018-07-16 stsp int nfetched, nqueued = 0, found_obj = 0;
670 c8f60bff 2018-07-23 stsp int is_root_path = strcmp(path, "/") == 0;
672 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_start(graph, start_id);
674 c4972b91 2018-05-07 stsp return err;
676 ecb28ae0 2018-07-16 stsp entry = TAILQ_LAST(&commits->head, commit_queue_head);
677 9ba79e04 2018-06-11 stsp if (entry && got_object_id_cmp(entry->id, start_id) == 0) {
678 9ba79e04 2018-06-11 stsp int nfetched;
680 9ba79e04 2018-06-11 stsp /* Start ID's commit is already on the queue; skip over it. */
681 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
682 9ba79e04 2018-06-11 stsp if (err && err->code != GOT_ERR_ITER_NEED_MORE)
683 9ba79e04 2018-06-11 stsp return err;
685 9ba79e04 2018-06-11 stsp err = got_commit_graph_fetch_commits(&nfetched, graph, 1, repo);
687 9ba79e04 2018-06-11 stsp return err;
690 9ba79e04 2018-06-11 stsp while (1) {
691 9ba79e04 2018-06-11 stsp struct got_commit_object *commit;
693 9ba79e04 2018-06-11 stsp err = got_commit_graph_iter_next(&id, graph);
695 ecb28ae0 2018-07-16 stsp if (err->code != GOT_ERR_ITER_NEED_MORE)
697 ecb28ae0 2018-07-16 stsp if (nqueued >= minqueue) {
698 9ba79e04 2018-06-11 stsp err = NULL;
701 ecb28ae0 2018-07-16 stsp err = got_commit_graph_fetch_commits(&nfetched,
702 ecb28ae0 2018-07-16 stsp graph, 1, repo);
704 ecb28ae0 2018-07-16 stsp return err;
707 ecb28ae0 2018-07-16 stsp if (id == NULL)
710 9ba79e04 2018-06-11 stsp err = got_object_open_as_commit(&commit, repo, id);
714 c8f60bff 2018-07-23 stsp if (!is_root_path) {
715 ecb28ae0 2018-07-16 stsp struct got_object *obj;
716 ecb28ae0 2018-07-16 stsp struct got_object_qid *pid;
717 ecb28ae0 2018-07-16 stsp int changed = 0;
719 ecb28ae0 2018-07-16 stsp err = got_object_open_by_path(&obj, repo, id, path);
721 c8f60bff 2018-07-23 stsp got_object_commit_close(commit);
722 ecb28ae0 2018-07-16 stsp if (err->code == GOT_ERR_NO_OBJ &&
723 ecb28ae0 2018-07-16 stsp (found_obj || !init)) {
724 ecb28ae0 2018-07-16 stsp /* History stops here. */
725 ecb28ae0 2018-07-16 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
729 ecb28ae0 2018-07-16 stsp found_obj = 1;
731 ecb28ae0 2018-07-16 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
732 ecb28ae0 2018-07-16 stsp if (pid != NULL) {
733 ecb28ae0 2018-07-16 stsp struct got_object *pobj;
734 ecb28ae0 2018-07-16 stsp err = got_object_open_by_path(&pobj, repo,
735 ecb28ae0 2018-07-16 stsp pid->id, path);
737 ecb28ae0 2018-07-16 stsp if (err->code != GOT_ERR_NO_OBJ) {
738 ecb28ae0 2018-07-16 stsp got_object_close(obj);
739 c8f60bff 2018-07-23 stsp got_object_commit_close(commit);
742 ecb28ae0 2018-07-16 stsp err = NULL;
743 ecb28ae0 2018-07-16 stsp changed = 1;
745 c2f16475 2018-07-23 stsp struct got_object_id *id, *pid;
746 c2f16475 2018-07-23 stsp id = got_object_get_id(obj);
747 c2f16475 2018-07-23 stsp if (id == NULL) {
748 c2f16475 2018-07-23 stsp err = got_error_from_errno();
749 c8f60bff 2018-07-23 stsp got_object_close(obj);
750 c8f60bff 2018-07-23 stsp got_object_close(pobj);
753 c2f16475 2018-07-23 stsp pid = got_object_get_id(pobj);
754 c2f16475 2018-07-23 stsp if (pid == NULL) {
755 c2f16475 2018-07-23 stsp err = got_error_from_errno();
757 c8f60bff 2018-07-23 stsp got_object_close(obj);
758 c8f60bff 2018-07-23 stsp got_object_close(pobj);
762 c2f16475 2018-07-23 stsp (got_object_id_cmp(id, pid) != 0);
763 ecb28ae0 2018-07-16 stsp got_object_close(pobj);
768 c8f60bff 2018-07-23 stsp got_object_close(obj);
769 ecb28ae0 2018-07-16 stsp if (!changed) {
770 ecb28ae0 2018-07-16 stsp got_object_commit_close(commit);
775 9ba79e04 2018-06-11 stsp entry = alloc_commit_queue_entry(commit, id);
776 9ba79e04 2018-06-11 stsp if (entry == NULL) {
777 9ba79e04 2018-06-11 stsp err = got_error_from_errno();
780 ecb28ae0 2018-07-16 stsp TAILQ_INSERT_TAIL(&commits->head, entry, entry);
782 ecb28ae0 2018-07-16 stsp commits->ncommits++;
785 9ba79e04 2018-06-11 stsp return err;
788 99db9666 2018-05-07 stsp static const struct got_error *
789 9ba79e04 2018-06-11 stsp fetch_next_commit(struct commit_queue_entry **pentry,
790 9ba79e04 2018-06-11 stsp struct commit_queue_entry *entry, struct commit_queue *commits,
791 ecb28ae0 2018-07-16 stsp struct got_commit_graph *graph, struct got_repository *repo,
792 ecb28ae0 2018-07-16 stsp const char *path)
794 899d86c2 2018-05-10 stsp const struct got_error *err = NULL;
796 9ba79e04 2018-06-11 stsp *pentry = NULL;
798 ecb28ae0 2018-07-16 stsp err = queue_commits(graph, commits, entry->id, 1, 0, repo, path);
800 9ba79e04 2018-06-11 stsp return err;
802 9ba79e04 2018-06-11 stsp /* Next entry to display should now be available. */
803 9ba79e04 2018-06-11 stsp *pentry = TAILQ_NEXT(entry, entry);
804 9ba79e04 2018-06-11 stsp if (*pentry == NULL)
805 9ba79e04 2018-06-11 stsp return got_error(GOT_ERR_NO_OBJ);
807 9ba79e04 2018-06-11 stsp return NULL;
810 899d86c2 2018-05-10 stsp static const struct got_error *
811 9ba79e04 2018-06-11 stsp get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
813 9ba79e04 2018-06-11 stsp const struct got_error *err = NULL;
814 9ba79e04 2018-06-11 stsp struct got_reference *head_ref;
816 9ba79e04 2018-06-11 stsp *head_id = NULL;
818 9ba79e04 2018-06-11 stsp err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
820 99db9666 2018-05-07 stsp return err;
822 9ba79e04 2018-06-11 stsp err = got_ref_resolve(head_id, repo, head_ref);
823 9ba79e04 2018-06-11 stsp got_ref_close(head_ref);
825 9ba79e04 2018-06-11 stsp *head_id = NULL;
826 99db9666 2018-05-07 stsp return err;
829 9ba79e04 2018-06-11 stsp return NULL;
832 0553a4e3 2018-04-30 stsp static const struct got_error *
833 2814baeb 2018-08-01 stsp draw_commits(struct tog_view *view, struct commit_queue_entry **last,
834 ecb28ae0 2018-07-16 stsp struct commit_queue_entry **selected, struct commit_queue_entry *first,
835 a7f40148 2018-07-18 stsp struct commit_queue *commits, int selected_idx, int limit,
836 a7f40148 2018-07-18 stsp struct got_commit_graph *graph, struct got_repository *repo,
837 a7f40148 2018-07-18 stsp const char *path)
839 0553a4e3 2018-04-30 stsp const struct got_error *err = NULL;
840 0553a4e3 2018-04-30 stsp struct commit_queue_entry *entry;
841 ecb28ae0 2018-07-16 stsp int ncommits, width;
842 867c6645 2018-07-10 stsp char *id_str, *header;
843 ecb28ae0 2018-07-16 stsp wchar_t *wline;
845 e0d42f60 2018-07-22 stsp entry = first;
846 e0d42f60 2018-07-22 stsp ncommits = 0;
847 e0d42f60 2018-07-22 stsp while (entry) {
848 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx) {
849 e0d42f60 2018-07-22 stsp *selected = entry;
852 e0d42f60 2018-07-22 stsp entry = TAILQ_NEXT(entry, entry);
853 e0d42f60 2018-07-22 stsp ncommits++;
856 867c6645 2018-07-10 stsp err = got_object_id_str(&id_str, (*selected)->id);
858 867c6645 2018-07-10 stsp return err;
860 c3ba6f36 2018-08-01 stsp if (path && strcmp(path, "/") != 0) {
861 ecb28ae0 2018-07-16 stsp if (asprintf(&header, "commit: %s [%s]", id_str, path) == -1) {
862 ecb28ae0 2018-07-16 stsp err = got_error_from_errno();
863 ecb28ae0 2018-07-16 stsp free(id_str);
864 ecb28ae0 2018-07-16 stsp return err;
866 ecb28ae0 2018-07-16 stsp } else if (asprintf(&header, "commit: %s", id_str) == -1) {
867 867c6645 2018-07-10 stsp err = got_error_from_errno();
868 867c6645 2018-07-10 stsp free(id_str);
869 867c6645 2018-07-10 stsp return err;
871 ecb28ae0 2018-07-16 stsp free(id_str);
872 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, header, view->ncols);
874 ecb28ae0 2018-07-16 stsp free(header);
875 ecb28ae0 2018-07-16 stsp return err;
877 ecb28ae0 2018-07-16 stsp free(header);
879 2814baeb 2018-08-01 stsp werase(view->window);
881 2814baeb 2018-08-01 stsp waddwstr(view->window, wline);
882 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
883 2814baeb 2018-08-01 stsp waddch(view->window, '\n');
884 ecb28ae0 2018-07-16 stsp free(wline);
885 ecb28ae0 2018-07-16 stsp if (limit <= 1)
886 ecb28ae0 2018-07-16 stsp return NULL;
888 899d86c2 2018-05-10 stsp entry = first;
889 899d86c2 2018-05-10 stsp *last = first;
890 867c6645 2018-07-10 stsp ncommits = 0;
891 899d86c2 2018-05-10 stsp while (entry) {
892 ecb28ae0 2018-07-16 stsp if (ncommits >= limit - 1)
894 e0d42f60 2018-07-22 stsp if (ncommits == selected_idx)
895 2814baeb 2018-08-01 stsp wstandout(view->window);
896 2814baeb 2018-08-01 stsp err = draw_commit(view, entry->commit, entry->id);
897 cd0acaa7 2018-05-20 stsp if (ncommits == selected_idx)
898 2814baeb 2018-08-01 stsp wstandend(view->window);
901 0553a4e3 2018-04-30 stsp ncommits++;
902 899d86c2 2018-05-10 stsp *last = entry;
903 a7f40148 2018-07-18 stsp if (entry == TAILQ_LAST(&commits->head, commit_queue_head)) {
904 a7f40148 2018-07-18 stsp err = queue_commits(graph, commits, entry->id, 1,
905 a7f40148 2018-07-18 stsp 0, repo, path);
907 a7f40148 2018-07-18 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
908 a7f40148 2018-07-18 stsp return err;
909 a7f40148 2018-07-18 stsp err = NULL;
912 899d86c2 2018-05-10 stsp entry = TAILQ_NEXT(entry, entry);
915 80ddbec8 2018-04-29 stsp update_panels();
917 80ddbec8 2018-04-29 stsp return err;
920 07b55e75 2018-05-10 stsp static void
921 16482c3b 2018-05-20 stsp scroll_up(struct commit_queue_entry **first_displayed_entry, int maxscroll,
922 07b55e75 2018-05-10 stsp struct commit_queue *commits)
924 07b55e75 2018-05-10 stsp struct commit_queue_entry *entry;
925 07b55e75 2018-05-10 stsp int nscrolled = 0;
927 ecb28ae0 2018-07-16 stsp entry = TAILQ_FIRST(&commits->head);
928 07b55e75 2018-05-10 stsp if (*first_displayed_entry == entry)
931 07b55e75 2018-05-10 stsp entry = *first_displayed_entry;
932 16482c3b 2018-05-20 stsp while (entry && nscrolled < maxscroll) {
933 ecb28ae0 2018-07-16 stsp entry = TAILQ_PREV(entry, commit_queue_head, entry);
934 07b55e75 2018-05-10 stsp if (entry) {
935 07b55e75 2018-05-10 stsp *first_displayed_entry = entry;
936 07b55e75 2018-05-10 stsp nscrolled++;
941 aa075928 2018-05-10 stsp static const struct got_error *
942 16482c3b 2018-05-20 stsp scroll_down(struct commit_queue_entry **first_displayed_entry, int maxscroll,
943 aa075928 2018-05-10 stsp struct commit_queue_entry *last_displayed_entry,
944 9ba79e04 2018-06-11 stsp struct commit_queue *commits, struct got_commit_graph *graph,
945 ecb28ae0 2018-07-16 stsp struct got_repository *repo, const char *path)
947 aa075928 2018-05-10 stsp const struct got_error *err = NULL;
948 dd0a52c1 2018-05-20 stsp struct commit_queue_entry *pentry;
949 aa075928 2018-05-10 stsp int nscrolled = 0;
952 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(last_displayed_entry, entry);
953 aa075928 2018-05-10 stsp if (pentry == NULL) {
954 9ba79e04 2018-06-11 stsp err = fetch_next_commit(&pentry, last_displayed_entry,
955 ecb28ae0 2018-07-16 stsp commits, graph, repo, path);
956 9a6bf2a5 2018-05-20 stsp if (err || pentry == NULL)
959 dd0a52c1 2018-05-20 stsp last_displayed_entry = pentry;
961 dd0a52c1 2018-05-20 stsp pentry = TAILQ_NEXT(*first_displayed_entry, entry);
962 dd0a52c1 2018-05-20 stsp if (pentry == NULL)
964 aa075928 2018-05-10 stsp *first_displayed_entry = pentry;
965 16482c3b 2018-05-20 stsp } while (++nscrolled < maxscroll);
967 dd0a52c1 2018-05-20 stsp return err;
970 cd0acaa7 2018-05-20 stsp static const struct got_error *
971 e5a0f69f 2018-08-18 stsp show_commit(struct tog_view **new_view, struct tog_view *parent_view,
972 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *entry, struct got_repository *repo)
974 cd0acaa7 2018-05-20 stsp const struct got_error *err;
975 cd0acaa7 2018-05-20 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
976 9ba79e04 2018-06-11 stsp struct got_object_qid *parent_id;
977 e5a0f69f 2018-08-18 stsp struct tog_view *diff_view;
979 cd0acaa7 2018-05-20 stsp err = got_object_open(&obj2, repo, entry->id);
981 cd0acaa7 2018-05-20 stsp return err;
983 9ba79e04 2018-06-11 stsp parent_id = SIMPLEQ_FIRST(&entry->commit->parent_ids);
984 9ba79e04 2018-06-11 stsp if (parent_id) {
985 9ba79e04 2018-06-11 stsp err = got_object_open(&obj1, repo, parent_id->id);
990 e5a0f69f 2018-08-18 stsp diff_view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_DIFF);
991 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
992 ea5e7bb5 2018-08-01 stsp err = got_error_from_errno();
996 e5a0f69f 2018-08-18 stsp err = open_diff_view(diff_view, obj1, obj2, repo);
997 e5a0f69f 2018-08-18 stsp if (err == NULL)
998 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
1001 cd0acaa7 2018-05-20 stsp got_object_close(obj1);
1003 cd0acaa7 2018-05-20 stsp got_object_close(obj2);
1004 cd0acaa7 2018-05-20 stsp return err;
1007 80ddbec8 2018-04-29 stsp static const struct got_error *
1008 e5a0f69f 2018-08-18 stsp browse_commit(struct tog_view **new_view, struct tog_view *parent_view,
1009 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *entry, struct got_repository *repo)
1011 9343a5fb 2018-06-23 stsp const struct got_error *err = NULL;
1012 9343a5fb 2018-06-23 stsp struct got_tree_object *tree;
1013 e5a0f69f 2018-08-18 stsp struct tog_view *tree_view;
1015 9343a5fb 2018-06-23 stsp err = got_object_open_as_tree(&tree, repo, entry->commit->tree_id);
1017 9343a5fb 2018-06-23 stsp return err;
1019 e5a0f69f 2018-08-18 stsp tree_view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_TREE);
1020 e5a0f69f 2018-08-18 stsp if (tree_view == NULL)
1021 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1023 e5a0f69f 2018-08-18 stsp err = open_tree_view(tree_view, tree, entry->id, repo);
1025 e5a0f69f 2018-08-18 stsp got_object_tree_close(tree);
1027 e5a0f69f 2018-08-18 stsp *new_view = tree_view;
1028 9343a5fb 2018-06-23 stsp return err;
1031 9343a5fb 2018-06-23 stsp static const struct got_error *
1032 ba4f502b 2018-08-04 stsp open_log_view(struct tog_view *view, struct got_object_id *start_id,
1033 04cc582a 2018-08-01 stsp struct got_repository *repo, const char *path)
1035 80ddbec8 2018-04-29 stsp const struct got_error *err = NULL;
1036 9ba79e04 2018-06-11 stsp struct got_object_id *head_id = NULL;
1037 ba4f502b 2018-08-04 stsp int nfetched;
1038 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1040 fb2756b9 2018-08-04 stsp err = got_repo_map_path(&s->in_repo_path, repo, path);
1041 ecb28ae0 2018-07-16 stsp if (err != NULL)
1042 ecb28ae0 2018-07-16 stsp goto done;
1044 9ba79e04 2018-06-11 stsp err = get_head_commit_id(&head_id, repo);
1046 9ba79e04 2018-06-11 stsp return err;
1048 034e3b69 2018-07-22 stsp /* The graph contains all commits. */
1049 fb2756b9 2018-08-04 stsp err = got_commit_graph_open(&s->graph, head_id, 0, repo);
1051 9ba79e04 2018-06-11 stsp goto done;
1052 034e3b69 2018-07-22 stsp /* The commit queue contains a subset of commits filtered by path. */
1053 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->commits.head);
1054 fb2756b9 2018-08-04 stsp s->commits.ncommits = 0;
1056 9ba79e04 2018-06-11 stsp /* Populate commit graph with a sufficient number of commits. */
1057 fb2756b9 2018-08-04 stsp err = got_commit_graph_fetch_commits_up_to(&nfetched, s->graph,
1058 fb2756b9 2018-08-04 stsp start_id, repo);
1060 9ba79e04 2018-06-11 stsp goto done;
1063 9ba79e04 2018-06-11 stsp * Open the initial batch of commits, sorted in commit graph order.
1064 9ba79e04 2018-06-11 stsp * We keep all commits open throughout the lifetime of the log view
1065 9ba79e04 2018-06-11 stsp * in order to avoid having to re-fetch commits from disk while
1066 9ba79e04 2018-06-11 stsp * updating the display.
1068 fb2756b9 2018-08-04 stsp err = queue_commits(s->graph, &s->commits, start_id, view->nlines, 1,
1069 fb2756b9 2018-08-04 stsp repo, s->in_repo_path);
1070 55198a88 2018-07-16 stsp if (err) {
1071 55198a88 2018-07-16 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1072 55198a88 2018-07-16 stsp goto done;
1073 55198a88 2018-07-16 stsp err = NULL;
1076 1bfa490b 2018-08-18 stsp s->first_displayed_entry =
1077 1bfa490b 2018-08-18 stsp TAILQ_FIRST(&s->commits.head);
1078 1bfa490b 2018-08-18 stsp s->selected_entry = s->first_displayed_entry;
1079 fb2756b9 2018-08-04 stsp s->repo = repo;
1081 e5a0f69f 2018-08-18 stsp view->show = show_log_view;
1082 e5a0f69f 2018-08-18 stsp view->input = input_log_view;
1083 e5a0f69f 2018-08-18 stsp view->close = close_log_view;
1085 ba4f502b 2018-08-04 stsp free(head_id);
1086 ba4f502b 2018-08-04 stsp return err;
1089 e5a0f69f 2018-08-18 stsp static const struct got_error *
1090 e5a0f69f 2018-08-18 stsp close_log_view(struct tog_view *view)
1092 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1094 fb2756b9 2018-08-04 stsp if (s->graph)
1095 fb2756b9 2018-08-04 stsp got_commit_graph_close(s->graph);
1096 fb2756b9 2018-08-04 stsp free_commits(&s->commits);
1097 fb2756b9 2018-08-04 stsp free(s->in_repo_path);
1098 e5a0f69f 2018-08-18 stsp return NULL;
1101 ba4f502b 2018-08-04 stsp static const struct got_error *
1102 ba4f502b 2018-08-04 stsp show_log_view(struct tog_view *view)
1104 fb2756b9 2018-08-04 stsp struct tog_log_view_state *s = &view->state.log;
1106 e5a0f69f 2018-08-18 stsp return draw_commits(view, &s->last_displayed_entry,
1107 e5a0f69f 2018-08-18 stsp &s->selected_entry, s->first_displayed_entry,
1108 e5a0f69f 2018-08-18 stsp &s->commits, s->selected, view->nlines, s->graph,
1109 e5a0f69f 2018-08-18 stsp s->repo, s->in_repo_path);
1112 e5a0f69f 2018-08-18 stsp static const struct got_error *
1113 e5a0f69f 2018-08-18 stsp input_log_view(struct tog_view **new_view, struct tog_view **dead_view,
1114 e5a0f69f 2018-08-18 stsp struct tog_view *view, int ch)
1116 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1117 e5a0f69f 2018-08-18 stsp struct tog_log_view_state *s = &view->state.log;
1119 e5a0f69f 2018-08-18 stsp switch (ch) {
1121 e5a0f69f 2018-08-18 stsp case KEY_UP:
1122 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1123 e5a0f69f 2018-08-18 stsp s->selected--;
1124 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
1126 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry, 1,
1127 e5a0f69f 2018-08-18 stsp &s->commits);
1129 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1130 e5a0f69f 2018-08-18 stsp if (TAILQ_FIRST(&s->commits.head) ==
1131 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
1132 e5a0f69f 2018-08-18 stsp s->selected = 0;
1135 e5a0f69f 2018-08-18 stsp scroll_up(&s->first_displayed_entry,
1136 e5a0f69f 2018-08-18 stsp view->nlines, &s->commits);
1139 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1140 e5a0f69f 2018-08-18 stsp if (s->selected < MIN(view->nlines - 2,
1141 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1142 e5a0f69f 2018-08-18 stsp s->selected++;
1145 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry, 1,
1146 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, &s->commits,
1147 e5a0f69f 2018-08-18 stsp s->graph, s->repo, s->in_repo_path);
1148 e5a0f69f 2018-08-18 stsp if (err) {
1149 4d7951a5 2018-08-04 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1151 4d7951a5 2018-08-04 stsp err = NULL;
1154 e5a0f69f 2018-08-18 stsp case KEY_NPAGE: {
1155 e5a0f69f 2018-08-18 stsp struct commit_queue_entry *first;
1156 e5a0f69f 2018-08-18 stsp first = s->first_displayed_entry;
1157 e5a0f69f 2018-08-18 stsp err = scroll_down(&s->first_displayed_entry,
1158 e5a0f69f 2018-08-18 stsp view->nlines, s->last_displayed_entry,
1159 e5a0f69f 2018-08-18 stsp &s->commits, s->graph, s->repo,
1160 e5a0f69f 2018-08-18 stsp s->in_repo_path);
1161 e5a0f69f 2018-08-18 stsp if (err == NULL)
1163 e5a0f69f 2018-08-18 stsp if (err->code != GOT_ERR_ITER_COMPLETED)
1165 e5a0f69f 2018-08-18 stsp if (first == s->first_displayed_entry &&
1166 e5a0f69f 2018-08-18 stsp s->selected < MIN(view->nlines - 2,
1167 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1)) {
1168 e5a0f69f 2018-08-18 stsp /* can't scroll further down */
1169 e5a0f69f 2018-08-18 stsp s->selected = MIN(view->nlines - 2,
1170 e5a0f69f 2018-08-18 stsp s->commits.ncommits - 1);
1172 e5a0f69f 2018-08-18 stsp err = NULL;
1175 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
1176 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines - 2)
1177 e5a0f69f 2018-08-18 stsp s->selected = view->nlines - 2;
1178 e5a0f69f 2018-08-18 stsp if (s->selected > s->commits.ncommits - 1)
1179 e5a0f69f 2018-08-18 stsp s->selected = s->commits.ncommits - 1;
1181 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
1182 e5a0f69f 2018-08-18 stsp case '\r':
1183 e5a0f69f 2018-08-18 stsp err = show_commit(new_view, view, s->selected_entry,
1187 e5a0f69f 2018-08-18 stsp err = browse_commit(new_view, view, s->selected_entry,
1194 80ddbec8 2018-04-29 stsp return err;
1197 4ed7e80c 2018-05-20 stsp static const struct got_error *
1198 9f7d7167 2018-04-29 stsp cmd_log(int argc, char *argv[])
1200 80ddbec8 2018-04-29 stsp const struct got_error *error;
1201 ecb28ae0 2018-07-16 stsp struct got_repository *repo = NULL;
1202 899d86c2 2018-05-10 stsp struct got_object_id *start_id = NULL;
1203 ecb28ae0 2018-07-16 stsp char *path = NULL, *repo_path = NULL, *cwd = NULL;
1204 80ddbec8 2018-04-29 stsp char *start_commit = NULL;
1206 04cc582a 2018-08-01 stsp struct tog_view *view;
1208 80ddbec8 2018-04-29 stsp #ifndef PROFILE
1209 80ddbec8 2018-04-29 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
1210 80ddbec8 2018-04-29 stsp err(1, "pledge");
1213 ecb28ae0 2018-07-16 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
1214 80ddbec8 2018-04-29 stsp switch (ch) {
1216 80ddbec8 2018-04-29 stsp start_commit = optarg;
1219 ecb28ae0 2018-07-16 stsp repo_path = realpath(optarg, NULL);
1220 ecb28ae0 2018-07-16 stsp if (repo_path == NULL)
1221 ecb28ae0 2018-07-16 stsp err(1, "-r option");
1225 80ddbec8 2018-04-29 stsp /* NOTREACHED */
1229 80ddbec8 2018-04-29 stsp argc -= optind;
1230 80ddbec8 2018-04-29 stsp argv += optind;
1232 ecb28ae0 2018-07-16 stsp if (argc == 0)
1233 ecb28ae0 2018-07-16 stsp path = strdup("");
1234 ecb28ae0 2018-07-16 stsp else if (argc == 1)
1235 ecb28ae0 2018-07-16 stsp path = strdup(argv[0]);
1237 80ddbec8 2018-04-29 stsp usage_log();
1238 ecb28ae0 2018-07-16 stsp if (path == NULL)
1239 ecb28ae0 2018-07-16 stsp return got_error_from_errno();
1241 ecb28ae0 2018-07-16 stsp cwd = getcwd(NULL, 0);
1242 ecb28ae0 2018-07-16 stsp if (cwd == NULL) {
1243 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1244 ecb28ae0 2018-07-16 stsp goto done;
1246 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1247 ecb28ae0 2018-07-16 stsp repo_path = strdup(cwd);
1248 ecb28ae0 2018-07-16 stsp if (repo_path == NULL) {
1249 ecb28ae0 2018-07-16 stsp error = got_error_from_errno();
1250 ecb28ae0 2018-07-16 stsp goto done;
1254 80ddbec8 2018-04-29 stsp error = got_repo_open(&repo, repo_path);
1255 80ddbec8 2018-04-29 stsp if (error != NULL)
1256 ecb28ae0 2018-07-16 stsp goto done;
1258 80ddbec8 2018-04-29 stsp if (start_commit == NULL) {
1259 899d86c2 2018-05-10 stsp error = get_head_commit_id(&start_id, repo);
1260 80ddbec8 2018-04-29 stsp if (error != NULL)
1261 ecb28ae0 2018-07-16 stsp goto done;
1263 80ddbec8 2018-04-29 stsp struct got_object *obj;
1264 80ddbec8 2018-04-29 stsp error = got_object_open_by_id_str(&obj, repo, start_commit);
1265 80ddbec8 2018-04-29 stsp if (error == NULL) {
1266 899d86c2 2018-05-10 stsp start_id = got_object_get_id(obj);
1267 899d86c2 2018-05-10 stsp if (start_id == NULL)
1268 80ddbec8 2018-04-29 stsp error = got_error_from_errno();
1269 ecb28ae0 2018-07-16 stsp goto done;
1272 80ddbec8 2018-04-29 stsp if (error != NULL)
1273 ecb28ae0 2018-07-16 stsp goto done;
1275 b3665f43 2018-08-04 stsp view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_LOG);
1276 04cc582a 2018-08-01 stsp if (view == NULL) {
1277 04cc582a 2018-08-01 stsp error = got_error_from_errno();
1278 04cc582a 2018-08-01 stsp goto done;
1280 ba4f502b 2018-08-04 stsp error = open_log_view(view, start_id, repo, path);
1281 ba4f502b 2018-08-04 stsp if (error)
1282 ba4f502b 2018-08-04 stsp goto done;
1283 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1285 ecb28ae0 2018-07-16 stsp free(repo_path);
1286 ecb28ae0 2018-07-16 stsp free(cwd);
1287 ecb28ae0 2018-07-16 stsp free(path);
1288 899d86c2 2018-05-10 stsp free(start_id);
1290 ecb28ae0 2018-07-16 stsp got_repo_close(repo);
1291 80ddbec8 2018-04-29 stsp return error;
1294 4ed7e80c 2018-05-20 stsp __dead static void
1295 9f7d7167 2018-04-29 stsp usage_diff(void)
1298 9f7d7167 2018-04-29 stsp fprintf(stderr, "usage: %s diff [repository-path] object1 object2\n",
1299 9f7d7167 2018-04-29 stsp getprogname());
1303 b304db33 2018-05-20 stsp static char *
1304 b304db33 2018-05-20 stsp parse_next_line(FILE *f, size_t *len)
1306 b304db33 2018-05-20 stsp char *line;
1307 b304db33 2018-05-20 stsp size_t linelen;
1308 b304db33 2018-05-20 stsp size_t lineno;
1309 b304db33 2018-05-20 stsp const char delim[3] = { '\0', '\0', '\0'};
1311 b304db33 2018-05-20 stsp line = fparseln(f, &linelen, &lineno, delim, 0);
1313 b304db33 2018-05-20 stsp *len = linelen;
1314 b304db33 2018-05-20 stsp return line;
1317 4ed7e80c 2018-05-20 stsp static const struct got_error *
1318 f7d12f7e 2018-08-01 stsp draw_file(struct tog_view *view, FILE *f, int *first_displayed_line,
1319 a70480e0 2018-06-23 stsp int *last_displayed_line, int *eof, int max_lines)
1321 61e69b96 2018-05-20 stsp const struct got_error *err;
1322 26ed57b2 2018-05-19 stsp int nlines = 0, nprinted = 0;
1323 b304db33 2018-05-20 stsp char *line;
1324 b304db33 2018-05-20 stsp size_t len;
1325 61e69b96 2018-05-20 stsp wchar_t *wline;
1326 e0b650dd 2018-05-20 stsp int width;
1328 26ed57b2 2018-05-19 stsp rewind(f);
1329 f7d12f7e 2018-08-01 stsp werase(view->window);
1332 26ed57b2 2018-05-19 stsp while (nprinted < max_lines) {
1333 b304db33 2018-05-20 stsp line = parse_next_line(f, &len);
1334 26ed57b2 2018-05-19 stsp if (line == NULL) {
1338 26ed57b2 2018-05-19 stsp if (++nlines < *first_displayed_line) {
1339 26ed57b2 2018-05-19 stsp free(line);
1343 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1344 61e69b96 2018-05-20 stsp if (err) {
1345 61e69b96 2018-05-20 stsp free(line);
1346 2550e4c3 2018-07-13 stsp free(wline);
1347 61e69b96 2018-05-20 stsp return err;
1349 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1350 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1351 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1352 26ed57b2 2018-05-19 stsp if (++nprinted == 1)
1353 26ed57b2 2018-05-19 stsp *first_displayed_line = nlines;
1354 26ed57b2 2018-05-19 stsp free(line);
1355 2550e4c3 2018-07-13 stsp free(wline);
1356 2550e4c3 2018-07-13 stsp wline = NULL;
1358 26ed57b2 2018-05-19 stsp *last_displayed_line = nlines;
1360 26ed57b2 2018-05-19 stsp update_panels();
1362 26ed57b2 2018-05-19 stsp return NULL;
1365 4ed7e80c 2018-05-20 stsp static const struct got_error *
1366 5dc9f4bc 2018-08-04 stsp open_diff_view(struct tog_view *view, struct got_object *obj1,
1367 ea5e7bb5 2018-08-01 stsp struct got_object *obj2, struct got_repository *repo)
1369 26ed57b2 2018-05-19 stsp const struct got_error *err;
1372 cd0acaa7 2018-05-20 stsp if (obj1 != NULL && obj2 != NULL &&
1373 cd0acaa7 2018-05-20 stsp got_object_get_type(obj1) != got_object_get_type(obj2))
1374 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
1376 511a516b 2018-05-19 stsp f = got_opentemp();
1377 26ed57b2 2018-05-19 stsp if (f == NULL)
1378 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1380 cd0acaa7 2018-05-20 stsp switch (got_object_get_type(obj1 ? obj1 : obj2)) {
1381 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_BLOB:
1382 11528a82 2018-05-19 stsp err = got_diff_objects_as_blobs(obj1, obj2, repo, f);
1384 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_TREE:
1385 11528a82 2018-05-19 stsp err = got_diff_objects_as_trees(obj1, obj2, repo, f);
1387 26ed57b2 2018-05-19 stsp case GOT_OBJ_TYPE_COMMIT:
1388 11528a82 2018-05-19 stsp err = got_diff_objects_as_commits(obj1, obj2, repo, f);
1391 26ed57b2 2018-05-19 stsp return got_error(GOT_ERR_OBJ_TYPE);
1394 26ed57b2 2018-05-19 stsp fflush(f);
1396 5dc9f4bc 2018-08-04 stsp view->state.diff.f = f;
1397 5dc9f4bc 2018-08-04 stsp view->state.diff.first_displayed_line = 1;
1398 5dc9f4bc 2018-08-04 stsp view->state.diff.last_displayed_line = view->nlines;
1400 e5a0f69f 2018-08-18 stsp view->show = show_diff_view;
1401 e5a0f69f 2018-08-18 stsp view->input = input_diff_view;
1402 e5a0f69f 2018-08-18 stsp view->close = close_diff_view;
1404 5dc9f4bc 2018-08-04 stsp return NULL;
1407 e5a0f69f 2018-08-18 stsp static const struct got_error *
1408 5dc9f4bc 2018-08-04 stsp close_diff_view(struct tog_view *view)
1410 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1412 e5a0f69f 2018-08-18 stsp if (view->state.diff.f && fclose(view->state.diff.f) == EOF)
1413 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
1415 e5a0f69f 2018-08-18 stsp return err;
1418 5dc9f4bc 2018-08-04 stsp static const struct got_error *
1419 5dc9f4bc 2018-08-04 stsp show_diff_view(struct tog_view *view)
1421 fb2756b9 2018-08-04 stsp struct tog_diff_view_state *s = &view->state.diff;
1423 e5a0f69f 2018-08-18 stsp return draw_file(view, s->f, &s->first_displayed_line,
1424 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
1427 e5a0f69f 2018-08-18 stsp static const struct got_error *
1428 e5a0f69f 2018-08-18 stsp input_diff_view(struct tog_view **new, struct tog_view **dead,
1429 e5a0f69f 2018-08-18 stsp struct tog_view *view, int ch)
1431 e5a0f69f 2018-08-18 stsp struct tog_diff_view_state *s = &view->state.diff;
1434 e5a0f69f 2018-08-18 stsp switch (ch) {
1436 e5a0f69f 2018-08-18 stsp case KEY_UP:
1437 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > 1)
1438 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
1440 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
1441 e5a0f69f 2018-08-18 stsp case KEY_BACKSPACE:
1443 e5a0f69f 2018-08-18 stsp while (i++ < view->nlines - 1 &&
1444 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
1445 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
1448 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
1449 e5a0f69f 2018-08-18 stsp if (!s->eof)
1450 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
1452 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
1455 e5a0f69f 2018-08-18 stsp while (!s->eof && i++ < view->nlines - 1) {
1456 e5a0f69f 2018-08-18 stsp char *line;
1457 e5a0f69f 2018-08-18 stsp line = parse_next_line(s->f, NULL);
1458 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
1459 e5a0f69f 2018-08-18 stsp if (line == NULL)
1467 e5a0f69f 2018-08-18 stsp return NULL;
1470 4ed7e80c 2018-05-20 stsp static const struct got_error *
1471 9f7d7167 2018-04-29 stsp cmd_diff(int argc, char *argv[])
1473 26ed57b2 2018-05-19 stsp const struct got_error *error = NULL;
1474 26ed57b2 2018-05-19 stsp struct got_repository *repo = NULL;
1475 26ed57b2 2018-05-19 stsp struct got_object *obj1 = NULL, *obj2 = NULL;
1476 26ed57b2 2018-05-19 stsp char *repo_path = NULL;
1477 26ed57b2 2018-05-19 stsp char *obj_id_str1 = NULL, *obj_id_str2 = NULL;
1479 ea5e7bb5 2018-08-01 stsp struct tog_view *view;
1481 26ed57b2 2018-05-19 stsp #ifndef PROFILE
1482 26ed57b2 2018-05-19 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
1483 26ed57b2 2018-05-19 stsp err(1, "pledge");
1486 26ed57b2 2018-05-19 stsp while ((ch = getopt(argc, argv, "")) != -1) {
1487 26ed57b2 2018-05-19 stsp switch (ch) {
1490 26ed57b2 2018-05-19 stsp /* NOTREACHED */
1494 26ed57b2 2018-05-19 stsp argc -= optind;
1495 26ed57b2 2018-05-19 stsp argv += optind;
1497 26ed57b2 2018-05-19 stsp if (argc == 0) {
1498 26ed57b2 2018-05-19 stsp usage_diff(); /* TODO show local worktree changes */
1499 26ed57b2 2018-05-19 stsp } else if (argc == 2) {
1500 26ed57b2 2018-05-19 stsp repo_path = getcwd(NULL, 0);
1501 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1502 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1503 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[0];
1504 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[1];
1505 26ed57b2 2018-05-19 stsp } else if (argc == 3) {
1506 26ed57b2 2018-05-19 stsp repo_path = realpath(argv[0], NULL);
1507 26ed57b2 2018-05-19 stsp if (repo_path == NULL)
1508 26ed57b2 2018-05-19 stsp return got_error_from_errno();
1509 26ed57b2 2018-05-19 stsp obj_id_str1 = argv[1];
1510 26ed57b2 2018-05-19 stsp obj_id_str2 = argv[2];
1512 26ed57b2 2018-05-19 stsp usage_diff();
1514 26ed57b2 2018-05-19 stsp error = got_repo_open(&repo, repo_path);
1515 26ed57b2 2018-05-19 stsp free(repo_path);
1516 26ed57b2 2018-05-19 stsp if (error)
1517 26ed57b2 2018-05-19 stsp goto done;
1519 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj1, repo, obj_id_str1);
1520 26ed57b2 2018-05-19 stsp if (error)
1521 26ed57b2 2018-05-19 stsp goto done;
1523 26ed57b2 2018-05-19 stsp error = got_object_open_by_id_str(&obj2, repo, obj_id_str2);
1524 26ed57b2 2018-05-19 stsp if (error)
1525 26ed57b2 2018-05-19 stsp goto done;
1527 b3665f43 2018-08-04 stsp view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_DIFF);
1528 ea5e7bb5 2018-08-01 stsp if (view == NULL) {
1529 ea5e7bb5 2018-08-01 stsp error = got_error_from_errno();
1530 ea5e7bb5 2018-08-01 stsp goto done;
1532 5dc9f4bc 2018-08-04 stsp error = open_diff_view(view, obj1, obj2, repo);
1533 5dc9f4bc 2018-08-04 stsp if (error)
1534 5dc9f4bc 2018-08-04 stsp goto done;
1535 e5a0f69f 2018-08-18 stsp error = view_loop(view);
1537 26ed57b2 2018-05-19 stsp got_repo_close(repo);
1539 26ed57b2 2018-05-19 stsp got_object_close(obj1);
1541 26ed57b2 2018-05-19 stsp got_object_close(obj2);
1542 26ed57b2 2018-05-19 stsp return error;
1545 4ed7e80c 2018-05-20 stsp __dead static void
1546 9f7d7167 2018-04-29 stsp usage_blame(void)
1549 69069811 2018-08-02 stsp fprintf(stderr, "usage: %s blame [-c commit] [-r repository-path] path\n",
1550 9f7d7167 2018-04-29 stsp getprogname());
1554 84451b3e 2018-07-10 stsp struct tog_blame_line {
1555 84451b3e 2018-07-10 stsp int annotated;
1556 84451b3e 2018-07-10 stsp struct got_object_id *id;
1559 4ed7e80c 2018-05-20 stsp static const struct got_error *
1560 f7d12f7e 2018-08-01 stsp draw_blame(struct tog_view *view, struct got_object_id *id, FILE *f,
1561 f7d12f7e 2018-08-01 stsp const char *path, struct tog_blame_line *lines, int nlines,
1562 f7d12f7e 2018-08-01 stsp int blame_complete, int selected_line, int *first_displayed_line,
1563 f7d12f7e 2018-08-01 stsp int *last_displayed_line, int *eof, int max_lines)
1565 84451b3e 2018-07-10 stsp const struct got_error *err;
1566 84451b3e 2018-07-10 stsp int lineno = 0, nprinted = 0;
1567 84451b3e 2018-07-10 stsp char *line;
1568 84451b3e 2018-07-10 stsp size_t len;
1569 84451b3e 2018-07-10 stsp wchar_t *wline;
1570 b700b5d6 2018-07-10 stsp int width, wlimit;
1571 84451b3e 2018-07-10 stsp struct tog_blame_line *blame_line;
1572 ee41ec32 2018-07-10 stsp struct got_object_id *prev_id = NULL;
1573 ab089a2a 2018-07-12 stsp char *id_str;
1575 ab089a2a 2018-07-12 stsp err = got_object_id_str(&id_str, id);
1577 ab089a2a 2018-07-12 stsp return err;
1579 84451b3e 2018-07-10 stsp rewind(f);
1580 f7d12f7e 2018-08-01 stsp werase(view->window);
1582 ab089a2a 2018-07-12 stsp if (asprintf(&line, "commit: %s", id_str) == -1) {
1583 ab089a2a 2018-07-12 stsp err = got_error_from_errno();
1584 ab089a2a 2018-07-12 stsp free(id_str);
1585 ab089a2a 2018-07-12 stsp return err;
1588 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1589 ab089a2a 2018-07-12 stsp free(line);
1590 2550e4c3 2018-07-13 stsp line = NULL;
1591 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1592 2550e4c3 2018-07-13 stsp free(wline);
1593 2550e4c3 2018-07-13 stsp wline = NULL;
1594 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1595 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1597 084063cd 2018-07-12 stsp if (asprintf(&line, "[%d/%d] %s%s",
1598 084063cd 2018-07-12 stsp *first_displayed_line - 1 + selected_line, nlines,
1599 12a0b23b 2018-07-12 stsp blame_complete ? "" : "annotating ", path) == -1) {
1600 ab089a2a 2018-07-12 stsp free(id_str);
1601 3f60a8ef 2018-07-10 stsp return got_error_from_errno();
1603 ab089a2a 2018-07-12 stsp free(id_str);
1604 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
1605 3f60a8ef 2018-07-10 stsp free(line);
1606 2550e4c3 2018-07-13 stsp line = NULL;
1608 3f60a8ef 2018-07-10 stsp return err;
1609 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1610 2550e4c3 2018-07-13 stsp free(wline);
1611 2550e4c3 2018-07-13 stsp wline = NULL;
1612 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
1613 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
1616 ab089a2a 2018-07-12 stsp while (nprinted < max_lines - 2) {
1617 84451b3e 2018-07-10 stsp line = parse_next_line(f, &len);
1618 84451b3e 2018-07-10 stsp if (line == NULL) {
1622 84451b3e 2018-07-10 stsp if (++lineno < *first_displayed_line) {
1623 84451b3e 2018-07-10 stsp free(line);
1627 f7d12f7e 2018-08-01 stsp wlimit = view->ncols < 9 ? 0 : view->ncols - 9;
1628 b700b5d6 2018-07-10 stsp err = format_line(&wline, &width, line, wlimit);
1629 84451b3e 2018-07-10 stsp if (err) {
1630 84451b3e 2018-07-10 stsp free(line);
1631 84451b3e 2018-07-10 stsp return err;
1634 b700b5d6 2018-07-10 stsp if (nprinted == selected_line - 1)
1635 f7d12f7e 2018-08-01 stsp wstandout(view->window);
1637 84451b3e 2018-07-10 stsp blame_line = &lines[lineno - 1];
1638 ee41ec32 2018-07-10 stsp if (blame_line->annotated && prev_id &&
1639 ee41ec32 2018-07-10 stsp got_object_id_cmp(prev_id, blame_line->id) == 0)
1640 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ");
1641 ee41ec32 2018-07-10 stsp else if (blame_line->annotated) {
1642 84451b3e 2018-07-10 stsp char *id_str;
1643 84451b3e 2018-07-10 stsp err = got_object_id_str(&id_str, blame_line->id);
1644 84451b3e 2018-07-10 stsp if (err) {
1645 84451b3e 2018-07-10 stsp free(line);
1646 2550e4c3 2018-07-13 stsp free(wline);
1647 84451b3e 2018-07-10 stsp return err;
1649 f7d12f7e 2018-08-01 stsp wprintw(view->window, "%.8s ", id_str);
1650 84451b3e 2018-07-10 stsp free(id_str);
1651 ee41ec32 2018-07-10 stsp prev_id = blame_line->id;
1653 f7d12f7e 2018-08-01 stsp waddstr(view->window, "........ ");
1654 ee41ec32 2018-07-10 stsp prev_id = NULL;
1657 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
1658 b700b5d6 2018-07-10 stsp while (width < wlimit) {
1659 f7d12f7e 2018-08-01 stsp waddch(view->window, ' ');
1662 b700b5d6 2018-07-10 stsp if (nprinted == selected_line - 1)
1663 f7d12f7e 2018-08-01 stsp wstandend(view->window);
1664 84451b3e 2018-07-10 stsp if (++nprinted == 1)
1665 84451b3e 2018-07-10 stsp *first_displayed_line = lineno;
1666 84451b3e 2018-07-10 stsp free(line);
1667 2550e4c3 2018-07-13 stsp free(wline);
1668 2550e4c3 2018-07-13 stsp wline = NULL;
1670 84451b3e 2018-07-10 stsp *last_displayed_line = lineno;
1672 84451b3e 2018-07-10 stsp update_panels();
1674 84451b3e 2018-07-10 stsp return NULL;
1677 84451b3e 2018-07-10 stsp static const struct got_error *
1678 84451b3e 2018-07-10 stsp blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
1680 84451b3e 2018-07-10 stsp const struct got_error *err = NULL;
1681 84451b3e 2018-07-10 stsp struct tog_blame_cb_args *a = arg;
1682 84451b3e 2018-07-10 stsp struct tog_blame_line *line;
1684 d68a0a7d 2018-07-10 stsp if (nlines != a->nlines ||
1685 d68a0a7d 2018-07-10 stsp (lineno != -1 && lineno < 1) || lineno > a->nlines)
1686 84451b3e 2018-07-10 stsp return got_error(GOT_ERR_RANGE);
1688 84451b3e 2018-07-10 stsp if (pthread_mutex_lock(a->mutex) != 0)
1689 84451b3e 2018-07-10 stsp return got_error_from_errno();
1691 18430de3 2018-07-10 stsp if (*a->quit) { /* user has quit the blame view */
1692 d68a0a7d 2018-07-10 stsp err = got_error(GOT_ERR_ITER_COMPLETED);
1693 d68a0a7d 2018-07-10 stsp goto done;
1696 d68a0a7d 2018-07-10 stsp if (lineno == -1)
1697 d68a0a7d 2018-07-10 stsp goto done; /* no change in this commit */
1699 84451b3e 2018-07-10 stsp line = &a->lines[lineno - 1];
1700 d68a0a7d 2018-07-10 stsp if (line->annotated)
1701 d68a0a7d 2018-07-10 stsp goto done;
1703 84451b3e 2018-07-10 stsp line->id = got_object_id_dup(id);
1704 84451b3e 2018-07-10 stsp if (line->id == NULL) {
1705 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1706 84451b3e 2018-07-10 stsp goto done;
1708 84451b3e 2018-07-10 stsp line->annotated = 1;
1710 f7d12f7e 2018-08-01 stsp err = draw_blame(a->view, a->commit_id, a->f, a->path,
1711 245d91c1 2018-07-12 stsp a->lines, a->nlines, 0, *a->selected_line, a->first_displayed_line,
1712 e5a0f69f 2018-08-18 stsp a->last_displayed_line, a->eof, a->view->nlines);
1714 84451b3e 2018-07-10 stsp if (pthread_mutex_unlock(a->mutex) != 0)
1715 84451b3e 2018-07-10 stsp return got_error_from_errno();
1716 84451b3e 2018-07-10 stsp return err;
1719 84451b3e 2018-07-10 stsp static void *
1720 84451b3e 2018-07-10 stsp blame_thread(void *arg)
1722 18430de3 2018-07-10 stsp const struct got_error *err;
1723 18430de3 2018-07-10 stsp struct tog_blame_thread_args *ta = arg;
1724 245d91c1 2018-07-12 stsp struct tog_blame_cb_args *a = ta->cb_args;
1726 ab089a2a 2018-07-12 stsp err = got_blame_incremental(ta->path, a->commit_id, ta->repo,
1727 245d91c1 2018-07-12 stsp blame_cb, ta->cb_args);
1729 18430de3 2018-07-10 stsp if (pthread_mutex_lock(a->mutex) != 0)
1730 18430de3 2018-07-10 stsp return (void *)got_error_from_errno();
1732 c9beca56 2018-07-22 stsp got_repo_close(ta->repo);
1733 c9beca56 2018-07-22 stsp ta->repo = NULL;
1734 c9beca56 2018-07-22 stsp *ta->complete = 1;
1736 f7d12f7e 2018-08-01 stsp err = draw_blame(a->view, a->commit_id, a->f, a->path,
1737 f7d12f7e 2018-08-01 stsp a->lines, a->nlines, 1, *a->selected_line,
1738 e5a0f69f 2018-08-18 stsp a->first_displayed_line, a->last_displayed_line, a->eof,
1739 f7d12f7e 2018-08-01 stsp a->view->nlines);
1741 18430de3 2018-07-10 stsp if (pthread_mutex_unlock(a->mutex) != 0 && err == NULL)
1742 18430de3 2018-07-10 stsp err = got_error_from_errno();
1744 18430de3 2018-07-10 stsp return (void *)err;
1747 245d91c1 2018-07-12 stsp static struct got_object_id *
1748 245d91c1 2018-07-12 stsp get_selected_commit_id(struct tog_blame_line *lines,
1749 245d91c1 2018-07-12 stsp int first_displayed_line, int selected_line)
1751 245d91c1 2018-07-12 stsp struct tog_blame_line *line;
1753 245d91c1 2018-07-12 stsp line = &lines[first_displayed_line - 1 + selected_line - 1];
1754 245d91c1 2018-07-12 stsp if (!line->annotated)
1755 245d91c1 2018-07-12 stsp return NULL;
1757 245d91c1 2018-07-12 stsp return line->id;
1760 84451b3e 2018-07-10 stsp static const struct got_error *
1761 245d91c1 2018-07-12 stsp open_selected_commit(struct got_object **pobj, struct got_object **obj,
1762 b880a918 2018-07-10 stsp struct tog_blame_line *lines, int first_displayed_line,
1763 b880a918 2018-07-10 stsp int selected_line, struct got_repository *repo)
1765 b880a918 2018-07-10 stsp const struct got_error *err = NULL;
1766 b880a918 2018-07-10 stsp struct got_commit_object *commit = NULL;
1767 245d91c1 2018-07-12 stsp struct got_object_id *selected_id;
1768 b880a918 2018-07-10 stsp struct got_object_qid *pid;
1770 b880a918 2018-07-10 stsp *pobj = NULL;
1771 b880a918 2018-07-10 stsp *obj = NULL;
1773 245d91c1 2018-07-12 stsp selected_id = get_selected_commit_id(lines,
1774 245d91c1 2018-07-12 stsp first_displayed_line, selected_line);
1775 245d91c1 2018-07-12 stsp if (selected_id == NULL)
1776 b880a918 2018-07-10 stsp return NULL;
1778 245d91c1 2018-07-12 stsp err = got_object_open(obj, repo, selected_id);
1780 b880a918 2018-07-10 stsp goto done;
1782 b880a918 2018-07-10 stsp err = got_object_commit_open(&commit, repo, *obj);
1784 b880a918 2018-07-10 stsp goto done;
1786 b880a918 2018-07-10 stsp pid = SIMPLEQ_FIRST(&commit->parent_ids);
1787 b880a918 2018-07-10 stsp if (pid) {
1788 b880a918 2018-07-10 stsp err = got_object_open(pobj, repo, pid->id);
1790 b880a918 2018-07-10 stsp goto done;
1793 b880a918 2018-07-10 stsp if (commit)
1794 b880a918 2018-07-10 stsp got_object_commit_close(commit);
1795 b880a918 2018-07-10 stsp return err;
1798 b880a918 2018-07-10 stsp static const struct got_error *
1799 245d91c1 2018-07-12 stsp stop_blame(struct tog_blame *blame)
1801 a70480e0 2018-06-23 stsp const struct got_error *err = NULL;
1804 245d91c1 2018-07-12 stsp if (blame->thread) {
1805 245d91c1 2018-07-12 stsp if (pthread_join(blame->thread, (void **)&err) != 0)
1806 245d91c1 2018-07-12 stsp err = got_error_from_errno();
1807 245d91c1 2018-07-12 stsp if (err && err->code == GOT_ERR_ITER_COMPLETED)
1808 245d91c1 2018-07-12 stsp err = NULL;
1809 245d91c1 2018-07-12 stsp blame->thread = NULL;
1811 245d91c1 2018-07-12 stsp if (blame->thread_args.repo) {
1812 245d91c1 2018-07-12 stsp got_repo_close(blame->thread_args.repo);
1813 245d91c1 2018-07-12 stsp blame->thread_args.repo = NULL;
1815 245d91c1 2018-07-12 stsp if (blame->f) {
1816 245d91c1 2018-07-12 stsp fclose(blame->f);
1817 245d91c1 2018-07-12 stsp blame->f = NULL;
1819 245d91c1 2018-07-12 stsp for (i = 0; i < blame->nlines; i++)
1820 245d91c1 2018-07-12 stsp free(blame->lines[i].id);
1821 245d91c1 2018-07-12 stsp free(blame->lines);
1822 245d91c1 2018-07-12 stsp blame->lines = NULL;
1823 75c32340 2018-07-23 stsp free(blame->cb_args.commit_id);
1824 75c32340 2018-07-23 stsp blame->cb_args.commit_id = NULL;
1826 245d91c1 2018-07-12 stsp return err;
1829 245d91c1 2018-07-12 stsp static const struct got_error *
1830 7cc84d77 2018-08-01 stsp run_blame(struct tog_blame *blame, pthread_mutex_t *mutex,
1831 7cc84d77 2018-08-01 stsp struct tog_view *view, int *blame_complete,
1832 245d91c1 2018-07-12 stsp int *first_displayed_line, int *last_displayed_line,
1833 e5a0f69f 2018-08-18 stsp int *selected_line, int *done, int *eof, const char *path,
1834 245d91c1 2018-07-12 stsp struct got_object_id *commit_id,
1835 245d91c1 2018-07-12 stsp struct got_repository *repo)
1837 245d91c1 2018-07-12 stsp const struct got_error *err = NULL;
1838 84451b3e 2018-07-10 stsp struct got_blob_object *blob = NULL;
1839 245d91c1 2018-07-12 stsp struct got_repository *thread_repo = NULL;
1840 245d91c1 2018-07-12 stsp struct got_object *obj;
1842 84451b3e 2018-07-10 stsp err = got_object_open_by_path(&obj, repo, commit_id, path);
1844 84451b3e 2018-07-10 stsp goto done;
1845 84451b3e 2018-07-10 stsp if (got_object_get_type(obj) != GOT_OBJ_TYPE_BLOB) {
1846 84451b3e 2018-07-10 stsp err = got_error(GOT_ERR_OBJ_TYPE);
1847 84451b3e 2018-07-10 stsp goto done;
1850 84451b3e 2018-07-10 stsp err = got_object_blob_open(&blob, repo, obj, 8192);
1852 a70480e0 2018-06-23 stsp goto done;
1853 245d91c1 2018-07-12 stsp blame->f = got_opentemp();
1854 245d91c1 2018-07-12 stsp if (blame->f == NULL) {
1855 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1856 84451b3e 2018-07-10 stsp goto done;
1858 245d91c1 2018-07-12 stsp err = got_object_blob_dump_to_file(&blame->filesize, &blame->nlines,
1859 245d91c1 2018-07-12 stsp blame->f, blob);
1861 84451b3e 2018-07-10 stsp goto done;
1863 245d91c1 2018-07-12 stsp blame->lines = calloc(blame->nlines, sizeof(*blame->lines));
1864 245d91c1 2018-07-12 stsp if (blame->lines == NULL) {
1865 84451b3e 2018-07-10 stsp err = got_error_from_errno();
1866 84451b3e 2018-07-10 stsp goto done;
1869 245d91c1 2018-07-12 stsp err = got_repo_open(&thread_repo, got_repo_get_path(repo));
1871 bd24772e 2018-07-11 stsp goto done;
1873 7cc84d77 2018-08-01 stsp blame->cb_args.view = view;
1874 245d91c1 2018-07-12 stsp blame->cb_args.lines = blame->lines;
1875 245d91c1 2018-07-12 stsp blame->cb_args.nlines = blame->nlines;
1876 245d91c1 2018-07-12 stsp blame->cb_args.mutex = mutex;
1877 245d91c1 2018-07-12 stsp blame->cb_args.commit_id = got_object_id_dup(commit_id);
1878 245d91c1 2018-07-12 stsp if (blame->cb_args.commit_id == NULL) {
1879 245d91c1 2018-07-12 stsp err = got_error_from_errno();
1880 245d91c1 2018-07-12 stsp goto done;
1882 245d91c1 2018-07-12 stsp blame->cb_args.f = blame->f;
1883 245d91c1 2018-07-12 stsp blame->cb_args.path = path;
1884 245d91c1 2018-07-12 stsp blame->cb_args.first_displayed_line = first_displayed_line;
1885 245d91c1 2018-07-12 stsp blame->cb_args.selected_line = selected_line;
1886 245d91c1 2018-07-12 stsp blame->cb_args.last_displayed_line = last_displayed_line;
1887 245d91c1 2018-07-12 stsp blame->cb_args.quit = done;
1888 e5a0f69f 2018-08-18 stsp blame->cb_args.eof = eof;
1890 245d91c1 2018-07-12 stsp blame->thread_args.path = path;
1891 245d91c1 2018-07-12 stsp blame->thread_args.repo = thread_repo;
1892 245d91c1 2018-07-12 stsp blame->thread_args.cb_args = &blame->cb_args;
1893 245d91c1 2018-07-12 stsp blame->thread_args.complete = blame_complete;
1894 245d91c1 2018-07-12 stsp *blame_complete = 0;
1896 245d91c1 2018-07-12 stsp if (pthread_create(&blame->thread, NULL, blame_thread,
1897 245d91c1 2018-07-12 stsp &blame->thread_args) != 0) {
1898 245d91c1 2018-07-12 stsp err = got_error_from_errno();
1899 245d91c1 2018-07-12 stsp goto done;
1904 245d91c1 2018-07-12 stsp got_object_blob_close(blob);
1906 245d91c1 2018-07-12 stsp got_object_close(obj);
1908 245d91c1 2018-07-12 stsp stop_blame(blame);
1909 245d91c1 2018-07-12 stsp return err;
1912 245d91c1 2018-07-12 stsp static const struct got_error *
1913 e5a0f69f 2018-08-18 stsp open_blame_view(struct tog_view *view, char *path,
1914 e1cd8fed 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
1916 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL;
1917 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
1919 fb2756b9 2018-08-04 stsp SIMPLEQ_INIT(&s->blamed_commits);
1921 fb2756b9 2018-08-04 stsp if (pthread_mutex_init(&s->mutex, NULL) != 0)
1922 7cbe629d 2018-08-04 stsp return got_error_from_errno();
1924 fb2756b9 2018-08-04 stsp err = got_object_qid_alloc(&s->blamed_commit, commit_id);
1926 7cbe629d 2018-08-04 stsp return err;
1928 fb2756b9 2018-08-04 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits, s->blamed_commit, entry);
1929 fb2756b9 2018-08-04 stsp s->first_displayed_line = 1;
1930 fb2756b9 2018-08-04 stsp s->last_displayed_line = view->nlines;
1931 fb2756b9 2018-08-04 stsp s->selected_line = 1;
1932 fb2756b9 2018-08-04 stsp s->blame_complete = 0;
1933 fb2756b9 2018-08-04 stsp s->path = path;
1934 e5a0f69f 2018-08-18 stsp if (s->path == NULL)
1935 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1936 fb2756b9 2018-08-04 stsp s->repo = repo;
1937 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
1938 e9424729 2018-08-04 stsp memset(&s->blame, 0, sizeof(s->blame));
1940 e5a0f69f 2018-08-18 stsp view->show = show_blame_view;
1941 e5a0f69f 2018-08-18 stsp view->input = input_blame_view;
1942 e5a0f69f 2018-08-18 stsp view->close = close_blame_view;
1944 e5a0f69f 2018-08-18 stsp return run_blame(&s->blame, &s->mutex, view, &s->blame_complete,
1945 e5a0f69f 2018-08-18 stsp &s->first_displayed_line, &s->last_displayed_line,
1946 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
1947 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
1950 e5a0f69f 2018-08-18 stsp static const struct got_error *
1951 7cbe629d 2018-08-04 stsp close_blame_view(struct tog_view *view)
1953 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1954 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
1956 e5a0f69f 2018-08-18 stsp if (s->blame.thread)
1957 e5a0f69f 2018-08-18 stsp err = stop_blame(&s->blame);
1959 fb2756b9 2018-08-04 stsp while (!SIMPLEQ_EMPTY(&s->blamed_commits)) {
1960 7cbe629d 2018-08-04 stsp struct got_object_qid *blamed_commit;
1961 fb2756b9 2018-08-04 stsp blamed_commit = SIMPLEQ_FIRST(&s->blamed_commits);
1962 fb2756b9 2018-08-04 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
1963 7cbe629d 2018-08-04 stsp got_object_qid_free(blamed_commit);
1966 e5a0f69f 2018-08-18 stsp free(s->path);
1968 e5a0f69f 2018-08-18 stsp return err;
1971 7cbe629d 2018-08-04 stsp static const struct got_error *
1972 7cbe629d 2018-08-04 stsp show_blame_view(struct tog_view *view)
1974 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
1975 e5a0f69f 2018-08-18 stsp struct tog_blame_view_state *s = &view->state.blame;
1977 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0)
1978 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
1980 e5a0f69f 2018-08-18 stsp err = draw_blame(view, s->blamed_commit->id, s->blame.f,
1981 e5a0f69f 2018-08-18 stsp s->path, s->blame.lines, s->blame.nlines, s->blame_complete,
1982 e5a0f69f 2018-08-18 stsp s->selected_line, &s->first_displayed_line,
1983 e5a0f69f 2018-08-18 stsp &s->last_displayed_line, &s->eof, view->nlines);
1985 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0 && err == NULL)
1986 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
1988 e5a0f69f 2018-08-18 stsp return err;
1991 e5a0f69f 2018-08-18 stsp static const struct got_error *
1992 e5a0f69f 2018-08-18 stsp input_blame_view(struct tog_view **new_view, struct tog_view **dead_view,
1993 e5a0f69f 2018-08-18 stsp struct tog_view *view, int ch)
1995 7cbe629d 2018-08-04 stsp const struct got_error *err = NULL, *thread_err = NULL;
1996 7cbe629d 2018-08-04 stsp struct got_object *obj = NULL, *pobj = NULL;
1997 7cbe629d 2018-08-04 stsp struct tog_view *diff_view;
1998 fb2756b9 2018-08-04 stsp struct tog_blame_view_state *s = &view->state.blame;
2000 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0) {
2001 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2002 e5a0f69f 2018-08-18 stsp goto done;
2005 e5a0f69f 2018-08-18 stsp switch (ch) {
2007 e5a0f69f 2018-08-18 stsp s->done = 1;
2008 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0) {
2009 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2010 e5a0f69f 2018-08-18 stsp goto done;
2012 e5a0f69f 2018-08-18 stsp return stop_blame(&s->blame);
2014 e5a0f69f 2018-08-18 stsp case KEY_UP:
2015 e5a0f69f 2018-08-18 stsp if (s->selected_line > 1)
2016 e5a0f69f 2018-08-18 stsp s->selected_line--;
2017 e5a0f69f 2018-08-18 stsp else if (s->selected_line == 1 &&
2018 e5a0f69f 2018-08-18 stsp s->first_displayed_line > 1)
2019 e5a0f69f 2018-08-18 stsp s->first_displayed_line--;
2021 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2022 e5a0f69f 2018-08-18 stsp case KEY_BACKSPACE:
2023 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line == 1) {
2024 e5a0f69f 2018-08-18 stsp s->selected_line = 1;
2027 e5a0f69f 2018-08-18 stsp if (s->first_displayed_line > view->nlines - 2)
2028 e5a0f69f 2018-08-18 stsp s->first_displayed_line -=
2029 e5a0f69f 2018-08-18 stsp (view->nlines - 2);
2031 e5a0f69f 2018-08-18 stsp s->first_displayed_line = 1;
2034 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2035 e5a0f69f 2018-08-18 stsp if (s->selected_line < view->nlines - 2 &&
2036 e5a0f69f 2018-08-18 stsp s->first_displayed_line +
2037 e5a0f69f 2018-08-18 stsp s->selected_line <= s->blame.nlines)
2038 e5a0f69f 2018-08-18 stsp s->selected_line++;
2039 e5a0f69f 2018-08-18 stsp else if (s->last_displayed_line <
2040 e5a0f69f 2018-08-18 stsp s->blame.nlines)
2041 e5a0f69f 2018-08-18 stsp s->first_displayed_line++;
2044 e5a0f69f 2018-08-18 stsp case 'p': {
2045 e5a0f69f 2018-08-18 stsp struct got_object_id *id;
2046 e5a0f69f 2018-08-18 stsp id = get_selected_commit_id(s->blame.lines,
2047 e5a0f69f 2018-08-18 stsp s->first_displayed_line, s->selected_line);
2048 e5a0f69f 2018-08-18 stsp if (id == NULL || got_object_id_cmp(id,
2049 e5a0f69f 2018-08-18 stsp s->blamed_commit->id) == 0)
2051 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2052 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2053 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2056 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2058 e5a0f69f 2018-08-18 stsp if (ch == 'p' && pobj == NULL)
2060 e5a0f69f 2018-08-18 stsp s->done = 1;
2061 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0) {
2062 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2063 e5a0f69f 2018-08-18 stsp goto done;
2065 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2066 e5a0f69f 2018-08-18 stsp s->done = 0;
2067 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0) {
2068 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2069 e5a0f69f 2018-08-18 stsp goto done;
2071 e5a0f69f 2018-08-18 stsp if (thread_err)
2073 e5a0f69f 2018-08-18 stsp id = got_object_get_id(ch == 'b' ? obj : pobj);
2074 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2075 e5a0f69f 2018-08-18 stsp obj = NULL;
2076 e5a0f69f 2018-08-18 stsp if (pobj) {
2077 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2078 e5a0f69f 2018-08-18 stsp pobj = NULL;
2080 e5a0f69f 2018-08-18 stsp if (id == NULL) {
2081 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2084 e5a0f69f 2018-08-18 stsp err = got_object_qid_alloc(
2085 e5a0f69f 2018-08-18 stsp &s->blamed_commit, id);
2088 e5a0f69f 2018-08-18 stsp goto done;
2089 e5a0f69f 2018-08-18 stsp SIMPLEQ_INSERT_HEAD(&s->blamed_commits,
2090 e5a0f69f 2018-08-18 stsp s->blamed_commit, entry);
2091 e5a0f69f 2018-08-18 stsp err = run_blame(&s->blame, &s->mutex, view,
2092 e5a0f69f 2018-08-18 stsp &s->blame_complete,
2093 e5a0f69f 2018-08-18 stsp &s->first_displayed_line,
2094 e5a0f69f 2018-08-18 stsp &s->last_displayed_line,
2095 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof,
2096 e5a0f69f 2018-08-18 stsp s->path, s->blamed_commit->id, s->repo);
2101 e5a0f69f 2018-08-18 stsp case 'B': {
2102 e5a0f69f 2018-08-18 stsp struct got_object_qid *first;
2103 e5a0f69f 2018-08-18 stsp first = SIMPLEQ_FIRST(&s->blamed_commits);
2104 e5a0f69f 2018-08-18 stsp if (!got_object_id_cmp(first->id, s->commit_id))
2106 e5a0f69f 2018-08-18 stsp s->done = 1;
2107 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0) {
2108 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2109 e5a0f69f 2018-08-18 stsp goto done;
2111 e5a0f69f 2018-08-18 stsp thread_err = stop_blame(&s->blame);
2112 e5a0f69f 2018-08-18 stsp s->done = 0;
2113 e5a0f69f 2018-08-18 stsp if (pthread_mutex_lock(&s->mutex) != 0) {
2114 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2115 e5a0f69f 2018-08-18 stsp goto done;
2117 e5a0f69f 2018-08-18 stsp if (thread_err)
2119 e5a0f69f 2018-08-18 stsp SIMPLEQ_REMOVE_HEAD(&s->blamed_commits, entry);
2120 e5a0f69f 2018-08-18 stsp got_object_qid_free(s->blamed_commit);
2121 e5a0f69f 2018-08-18 stsp s->blamed_commit =
2122 e5a0f69f 2018-08-18 stsp SIMPLEQ_FIRST(&s->blamed_commits);
2123 e5a0f69f 2018-08-18 stsp err = run_blame(&s->blame, &s->mutex, view,
2124 e5a0f69f 2018-08-18 stsp &s->blame_complete,
2125 e5a0f69f 2018-08-18 stsp &s->first_displayed_line,
2126 e5a0f69f 2018-08-18 stsp &s->last_displayed_line,
2127 e5a0f69f 2018-08-18 stsp &s->selected_line, &s->done, &s->eof, s->path,
2128 e5a0f69f 2018-08-18 stsp s->blamed_commit->id, s->repo);
2133 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2134 e5a0f69f 2018-08-18 stsp case '\r':
2135 e5a0f69f 2018-08-18 stsp err = open_selected_commit(&pobj, &obj,
2136 e5a0f69f 2018-08-18 stsp s->blame.lines, s->first_displayed_line,
2137 e5a0f69f 2018-08-18 stsp s->selected_line, s->repo);
2140 e5a0f69f 2018-08-18 stsp if (pobj == NULL && obj == NULL)
2142 e5a0f69f 2018-08-18 stsp diff_view = view_open(0, 0, 0, 0, view,
2143 e5a0f69f 2018-08-18 stsp TOG_VIEW_DIFF);
2144 e5a0f69f 2018-08-18 stsp if (diff_view == NULL) {
2145 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2148 e5a0f69f 2018-08-18 stsp err = open_diff_view(diff_view, pobj, obj,
2150 e5a0f69f 2018-08-18 stsp if (err) {
2151 e5a0f69f 2018-08-18 stsp view_close(diff_view);
2154 e5a0f69f 2018-08-18 stsp *new_view = diff_view;
2155 e5a0f69f 2018-08-18 stsp if (pobj) {
2156 e5a0f69f 2018-08-18 stsp got_object_close(pobj);
2157 e5a0f69f 2018-08-18 stsp pobj = NULL;
2159 e5a0f69f 2018-08-18 stsp got_object_close(obj);
2160 e5a0f69f 2018-08-18 stsp obj = NULL;
2164 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2166 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line >= s->blame.nlines &&
2167 e5a0f69f 2018-08-18 stsp s->selected_line < view->nlines - 2) {
2168 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2169 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2172 e5a0f69f 2018-08-18 stsp if (s->last_displayed_line + view->nlines - 2
2173 e5a0f69f 2018-08-18 stsp <= s->blame.nlines)
2174 e5a0f69f 2018-08-18 stsp s->first_displayed_line +=
2175 e5a0f69f 2018-08-18 stsp view->nlines - 2;
2177 e5a0f69f 2018-08-18 stsp s->first_displayed_line =
2178 e5a0f69f 2018-08-18 stsp s->blame.nlines -
2179 e5a0f69f 2018-08-18 stsp (view->nlines - 3);
2181 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
2182 e5a0f69f 2018-08-18 stsp if (s->selected_line > view->nlines - 2) {
2183 e5a0f69f 2018-08-18 stsp s->selected_line = MIN(s->blame.nlines,
2184 e5a0f69f 2018-08-18 stsp view->nlines - 2);
2191 e5a0f69f 2018-08-18 stsp if (pthread_mutex_unlock(&s->mutex) != 0)
2192 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2195 b880a918 2018-07-10 stsp got_object_close(pobj);
2196 245d91c1 2018-07-12 stsp return thread_err ? thread_err : err;
2199 a70480e0 2018-06-23 stsp static const struct got_error *
2200 9f7d7167 2018-04-29 stsp cmd_blame(int argc, char *argv[])
2202 a70480e0 2018-06-23 stsp const struct got_error *error;
2203 a70480e0 2018-06-23 stsp struct got_repository *repo = NULL;
2204 69069811 2018-08-02 stsp char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2205 a70480e0 2018-06-23 stsp struct got_object_id *commit_id = NULL;
2206 a70480e0 2018-06-23 stsp char *commit_id_str = NULL;
2208 e1cd8fed 2018-08-01 stsp struct tog_view *view;
2210 a70480e0 2018-06-23 stsp #ifndef PROFILE
2211 a70480e0 2018-06-23 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
2212 a70480e0 2018-06-23 stsp err(1, "pledge");
2215 69069811 2018-08-02 stsp while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2216 a70480e0 2018-06-23 stsp switch (ch) {
2218 a70480e0 2018-06-23 stsp commit_id_str = optarg;
2221 69069811 2018-08-02 stsp repo_path = realpath(optarg, NULL);
2222 69069811 2018-08-02 stsp if (repo_path == NULL)
2223 69069811 2018-08-02 stsp err(1, "-r option");
2227 a70480e0 2018-06-23 stsp /* NOTREACHED */
2231 a70480e0 2018-06-23 stsp argc -= optind;
2232 a70480e0 2018-06-23 stsp argv += optind;
2234 69069811 2018-08-02 stsp if (argc == 1)
2235 69069811 2018-08-02 stsp path = argv[0];
2237 a70480e0 2018-06-23 stsp usage_blame();
2239 69069811 2018-08-02 stsp cwd = getcwd(NULL, 0);
2240 69069811 2018-08-02 stsp if (cwd == NULL) {
2241 69069811 2018-08-02 stsp error = got_error_from_errno();
2242 69069811 2018-08-02 stsp goto done;
2244 69069811 2018-08-02 stsp if (repo_path == NULL) {
2245 69069811 2018-08-02 stsp repo_path = strdup(cwd);
2246 69069811 2018-08-02 stsp if (repo_path == NULL) {
2247 69069811 2018-08-02 stsp error = got_error_from_errno();
2248 69069811 2018-08-02 stsp goto done;
2253 69069811 2018-08-02 stsp error = got_repo_open(&repo, repo_path);
2254 a70480e0 2018-06-23 stsp if (error != NULL)
2255 66b4983c 2018-06-23 stsp return error;
2257 69069811 2018-08-02 stsp error = got_repo_map_path(&in_repo_path, repo, path);
2258 69069811 2018-08-02 stsp if (error != NULL)
2259 69069811 2018-08-02 stsp goto done;
2261 a70480e0 2018-06-23 stsp if (commit_id_str == NULL) {
2262 a70480e0 2018-06-23 stsp struct got_reference *head_ref;
2263 a70480e0 2018-06-23 stsp error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
2264 a70480e0 2018-06-23 stsp if (error != NULL)
2265 66b4983c 2018-06-23 stsp goto done;
2266 a70480e0 2018-06-23 stsp error = got_ref_resolve(&commit_id, repo, head_ref);
2267 a70480e0 2018-06-23 stsp got_ref_close(head_ref);
2269 a70480e0 2018-06-23 stsp struct got_object *obj;
2270 a70480e0 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_str);
2271 a70480e0 2018-06-23 stsp if (error != NULL)
2272 66b4983c 2018-06-23 stsp goto done;
2273 a70480e0 2018-06-23 stsp commit_id = got_object_get_id(obj);
2274 a19e88aa 2018-06-23 stsp if (commit_id == NULL)
2275 66b4983c 2018-06-23 stsp error = got_error_from_errno();
2276 a19e88aa 2018-06-23 stsp got_object_close(obj);
2278 a19e88aa 2018-06-23 stsp if (error != NULL)
2279 a19e88aa 2018-06-23 stsp goto done;
2281 b3665f43 2018-08-04 stsp view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_BLAME);
2282 e1cd8fed 2018-08-01 stsp if (view == NULL) {
2283 e1cd8fed 2018-08-01 stsp error = got_error_from_errno();
2284 e1cd8fed 2018-08-01 stsp goto done;
2286 7cbe629d 2018-08-04 stsp error = open_blame_view(view, in_repo_path, commit_id, repo);
2287 7cbe629d 2018-08-04 stsp if (error)
2288 7cbe629d 2018-08-04 stsp goto done;
2289 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2291 69069811 2018-08-02 stsp free(repo_path);
2292 69069811 2018-08-02 stsp free(cwd);
2293 a70480e0 2018-06-23 stsp free(commit_id);
2295 a70480e0 2018-06-23 stsp got_repo_close(repo);
2296 a70480e0 2018-06-23 stsp return error;
2299 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2300 f7d12f7e 2018-08-01 stsp draw_tree_entries(struct tog_view *view,
2301 f7d12f7e 2018-08-01 stsp struct got_tree_entry **first_displayed_entry,
2302 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **last_displayed_entry,
2303 ffd1d5e5 2018-06-23 stsp struct got_tree_entry **selected_entry, int *ndisplayed,
2304 f7d12f7e 2018-08-01 stsp const char *label, int show_ids, const char *parent_path,
2305 ce52c690 2018-06-23 stsp const struct got_tree_entries *entries, int selected, int limit, int isroot)
2307 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
2308 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te;
2309 ffd1d5e5 2018-06-23 stsp wchar_t *wline;
2310 ffd1d5e5 2018-06-23 stsp int width, n;
2312 ffd1d5e5 2018-06-23 stsp *ndisplayed = 0;
2314 f7d12f7e 2018-08-01 stsp werase(view->window);
2316 ffd1d5e5 2018-06-23 stsp if (limit == 0)
2317 ffd1d5e5 2018-06-23 stsp return NULL;
2319 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, label, view->ncols);
2321 ffd1d5e5 2018-06-23 stsp return err;
2322 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2323 2550e4c3 2018-07-13 stsp free(wline);
2324 2550e4c3 2018-07-13 stsp wline = NULL;
2325 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2326 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2327 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2328 ffd1d5e5 2018-06-23 stsp return NULL;
2329 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, parent_path, view->ncols);
2331 ce52c690 2018-06-23 stsp return err;
2332 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2333 2550e4c3 2018-07-13 stsp free(wline);
2334 2550e4c3 2018-07-13 stsp wline = NULL;
2335 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2336 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2337 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2338 ffd1d5e5 2018-06-23 stsp return NULL;
2339 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2340 a1eca9bb 2018-06-23 stsp if (--limit <= 0)
2341 a1eca9bb 2018-06-23 stsp return NULL;
2343 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2344 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL) {
2345 ffd1d5e5 2018-06-23 stsp if (selected == 0) {
2346 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2347 ffd1d5e5 2018-06-23 stsp *selected_entry = NULL;
2349 f7d12f7e 2018-08-01 stsp waddstr(view->window, " ..\n"); /* parent directory */
2350 ffd1d5e5 2018-06-23 stsp if (selected == 0)
2351 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2352 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2353 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2354 ffd1d5e5 2018-06-23 stsp return NULL;
2358 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry)
2359 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2362 ffd1d5e5 2018-06-23 stsp while (te) {
2363 1d13200f 2018-07-12 stsp char *line = NULL, *id_str = NULL;
2365 1d13200f 2018-07-12 stsp if (show_ids) {
2366 1d13200f 2018-07-12 stsp err = got_object_id_str(&id_str, te->id);
2368 1d13200f 2018-07-12 stsp return got_error_from_errno();
2370 1d13200f 2018-07-12 stsp if (asprintf(&line, "%s %s%s", id_str ? id_str : "",
2371 1d13200f 2018-07-12 stsp te->name, S_ISDIR(te->mode) ? "/" : "") == -1) {
2372 1d13200f 2018-07-12 stsp free(id_str);
2373 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2375 1d13200f 2018-07-12 stsp free(id_str);
2376 f7d12f7e 2018-08-01 stsp err = format_line(&wline, &width, line, view->ncols);
2377 ffd1d5e5 2018-06-23 stsp if (err) {
2378 ffd1d5e5 2018-06-23 stsp free(line);
2381 ffd1d5e5 2018-06-23 stsp if (n == selected) {
2382 f7d12f7e 2018-08-01 stsp wstandout(view->window);
2383 ffd1d5e5 2018-06-23 stsp *selected_entry = te;
2385 f7d12f7e 2018-08-01 stsp waddwstr(view->window, wline);
2386 f7d12f7e 2018-08-01 stsp if (width < view->ncols)
2387 f7d12f7e 2018-08-01 stsp waddch(view->window, '\n');
2388 ffd1d5e5 2018-06-23 stsp if (n == selected)
2389 f7d12f7e 2018-08-01 stsp wstandend(view->window);
2390 ffd1d5e5 2018-06-23 stsp free(line);
2391 2550e4c3 2018-07-13 stsp free(wline);
2392 2550e4c3 2018-07-13 stsp wline = NULL;
2394 ffd1d5e5 2018-06-23 stsp (*ndisplayed)++;
2395 ffd1d5e5 2018-06-23 stsp *last_displayed_entry = te;
2396 ffd1d5e5 2018-06-23 stsp if (--limit <= 0)
2398 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2401 ffd1d5e5 2018-06-23 stsp return err;
2404 ffd1d5e5 2018-06-23 stsp static void
2405 ffd1d5e5 2018-06-23 stsp tree_scroll_up(struct got_tree_entry **first_displayed_entry, int maxscroll,
2406 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries, int isroot)
2408 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *te, *prev;
2411 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == NULL)
2414 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2415 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry == te) {
2416 ffd1d5e5 2018-06-23 stsp if (!isroot)
2417 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
2421 ffd1d5e5 2018-06-23 stsp /* XXX this is stupid... switch to TAILQ? */
2422 ffd1d5e5 2018-06-23 stsp for (i = 0; i < maxscroll; i++) {
2423 ffd1d5e5 2018-06-23 stsp while (te != *first_displayed_entry) {
2424 ffd1d5e5 2018-06-23 stsp prev = te;
2425 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_NEXT(te, entry);
2427 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = prev;
2428 ffd1d5e5 2018-06-23 stsp te = SIMPLEQ_FIRST(&entries->head);
2430 ffd1d5e5 2018-06-23 stsp if (!isroot && te == SIMPLEQ_FIRST(&entries->head) && i < maxscroll)
2431 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = NULL;
2434 ffd1d5e5 2018-06-23 stsp static void
2435 ffd1d5e5 2018-06-23 stsp tree_scroll_down(struct got_tree_entry **first_displayed_entry, int maxscroll,
2436 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *last_displayed_entry,
2437 ffd1d5e5 2018-06-23 stsp const struct got_tree_entries *entries)
2439 ffd1d5e5 2018-06-23 stsp struct got_tree_entry *next;
2440 ffd1d5e5 2018-06-23 stsp int n = 0;
2442 ffd1d5e5 2018-06-23 stsp if (SIMPLEQ_NEXT(last_displayed_entry, entry) == NULL)
2445 ffd1d5e5 2018-06-23 stsp if (*first_displayed_entry)
2446 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(*first_displayed_entry, entry);
2448 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_FIRST(&entries->head);
2449 ffd1d5e5 2018-06-23 stsp while (next) {
2450 ffd1d5e5 2018-06-23 stsp *first_displayed_entry = next;
2451 ffd1d5e5 2018-06-23 stsp if (++n >= maxscroll)
2453 ffd1d5e5 2018-06-23 stsp next = SIMPLEQ_NEXT(next, entry);
2457 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2458 ce52c690 2018-06-23 stsp tree_entry_path(char **path, struct tog_parent_trees *parents,
2459 ce52c690 2018-06-23 stsp struct got_tree_entry *te)
2461 cb2ebc8a 2018-06-23 stsp const struct got_error *err = NULL;
2462 ffd1d5e5 2018-06-23 stsp struct tog_parent_tree *pt;
2463 ffd1d5e5 2018-06-23 stsp size_t len = 2; /* for leading slash and NUL */
2465 d9765a41 2018-06-23 stsp TAILQ_FOREACH(pt, parents, entry)
2466 ffd1d5e5 2018-06-23 stsp len += strlen(pt->selected_entry->name) + 1 /* slash */;
2468 ce52c690 2018-06-23 stsp len += strlen(te->name);
2470 ce52c690 2018-06-23 stsp *path = calloc(1, len);
2471 ffd1d5e5 2018-06-23 stsp if (path == NULL)
2472 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2474 ce52c690 2018-06-23 stsp (*path)[0] = '/';
2475 d9765a41 2018-06-23 stsp pt = TAILQ_LAST(parents, tog_parent_trees);
2476 d9765a41 2018-06-23 stsp while (pt) {
2477 ce52c690 2018-06-23 stsp if (strlcat(*path, pt->selected_entry->name, len) >= len) {
2478 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
2479 cb2ebc8a 2018-06-23 stsp goto done;
2481 ce52c690 2018-06-23 stsp if (strlcat(*path, "/", len) >= len) {
2482 cb2ebc8a 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
2483 cb2ebc8a 2018-06-23 stsp goto done;
2485 d9765a41 2018-06-23 stsp pt = TAILQ_PREV(pt, tog_parent_trees, entry);
2488 ce52c690 2018-06-23 stsp if (strlcat(*path, te->name, len) >= len) {
2489 ce52c690 2018-06-23 stsp err = got_error(GOT_ERR_NO_SPACE);
2490 ce52c690 2018-06-23 stsp goto done;
2494 ce52c690 2018-06-23 stsp if (err) {
2495 ce52c690 2018-06-23 stsp free(*path);
2496 ce52c690 2018-06-23 stsp *path = NULL;
2498 ce52c690 2018-06-23 stsp return err;
2501 ce52c690 2018-06-23 stsp static const struct got_error *
2502 e5a0f69f 2018-08-18 stsp blame_tree_entry(struct tog_view **new_view, struct tog_view *parent_view,
2503 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
2504 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
2506 ce52c690 2018-06-23 stsp const struct got_error *err = NULL;
2507 ce52c690 2018-06-23 stsp char *path;
2508 e5a0f69f 2018-08-18 stsp struct tog_view *blame_view;
2510 ce52c690 2018-06-23 stsp err = tree_entry_path(&path, parents, te);
2512 ce52c690 2018-06-23 stsp return err;
2514 e5a0f69f 2018-08-18 stsp blame_view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_BLAME);
2515 e5a0f69f 2018-08-18 stsp if (blame_view == NULL)
2516 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2518 e5a0f69f 2018-08-18 stsp err = open_blame_view(blame_view, path, commit_id, repo);
2519 e5a0f69f 2018-08-18 stsp if (err) {
2520 e5a0f69f 2018-08-18 stsp view_close(blame_view);
2521 e5a0f69f 2018-08-18 stsp free(path);
2523 e5a0f69f 2018-08-18 stsp *new_view = blame_view;
2524 69efd4c4 2018-07-18 stsp return err;
2527 69efd4c4 2018-07-18 stsp static const struct got_error *
2528 e5a0f69f 2018-08-18 stsp log_tree_entry(struct tog_view **new_view, struct tog_view *parent_view,
2529 e5a0f69f 2018-08-18 stsp struct got_tree_entry *te, struct tog_parent_trees *parents,
2530 e5a0f69f 2018-08-18 stsp struct got_object_id *commit_id, struct got_repository *repo)
2532 e5a0f69f 2018-08-18 stsp struct tog_view *log_view;
2533 69efd4c4 2018-07-18 stsp const struct got_error *err = NULL;
2534 69efd4c4 2018-07-18 stsp char *path;
2536 e5a0f69f 2018-08-18 stsp log_view = view_open(0, 0, 0, 0, parent_view, TOG_VIEW_LOG);
2537 e5a0f69f 2018-08-18 stsp if (log_view == NULL)
2538 e5a0f69f 2018-08-18 stsp return got_error_from_errno();
2540 69efd4c4 2018-07-18 stsp err = tree_entry_path(&path, parents, te);
2542 69efd4c4 2018-07-18 stsp return err;
2544 e5a0f69f 2018-08-18 stsp err = open_log_view(log_view, commit_id, repo, path);
2546 e5a0f69f 2018-08-18 stsp view_close(log_view);
2548 e5a0f69f 2018-08-18 stsp *new_view = log_view;
2549 cb2ebc8a 2018-06-23 stsp free(path);
2550 cb2ebc8a 2018-06-23 stsp return err;
2553 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2554 ad80ab7b 2018-08-04 stsp open_tree_view(struct tog_view *view, struct got_tree_object *root,
2555 5221c383 2018-08-01 stsp struct got_object_id *commit_id, struct got_repository *repo)
2557 ffd1d5e5 2018-06-23 stsp const struct got_error *err = NULL;
2558 ad80ab7b 2018-08-04 stsp char *commit_id_str = NULL;
2559 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
2561 fb2756b9 2018-08-04 stsp TAILQ_INIT(&s->parents);
2563 ffd1d5e5 2018-06-23 stsp err = got_object_id_str(&commit_id_str, commit_id);
2564 ffd1d5e5 2018-06-23 stsp if (err != NULL)
2565 ffd1d5e5 2018-06-23 stsp goto done;
2567 fb2756b9 2018-08-04 stsp if (asprintf(&s->tree_label, "commit: %s", commit_id_str) == -1) {
2568 ffd1d5e5 2018-06-23 stsp err = got_error_from_errno();
2569 ffd1d5e5 2018-06-23 stsp goto done;
2572 fb2756b9 2018-08-04 stsp s->root = s->tree = root;
2573 fb2756b9 2018-08-04 stsp s->entries = got_object_tree_get_entries(root);
2574 fb2756b9 2018-08-04 stsp s->first_displayed_entry = SIMPLEQ_FIRST(&s->entries->head);
2575 fb2756b9 2018-08-04 stsp s->commit_id = commit_id;
2576 fb2756b9 2018-08-04 stsp s->repo = repo;
2578 e5a0f69f 2018-08-18 stsp view->show = show_tree_view;
2579 e5a0f69f 2018-08-18 stsp view->input = input_tree_view;
2580 e5a0f69f 2018-08-18 stsp view->close = close_tree_view;
2582 ad80ab7b 2018-08-04 stsp free(commit_id_str);
2584 fb2756b9 2018-08-04 stsp free(s->tree_label);
2585 ad80ab7b 2018-08-04 stsp return err;
2588 e5a0f69f 2018-08-18 stsp static const struct got_error *
2589 ad80ab7b 2018-08-04 stsp close_tree_view(struct tog_view *view)
2591 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
2593 fb2756b9 2018-08-04 stsp free(s->tree_label);
2594 fb2756b9 2018-08-04 stsp while (!TAILQ_EMPTY(&s->parents)) {
2595 ad80ab7b 2018-08-04 stsp struct tog_parent_tree *parent;
2596 fb2756b9 2018-08-04 stsp parent = TAILQ_FIRST(&s->parents);
2597 fb2756b9 2018-08-04 stsp TAILQ_REMOVE(&s->parents, parent, entry);
2598 ad80ab7b 2018-08-04 stsp free(parent);
2601 fb2756b9 2018-08-04 stsp if (s->tree != s->root)
2602 fb2756b9 2018-08-04 stsp got_object_tree_close(s->tree);
2603 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->root);
2605 e5a0f69f 2018-08-18 stsp return NULL;
2608 ad80ab7b 2018-08-04 stsp static const struct got_error *
2609 ad80ab7b 2018-08-04 stsp show_tree_view(struct tog_view *view)
2611 ad80ab7b 2018-08-04 stsp const struct got_error *err = NULL;
2612 fb2756b9 2018-08-04 stsp struct tog_tree_view_state *s = &view->state.tree;
2613 e5a0f69f 2018-08-18 stsp char *parent_path;
2615 e5a0f69f 2018-08-18 stsp err = tree_entry_path(&parent_path, &s->parents, NULL);
2617 e5a0f69f 2018-08-18 stsp return err;
2619 e5a0f69f 2018-08-18 stsp err = draw_tree_entries(view, &s->first_displayed_entry,
2620 e5a0f69f 2018-08-18 stsp &s->last_displayed_entry, &s->selected_entry,
2621 e5a0f69f 2018-08-18 stsp &s->ndisplayed, s->tree_label, s->show_ids, parent_path,
2622 e5a0f69f 2018-08-18 stsp s->entries, s->selected, view->nlines, s->tree == s->root);
2623 e5a0f69f 2018-08-18 stsp free(parent_path);
2624 e5a0f69f 2018-08-18 stsp return err;
2627 e5a0f69f 2018-08-18 stsp static const struct got_error *
2628 e5a0f69f 2018-08-18 stsp input_tree_view(struct tog_view **new_view, struct tog_view **dead_view,
2629 e5a0f69f 2018-08-18 stsp struct tog_view *view, int ch)
2631 e5a0f69f 2018-08-18 stsp const struct got_error *err = NULL;
2632 e5a0f69f 2018-08-18 stsp struct tog_tree_view_state *s = &view->state.tree;
2634 e5a0f69f 2018-08-18 stsp switch (ch) {
2636 e5a0f69f 2018-08-18 stsp s->show_ids = !s->show_ids;
2639 e5a0f69f 2018-08-18 stsp if (s->selected_entry) {
2640 e5a0f69f 2018-08-18 stsp err = log_tree_entry(new_view, view,
2641 e5a0f69f 2018-08-18 stsp s->selected_entry, &s->parents,
2642 e5a0f69f 2018-08-18 stsp s->commit_id, s->repo);
2646 e5a0f69f 2018-08-18 stsp case KEY_UP:
2647 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
2648 e5a0f69f 2018-08-18 stsp s->selected--;
2649 e5a0f69f 2018-08-18 stsp if (s->selected > 0)
2651 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry, 1,
2652 e5a0f69f 2018-08-18 stsp s->entries, s->tree == s->root);
2654 e5a0f69f 2018-08-18 stsp case KEY_PPAGE:
2655 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_FIRST(&s->entries->head) ==
2656 e5a0f69f 2018-08-18 stsp s->first_displayed_entry) {
2657 e5a0f69f 2018-08-18 stsp if (s->tree != s->root)
2658 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
2659 e5a0f69f 2018-08-18 stsp s->selected = 0;
2662 e5a0f69f 2018-08-18 stsp tree_scroll_up(&s->first_displayed_entry,
2663 e5a0f69f 2018-08-18 stsp view->nlines, s->entries,
2664 e5a0f69f 2018-08-18 stsp s->tree == s->root);
2667 e5a0f69f 2018-08-18 stsp case KEY_DOWN:
2668 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1) {
2669 e5a0f69f 2018-08-18 stsp s->selected++;
2672 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry, 1,
2673 e5a0f69f 2018-08-18 stsp s->last_displayed_entry, s->entries);
2675 e5a0f69f 2018-08-18 stsp case KEY_NPAGE:
2676 e5a0f69f 2018-08-18 stsp tree_scroll_down(&s->first_displayed_entry,
2677 e5a0f69f 2018-08-18 stsp view->nlines, s->last_displayed_entry,
2678 e5a0f69f 2018-08-18 stsp s->entries);
2679 e5a0f69f 2018-08-18 stsp if (SIMPLEQ_NEXT(s->last_displayed_entry,
2682 e5a0f69f 2018-08-18 stsp /* can't scroll any further; move cursor down */
2683 e5a0f69f 2018-08-18 stsp if (s->selected < s->ndisplayed - 1)
2684 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
2686 e5a0f69f 2018-08-18 stsp case KEY_ENTER:
2687 e5a0f69f 2018-08-18 stsp case '\r':
2688 e5a0f69f 2018-08-18 stsp if (s->selected_entry == NULL) {
2689 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
2690 e5a0f69f 2018-08-18 stsp case KEY_BACKSPACE:
2691 e5a0f69f 2018-08-18 stsp /* user selected '..' */
2692 e5a0f69f 2018-08-18 stsp if (s->tree == s->root)
2694 e5a0f69f 2018-08-18 stsp parent = TAILQ_FIRST(&s->parents);
2695 e5a0f69f 2018-08-18 stsp TAILQ_REMOVE(&s->parents, parent,
2697 e5a0f69f 2018-08-18 stsp got_object_tree_close(s->tree);
2698 e5a0f69f 2018-08-18 stsp s->tree = parent->tree;
2699 e5a0f69f 2018-08-18 stsp s->entries =
2700 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
2701 e5a0f69f 2018-08-18 stsp s->first_displayed_entry =
2702 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry;
2703 e5a0f69f 2018-08-18 stsp s->selected_entry =
2704 e5a0f69f 2018-08-18 stsp parent->selected_entry;
2705 e5a0f69f 2018-08-18 stsp s->selected = parent->selected;
2706 e5a0f69f 2018-08-18 stsp free(parent);
2707 e5a0f69f 2018-08-18 stsp } else if (S_ISDIR(s->selected_entry->mode)) {
2708 e5a0f69f 2018-08-18 stsp struct tog_parent_tree *parent;
2709 e5a0f69f 2018-08-18 stsp struct got_tree_object *child;
2710 e5a0f69f 2018-08-18 stsp err = got_object_open_as_tree(&child,
2711 e5a0f69f 2018-08-18 stsp s->repo, s->selected_entry->id);
2714 e5a0f69f 2018-08-18 stsp parent = calloc(1, sizeof(*parent));
2715 e5a0f69f 2018-08-18 stsp if (parent == NULL) {
2716 e5a0f69f 2018-08-18 stsp err = got_error_from_errno();
2719 e5a0f69f 2018-08-18 stsp parent->tree = s->tree;
2720 e5a0f69f 2018-08-18 stsp parent->first_displayed_entry =
2721 e5a0f69f 2018-08-18 stsp s->first_displayed_entry;
2722 e5a0f69f 2018-08-18 stsp parent->selected_entry = s->selected_entry;
2723 e5a0f69f 2018-08-18 stsp parent->selected = s->selected;
2724 e5a0f69f 2018-08-18 stsp TAILQ_INSERT_HEAD(&s->parents, parent, entry);
2725 e5a0f69f 2018-08-18 stsp s->tree = child;
2726 e5a0f69f 2018-08-18 stsp s->entries =
2727 e5a0f69f 2018-08-18 stsp got_object_tree_get_entries(s->tree);
2728 e5a0f69f 2018-08-18 stsp s->selected = 0;
2729 e5a0f69f 2018-08-18 stsp s->first_displayed_entry = NULL;
2730 e5a0f69f 2018-08-18 stsp } else if (S_ISREG(s->selected_entry->mode)) {
2731 e5a0f69f 2018-08-18 stsp err = blame_tree_entry(new_view, view,
2732 e5a0f69f 2018-08-18 stsp s->selected_entry, &s->parents,
2733 e5a0f69f 2018-08-18 stsp s->commit_id, s->repo);
2738 e5a0f69f 2018-08-18 stsp case KEY_RESIZE:
2739 e5a0f69f 2018-08-18 stsp if (s->selected > view->nlines)
2740 e5a0f69f 2018-08-18 stsp s->selected = s->ndisplayed - 1;
2746 ffd1d5e5 2018-06-23 stsp return err;
2749 ffd1d5e5 2018-06-23 stsp __dead static void
2750 ffd1d5e5 2018-06-23 stsp usage_tree(void)
2753 ffd1d5e5 2018-06-23 stsp fprintf(stderr, "usage: %s tree [-c commit] [repository-path]\n",
2754 ffd1d5e5 2018-06-23 stsp getprogname());
2758 ffd1d5e5 2018-06-23 stsp static const struct got_error *
2759 ffd1d5e5 2018-06-23 stsp cmd_tree(int argc, char *argv[])
2761 ffd1d5e5 2018-06-23 stsp const struct got_error *error;
2762 ffd1d5e5 2018-06-23 stsp struct got_repository *repo = NULL;
2763 ffd1d5e5 2018-06-23 stsp char *repo_path = NULL;
2764 ffd1d5e5 2018-06-23 stsp struct got_object_id *commit_id = NULL;
2765 ffd1d5e5 2018-06-23 stsp char *commit_id_arg = NULL;
2766 ffd1d5e5 2018-06-23 stsp struct got_commit_object *commit = NULL;
2767 ffd1d5e5 2018-06-23 stsp struct got_tree_object *tree = NULL;
2769 5221c383 2018-08-01 stsp struct tog_view *view;
2771 ffd1d5e5 2018-06-23 stsp #ifndef PROFILE
2772 ffd1d5e5 2018-06-23 stsp if (pledge("stdio rpath wpath cpath flock proc tty", NULL) == -1)
2773 ffd1d5e5 2018-06-23 stsp err(1, "pledge");
2776 ffd1d5e5 2018-06-23 stsp while ((ch = getopt(argc, argv, "c:")) != -1) {
2777 ffd1d5e5 2018-06-23 stsp switch (ch) {
2779 ffd1d5e5 2018-06-23 stsp commit_id_arg = optarg;
2783 ffd1d5e5 2018-06-23 stsp /* NOTREACHED */
2787 ffd1d5e5 2018-06-23 stsp argc -= optind;
2788 ffd1d5e5 2018-06-23 stsp argv += optind;
2790 ffd1d5e5 2018-06-23 stsp if (argc == 0) {
2791 ffd1d5e5 2018-06-23 stsp repo_path = getcwd(NULL, 0);
2792 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
2793 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2794 ffd1d5e5 2018-06-23 stsp } else if (argc == 1) {
2795 ffd1d5e5 2018-06-23 stsp repo_path = realpath(argv[0], NULL);
2796 ffd1d5e5 2018-06-23 stsp if (repo_path == NULL)
2797 ffd1d5e5 2018-06-23 stsp return got_error_from_errno();
2799 ffd1d5e5 2018-06-23 stsp usage_log();
2801 ffd1d5e5 2018-06-23 stsp error = got_repo_open(&repo, repo_path);
2802 ffd1d5e5 2018-06-23 stsp free(repo_path);
2803 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2804 ffd1d5e5 2018-06-23 stsp return error;
2806 ffd1d5e5 2018-06-23 stsp if (commit_id_arg == NULL) {
2807 ffd1d5e5 2018-06-23 stsp error = get_head_commit_id(&commit_id, repo);
2808 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2809 ffd1d5e5 2018-06-23 stsp goto done;
2811 ffd1d5e5 2018-06-23 stsp struct got_object *obj;
2812 ffd1d5e5 2018-06-23 stsp error = got_object_open_by_id_str(&obj, repo, commit_id_arg);
2813 ffd1d5e5 2018-06-23 stsp if (error == NULL) {
2814 ffd1d5e5 2018-06-23 stsp commit_id = got_object_get_id(obj);
2815 ffd1d5e5 2018-06-23 stsp if (commit_id == NULL)
2816 ffd1d5e5 2018-06-23 stsp error = got_error_from_errno();
2819 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2820 ffd1d5e5 2018-06-23 stsp goto done;
2822 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_commit(&commit, repo, commit_id);
2823 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2824 ffd1d5e5 2018-06-23 stsp goto done;
2826 ffd1d5e5 2018-06-23 stsp error = got_object_open_as_tree(&tree, repo, commit->tree_id);
2827 ffd1d5e5 2018-06-23 stsp if (error != NULL)
2828 ffd1d5e5 2018-06-23 stsp goto done;
2830 b3665f43 2018-08-04 stsp view = view_open(0, 0, 0, 0, NULL, TOG_VIEW_TREE);
2831 5221c383 2018-08-01 stsp if (view == NULL) {
2832 5221c383 2018-08-01 stsp error = got_error_from_errno();
2833 5221c383 2018-08-01 stsp goto done;
2835 ad80ab7b 2018-08-04 stsp error = open_tree_view(view, tree, commit_id, repo);
2836 ad80ab7b 2018-08-04 stsp if (error)
2837 ad80ab7b 2018-08-04 stsp goto done;
2838 e5a0f69f 2018-08-18 stsp error = view_loop(view);
2840 ffd1d5e5 2018-06-23 stsp free(commit_id);
2841 ffd1d5e5 2018-06-23 stsp if (commit)
2842 ffd1d5e5 2018-06-23 stsp got_object_commit_close(commit);
2844 ffd1d5e5 2018-06-23 stsp got_object_tree_close(tree);
2846 ffd1d5e5 2018-06-23 stsp got_repo_close(repo);
2847 ffd1d5e5 2018-06-23 stsp return error;
2849 5c5136c5 2018-05-20 stsp static void
2850 9f7d7167 2018-04-29 stsp init_curses(void)
2852 9f7d7167 2018-04-29 stsp initscr();
2856 9f7d7167 2018-04-29 stsp intrflush(stdscr, FALSE);
2857 9f7d7167 2018-04-29 stsp keypad(stdscr, TRUE);
2858 1f475ad8 2018-05-10 stsp curs_set(0);
2861 4ed7e80c 2018-05-20 stsp __dead static void
2862 9f7d7167 2018-04-29 stsp usage(void)
2866 c2301be8 2018-04-30 stsp fprintf(stderr, "usage: %s [-h] [command] [arg ...]\n\n"
2867 9f7d7167 2018-04-29 stsp "Available commands:\n", getprogname());
2868 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
2869 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = &tog_commands[i];
2870 c2301be8 2018-04-30 stsp fprintf(stderr, " %s: %s\n", cmd->name, cmd->descr);
2875 c2301be8 2018-04-30 stsp static char **
2876 c2301be8 2018-04-30 stsp make_argv(const char *arg0, const char *arg1)
2878 c2301be8 2018-04-30 stsp char **argv;
2879 c2301be8 2018-04-30 stsp int argc = (arg1 == NULL ? 1 : 2);
2881 c2301be8 2018-04-30 stsp argv = calloc(argc, sizeof(char *));
2882 c2301be8 2018-04-30 stsp if (argv == NULL)
2883 c2301be8 2018-04-30 stsp err(1, "calloc");
2884 c2301be8 2018-04-30 stsp argv[0] = strdup(arg0);
2885 c2301be8 2018-04-30 stsp if (argv[0] == NULL)
2886 c2301be8 2018-04-30 stsp err(1, "calloc");
2887 c2301be8 2018-04-30 stsp if (arg1) {
2888 c2301be8 2018-04-30 stsp argv[1] = strdup(arg1);
2889 c2301be8 2018-04-30 stsp if (argv[1] == NULL)
2890 c2301be8 2018-04-30 stsp err(1, "calloc");
2893 c2301be8 2018-04-30 stsp return argv;
2897 9f7d7167 2018-04-29 stsp main(int argc, char *argv[])
2899 9f7d7167 2018-04-29 stsp const struct got_error *error = NULL;
2900 9f7d7167 2018-04-29 stsp struct tog_cmd *cmd = NULL;
2901 9f7d7167 2018-04-29 stsp int ch, hflag = 0;
2902 c2301be8 2018-04-30 stsp char **cmd_argv = NULL;
2904 9f7d7167 2018-04-29 stsp setlocale(LC_ALL, "");
2906 9f7d7167 2018-04-29 stsp while ((ch = getopt(argc, argv, "h")) != -1) {
2907 9f7d7167 2018-04-29 stsp switch (ch) {
2909 9f7d7167 2018-04-29 stsp hflag = 1;
2913 9f7d7167 2018-04-29 stsp /* NOTREACHED */
2917 9f7d7167 2018-04-29 stsp argc -= optind;
2918 9f7d7167 2018-04-29 stsp argv += optind;
2919 9f7d7167 2018-04-29 stsp optind = 0;
2920 c2301be8 2018-04-30 stsp optreset = 1;
2922 c2301be8 2018-04-30 stsp if (argc == 0) {
2923 f29d3e89 2018-06-23 stsp if (hflag)
2925 c2301be8 2018-04-30 stsp /* Build an argument vector which runs a default command. */
2926 9f7d7167 2018-04-29 stsp cmd = &tog_commands[0];
2927 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, NULL);
2932 c2301be8 2018-04-30 stsp /* Did the user specific a command? */
2933 9f7d7167 2018-04-29 stsp for (i = 0; i < nitems(tog_commands); i++) {
2934 c2301be8 2018-04-30 stsp if (strncmp(tog_commands[i].name, argv[0],
2935 9f7d7167 2018-04-29 stsp strlen(argv[0])) == 0) {
2936 9f7d7167 2018-04-29 stsp cmd = &tog_commands[i];
2937 9f7d7167 2018-04-29 stsp if (hflag)
2938 9f7d7167 2018-04-29 stsp tog_commands[i].cmd_usage();
2942 9f7d7167 2018-04-29 stsp if (cmd == NULL) {
2943 c2301be8 2018-04-30 stsp /* Did the user specify a repository? */
2944 c2301be8 2018-04-30 stsp char *repo_path = realpath(argv[0], NULL);
2945 c2301be8 2018-04-30 stsp if (repo_path) {
2946 c2301be8 2018-04-30 stsp struct got_repository *repo;
2947 c2301be8 2018-04-30 stsp error = got_repo_open(&repo, repo_path);
2948 c2301be8 2018-04-30 stsp if (error == NULL)
2949 c2301be8 2018-04-30 stsp got_repo_close(repo);
2951 ad7de8d9 2018-04-30 stsp error = got_error_from_errno();
2952 c2301be8 2018-04-30 stsp if (error) {
2953 f29d3e89 2018-06-23 stsp if (hflag) {
2954 f29d3e89 2018-06-23 stsp fprintf(stderr, "%s: '%s' is not a "
2955 f29d3e89 2018-06-23 stsp "known command\n", getprogname(),
2959 ad7de8d9 2018-04-30 stsp fprintf(stderr, "%s: '%s' is neither a known "
2960 ad7de8d9 2018-04-30 stsp "command nor a path to a repository\n",
2961 c2301be8 2018-04-30 stsp getprogname(), argv[0]);
2962 ad7de8d9 2018-04-30 stsp free(repo_path);
2965 c2301be8 2018-04-30 stsp cmd = &tog_commands[0];
2966 c2301be8 2018-04-30 stsp cmd_argv = make_argv(cmd->name, repo_path);
2968 c2301be8 2018-04-30 stsp free(repo_path);
2972 5c5136c5 2018-05-20 stsp init_curses();
2974 c2301be8 2018-04-30 stsp error = cmd->cmd_main(argc, cmd_argv ? cmd_argv : argv);
2975 9f7d7167 2018-04-29 stsp if (error)
2976 9f7d7167 2018-04-29 stsp goto done;
2979 c2301be8 2018-04-30 stsp free(cmd_argv);
2980 9f7d7167 2018-04-29 stsp if (error)
2981 9f7d7167 2018-04-29 stsp fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
