This commit introduces and uses the log_select function to find the correct commit in the unsplit log view. In the log view, if one scrolls down across a commit line, the current commit (as displayed in the status bar) gets updated, but not so when scrolling upward across a commit. The log_select function handles this scenario to do the ``right thing''. In addition, it introduces the log_state structure as the private entry of the log view to hold a flag that decides whether to re-evaluate the current commit based on scrolling.
Signed-off-by: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
---
tig.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 47 insertions(+), 3 deletions(-)
Show changes to tig.c +47 −3
diff --git a/tig.c b/tig.c
index 4759f1d..845153f 100644
--- a/tig.c
+++ b/tig.c
@@ -4383,6 +4383,35 @@ pager_select(struct view *view, struct line *line)
}
}
+struct log_state {
+ /* We need to recalculate the previous commit, when the user
+ * scrolls up or uses the page up/down in the log
+ * view. recalculate_commit_context is used as a flag to
+ * indicate this. */
+ bool recalculate_commit_context;
+};
+
+static void
+log_select(struct view *view, struct line *line)
+{
+ struct log_state *state = view->private;
+
+ if (state->recalculate_commit_context && line->lineno > 1) {
+ const struct line *commit_line = find_prev_line_by_type(view, line, LINE_COMMIT);
+
+ if (commit_line)
+ string_copy_rev(view->ref, (char *) (commit_line->data + STRING_SIZE("commit ")));
+ }
+ if (line->type == LINE_COMMIT) {
+ char *text = (char *)line->data + STRING_SIZE("commit ");
+
+ if (!view_has_flags(view, VIEW_NO_REF))
+ string_copy_rev(view->ref, text);
+ }
+ string_copy_rev(ref_commit, view->ref);
+ state->recalculate_commit_context = FALSE;
+}
+
static bool
pager_open(struct view *view, enum open_flags flags)
{
@@ -4426,11 +4455,26 @@ log_open(struct view *view, enum open_flags flags)
static enum request
log_request(struct view *view, enum request request, struct line *line)
{
+ struct log_state *state = (struct log_state *) view->private;
+
switch (request) {
case REQ_REFRESH:
load_refs();
refresh_view(view);
- return REQ_NONE;
+ return request;
+
+ case REQ_MOVE_UP:
+ case REQ_PREVIOUS:
+ if (line->type == LINE_COMMIT && line->lineno > 1) {
+ state->recalculate_commit_context = TRUE;
+ }
+ return request;
+
+ case REQ_MOVE_PAGE_UP:
+ case REQ_MOVE_PAGE_DOWN:
+ state->recalculate_commit_context = TRUE;
+ return request;
+
default:
return pager_request(view, request, line);
}
@@ -4440,13 +4484,13 @@ static struct view_ops log_ops = {
"line",
{ "log" },
VIEW_ADD_PAGER_REFS | VIEW_OPEN_DIFF | VIEW_SEND_CHILD_ENTER | VIEW_NO_PARENT_NAV,
- 0,
+ sizeof(struct log_state),
log_open,
pager_read,
pager_draw,
log_request,
pager_grep,
- pager_select,
+ log_select,
};
struct diff_state {
--
1.8.3.2
Kumar Appaiah