Rework last commit to show the simplified graph for --first-parent
[tig.git] / src / main.c
blobcc3d4d09b4f1e9d5242e7deaffe23867ce2a8c65
1 /* Copyright (c) 2006-2014 Jonas Fonseca <jonas.fonseca@gmail.com>
3 * This program is free software; you can redistribute it and/or
4 * modify it under the terms of the GNU General Public License as
5 * published by the Free Software Foundation; either version 2 of
6 * the License, or (at your option) any later version.
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
14 #include "tig/repo.h"
15 #include "tig/options.h"
16 #include "tig/parse.h"
17 #include "tig/watch.h"
18 #include "tig/graph.h"
19 #include "tig/display.h"
20 #include "tig/view.h"
21 #include "tig/draw.h"
22 #include "tig/git.h"
23 #include "tig/status.h"
24 #include "tig/stage.h"
25 #include "tig/main.h"
26 #include "tig/diff.h"
29 * Main view backend
32 DEFINE_ALLOCATOR(realloc_reflogs, char *, 32)
34 static void
35 main_register_commit(struct view *view, struct commit *commit, const char *ids, bool is_boundary)
37 struct main_state *state = view->private;
39 string_copy_rev(commit->id, ids);
40 if (state->with_graph)
41 graph_add_commit(&state->graph, &commit->graph, commit->id, ids, is_boundary);
44 static struct commit *
45 main_add_commit(struct view *view, enum line_type type, struct commit *template,
46 const char *title, bool custom)
48 struct main_state *state = view->private;
49 size_t titlelen;
50 struct commit *commit;
51 char buf[SIZEOF_STR / 2];
52 struct line *line;
54 /* FIXME: More graceful handling of titles; append "..." to
55 * shortened titles, etc. */
56 string_expand(buf, sizeof(buf), title, 1);
57 title = buf;
58 titlelen = strlen(title);
60 line = add_line_alloc(view, &commit, type, titlelen, custom);
61 if (!line)
62 return NULL;
64 *commit = *template;
65 strncpy(commit->title, title, titlelen);
66 state->graph.canvas = &commit->graph;
67 memset(template, 0, sizeof(*template));
68 state->reflogmsg[0] = 0;
70 view_column_info_update(view, line);
71 return commit;
74 static inline void
75 main_flush_commit(struct view *view, struct commit *commit)
77 if (*commit->id)
78 main_add_commit(view, LINE_MAIN_COMMIT, commit, "", FALSE);
81 static bool
82 main_add_changes_commit(struct view *view, enum line_type type, const char *parent, const char *title)
84 char ids[SIZEOF_STR] = NULL_ID " ";
85 struct main_state *state = view->private;
86 struct commit commit = {};
87 struct timeval now;
88 struct timezone tz;
90 if (!parent)
91 return TRUE;
93 if (*parent)
94 string_copy_rev(ids + STRING_SIZE(NULL_ID " "), parent);
95 else
96 ids[STRING_SIZE(NULL_ID)] = 0;
98 if (!gettimeofday(&now, &tz)) {
99 commit.time.tz = tz.tz_minuteswest * 60;
100 commit.time.sec = now.tv_sec - commit.time.tz;
103 commit.author = &unknown_ident;
104 main_register_commit(view, &commit, ids, FALSE);
105 if (!main_add_commit(view, type, &commit, title, TRUE))
106 return FALSE;
108 if (state->with_graph) {
109 if (*parent)
110 return graph_render_parents(&state->graph);
111 state->add_changes_parents = TRUE;
114 return TRUE;
117 static bool
118 main_add_changes_commits(struct view *view, struct main_state *state, const char *parent)
120 const char *staged_parent = NULL_ID;
121 const char *unstaged_parent = parent;
122 struct index_diff diff;
124 if (!index_diff(&diff, FALSE, FALSE))
125 return FALSE;
127 if (!diff.unstaged) {
128 unstaged_parent = NULL;
129 staged_parent = parent;
130 watch_apply(&view->watch, WATCH_INDEX_UNSTAGED_NO);
131 } else {
132 watch_apply(&view->watch, WATCH_INDEX_UNSTAGED_YES);
135 if (!diff.staged) {
136 staged_parent = NULL;
137 watch_apply(&view->watch, WATCH_INDEX_STAGED_NO);
138 } else {
139 watch_apply(&view->watch, WATCH_INDEX_STAGED_YES);
142 return main_add_changes_commit(view, LINE_STAT_STAGED, staged_parent, "Staged changes")
143 && main_add_changes_commit(view, LINE_STAT_UNSTAGED, unstaged_parent, "Unstaged changes");
146 static bool
147 main_check_argv(struct view *view, const char *argv[])
149 struct main_state *state = view->private;
150 bool with_reflog = FALSE;
151 int i;
153 for (i = 0; argv[i]; i++) {
154 const char *arg = argv[i];
155 struct rev_flags rev_flags = {};
157 if (!strcmp(arg, "--graph")) {
158 struct view_column *column = get_view_column(view, VIEW_COLUMN_COMMIT_TITLE);
160 if (column) {
161 column->opt.commit_title.graph = TRUE;
162 if (opt_commit_order != COMMIT_ORDER_REVERSE)
163 state->with_graph = TRUE;
165 argv[i] = "";
166 continue;
169 if (!strcmp(arg, "--first-parent"))
170 state->first_parent = TRUE;
172 if (!argv_parse_rev_flag(arg, &rev_flags))
173 continue;
175 if (rev_flags.with_reflog)
176 with_reflog = TRUE;
177 if (!rev_flags.with_graph)
178 state->with_graph = FALSE;
179 arg += rev_flags.search_offset;
180 if (*arg && !*view->env->search)
181 string_ncopy(view->env->search, arg, strlen(arg));
184 return with_reflog;
187 static bool
188 main_with_graph(struct view *view, enum open_flags flags)
190 struct view_column *column = get_view_column(view, VIEW_COLUMN_COMMIT_TITLE);
192 if (open_in_pager_mode(flags))
193 return FALSE;
195 return column && column->opt.commit_title.graph &&
196 opt_commit_order != COMMIT_ORDER_REVERSE;
199 static bool
200 main_open(struct view *view, enum open_flags flags)
202 bool with_graph = main_with_graph(view, flags);
203 const char *pretty_custom_argv[] = {
204 GIT_MAIN_LOG_CUSTOM(encoding_arg, commit_order_arg_with_graph(with_graph),
205 "%(cmdlineargs)", "%(revargs)", "%(fileargs)")
207 const char *pretty_raw_argv[] = {
208 GIT_MAIN_LOG_RAW(encoding_arg, commit_order_arg_with_graph(with_graph),
209 "%(cmdlineargs)", "%(revargs)", "%(fileargs)")
211 struct main_state *state = view->private;
212 const char **main_argv = pretty_custom_argv;
213 enum watch_trigger changes_triggers = WATCH_NONE;
215 if (opt_show_changes && repo.is_inside_work_tree)
216 changes_triggers |= WATCH_INDEX;
218 state->with_graph = with_graph;
220 if (opt_rev_args && main_check_argv(view, opt_rev_args))
221 main_argv = pretty_raw_argv;
223 if (open_in_pager_mode(flags)) {
224 changes_triggers = WATCH_NONE;
227 /* This calls reset_view() so must be before adding changes commits. */
228 if (!begin_update(view, NULL, main_argv, flags))
229 return FALSE;
231 /* Register watch before changes commits are added to record the
232 * start. */
233 if (view_can_refresh(view))
234 watch_register(&view->watch, WATCH_HEAD | WATCH_REFS | changes_triggers);
236 if (changes_triggers)
237 main_add_changes_commits(view, state, "");
239 return TRUE;
242 void
243 main_done(struct view *view)
245 struct main_state *state = view->private;
246 int i;
248 for (i = 0; i < view->lines; i++) {
249 struct commit *commit = view->line[i].data;
251 free(commit->graph.symbols);
254 for (i = 0; i < state->reflogs; i++)
255 free(state->reflog[i]);
256 free(state->reflog);
259 #define main_check_commit_refs(line) !((line)->no_commit_refs)
260 #define main_mark_no_commit_refs(line) (((struct line *) (line))->no_commit_refs = 1)
262 static inline struct ref_list *
263 main_get_commit_refs(const struct line *line, struct commit *commit)
265 struct ref_list *refs = NULL;
267 if (main_check_commit_refs(line) && !(refs = get_ref_list(commit->id)))
268 main_mark_no_commit_refs(line);
270 return refs;
273 bool
274 main_get_column_data(struct view *view, const struct line *line, struct view_column_data *column_data)
276 struct main_state *state = view->private;
277 struct commit *commit = line->data;
278 struct ref_list *refs = NULL;
280 column_data->author = commit->author;
281 column_data->date = &commit->time;
282 column_data->id = commit->id;
283 if (state->reflogs)
284 column_data->reflog = state->reflog[line->lineno - 1];
286 column_data->commit_title = commit->title;
287 if (state->with_graph)
288 column_data->graph = &commit->graph;
290 if ((refs = main_get_commit_refs(line, commit)))
291 column_data->refs = refs;
293 return TRUE;
296 static bool
297 main_add_reflog(struct view *view, struct main_state *state, char *reflog)
299 char *end = strchr(reflog, ' ');
300 int id_width;
302 if (!end)
303 return FALSE;
304 *end = 0;
306 if (!realloc_reflogs(&state->reflog, state->reflogs, 1)
307 || !(reflog = strdup(reflog)))
308 return FALSE;
310 state->reflog[state->reflogs++] = reflog;
311 id_width = strlen(reflog);
312 if (state->reflog_width < id_width) {
313 struct view_column *column = get_view_column(view, VIEW_COLUMN_ID);
315 state->reflog_width = id_width;
316 if (column && column->opt.id.display)
317 view->force_redraw = TRUE;
320 return TRUE;
323 /* Reads git log --pretty=raw output and parses it into the commit struct. */
324 bool
325 main_read(struct view *view, struct buffer *buf)
327 struct main_state *state = view->private;
328 struct graph *graph = &state->graph;
329 enum line_type type;
330 struct commit *commit = &state->current;
331 char *line;
333 if (!buf) {
334 main_flush_commit(view, commit);
336 if (failed_to_load_initial_view(view))
337 die("No revisions match the given arguments.");
338 if (view->lines > 0) {
339 struct commit *last = view->line[view->lines - 1].data;
341 view->line[view->lines - 1].dirty = 1;
342 if (!last->author) {
343 view->lines--;
344 free(last);
348 if (state->with_graph)
349 done_graph(graph);
350 return TRUE;
353 line = buf->data;
354 type = get_line_type(line);
355 if (type == LINE_COMMIT) {
356 bool is_boundary;
357 char *author;
359 state->in_header = TRUE;
360 line += STRING_SIZE("commit ");
361 is_boundary = *line == '-';
362 while (*line && !isalnum(*line))
363 line++;
365 if (state->add_changes_parents) {
366 state->add_changes_parents = FALSE;
367 if (!graph_add_parent(graph, line))
368 return FALSE;
369 graph->has_parents = TRUE;
370 graph_render_parents(graph);
373 main_flush_commit(view, commit);
375 author = io_memchr(buf, line, 0);
377 if (state->first_parent) {
378 char *parent = strchr(line, ' ');
379 char *parent_end = parent ? strchr(parent + 1, ' ') : NULL;
381 if (parent_end)
382 *parent_end = 0;
384 io_trace("[parent] %s\n", line);
387 main_register_commit(view, &state->current, line, is_boundary);
389 if (author) {
390 char *title = io_memchr(buf, author, 0);
392 parse_author_line(author, &commit->author, &commit->time);
393 if (state->with_graph)
394 graph_render_parents(graph);
395 if (title)
396 main_add_commit(view, LINE_MAIN_COMMIT, commit, title, FALSE);
399 return TRUE;
402 if (!*commit->id)
403 return TRUE;
405 /* Empty line separates the commit header from the log itself. */
406 if (*line == '\0')
407 state->in_header = FALSE;
409 switch (type) {
410 case LINE_PP_REFLOG:
411 if (!main_add_reflog(view, state, line + STRING_SIZE("Reflog: ")))
412 return FALSE;
413 break;
415 case LINE_PP_REFLOGMSG:
416 line += STRING_SIZE("Reflog message: ");
417 string_ncopy(state->reflogmsg, line, strlen(line));
418 break;
420 case LINE_PARENT:
421 if (state->with_graph && !graph->has_parents)
422 graph_add_parent(graph, line + STRING_SIZE("parent "));
423 break;
425 case LINE_AUTHOR:
426 parse_author_line(line + STRING_SIZE("author "),
427 &commit->author, &commit->time);
428 if (state->with_graph)
429 graph_render_parents(graph);
430 break;
432 default:
433 /* Fill in the commit title if it has not already been set. */
434 if (*commit->title)
435 break;
437 /* Skip lines in the commit header. */
438 if (state->in_header)
439 break;
441 /* Require titles to start with a non-space character at the
442 * offset used by git log. */
443 if (strncmp(line, " ", 4))
444 break;
445 line += 4;
446 /* Well, if the title starts with a whitespace character,
447 * try to be forgiving. Otherwise we end up with no title. */
448 while (isspace(*line))
449 line++;
450 if (*line == '\0')
451 break;
452 if (*state->reflogmsg)
453 line = state->reflogmsg;
454 main_add_commit(view, LINE_MAIN_COMMIT, commit, line, FALSE);
457 return TRUE;
460 enum request
461 main_request(struct view *view, enum request request, struct line *line)
463 enum open_flags flags = (view_is_displayed(view) && request != REQ_VIEW_DIFF)
464 ? OPEN_SPLIT : OPEN_DEFAULT;
466 switch (request) {
467 case REQ_NEXT:
468 case REQ_PREVIOUS:
469 if (view_is_displayed(view) && display[0] != view)
470 return request;
471 /* Do not pass navigation requests to the branch view
472 * when the main view is maximized. (GH #38) */
473 return request == REQ_NEXT ? REQ_MOVE_DOWN : REQ_MOVE_UP;
475 case REQ_VIEW_DIFF:
476 case REQ_ENTER:
477 if (view_is_displayed(view) && display[0] != view)
478 maximize_view(view, TRUE);
480 if (line->type == LINE_STAT_UNSTAGED
481 || line->type == LINE_STAT_STAGED)
482 open_stage_view(view, NULL, line->type, flags);
483 else
484 open_diff_view(view, flags);
485 break;
487 case REQ_REFRESH:
488 load_refs(TRUE);
489 refresh_view(view);
490 break;
492 default:
493 return request;
496 return REQ_NONE;
499 static void
500 main_update_env(struct view *view, struct line *line, struct commit *commit)
502 struct ref_list *list = main_get_commit_refs(line, commit);
503 size_t i;
505 for (i = 0; list && i < list->size; i++)
506 ref_update_env(view->env, list->refs[list->size - i - 1], !i);
509 void
510 main_select(struct view *view, struct line *line)
512 struct commit *commit = line->data;
514 if (line->type == LINE_STAT_STAGED || line->type == LINE_STAT_UNSTAGED) {
515 string_ncopy(view->ref, commit->title, strlen(commit->title));
516 status_stage_info(view->env->status, line->type, NULL);
517 } else {
518 string_copy_rev(view->ref, commit->id);
519 main_update_env(view, line, commit);
521 string_copy_rev(view->env->commit, commit->id);
524 static struct view_ops main_ops = {
525 "commit",
526 argv_env.head,
527 VIEW_SEND_CHILD_ENTER | VIEW_FILE_FILTER | VIEW_LOG_LIKE | VIEW_REFRESH,
528 sizeof(struct main_state),
529 main_open,
530 main_read,
531 view_column_draw,
532 main_request,
533 view_column_grep,
534 main_select,
535 main_done,
536 view_column_bit(AUTHOR) | view_column_bit(COMMIT_TITLE) |
537 view_column_bit(DATE) | view_column_bit(ID) |
538 view_column_bit(LINE_NUMBER),
539 main_get_column_data,
542 DEFINE_VIEW(main);
544 /* vim: set ts=8 sw=8 noexpandtab: */