From: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
To: git@vger.kernel.org, fonseca@diku.dk
Cc: Kumar Appaiah <a.kumar@alumni.iitm.ac.in>
Subject: [[TIG][PATCH] 1/3] Add log_select function to find commit from context in log view
Date: Fri, 02 Aug 2013 20:23:17 -0400 [thread overview]
Message-ID: <1375489399-11618-2-git-send-email-a.kumar@alumni.iitm.ac.in> (raw)
In-Reply-To: <1375489399-11618-1-git-send-email-a.kumar@alumni.iitm.ac.in>
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 to 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, 48 insertions(+), 2 deletions(-)
diff --git a/tig.c b/tig.c
index 72f132a..dd4b0f4 100644
--- a/tig.c
+++ b/tig.c
@@ -4384,6 +4384,33 @@ pager_select(struct view *view, struct line *line)
}
}
+struct log_state {
+ bool update_commit_ref;
+};
+
+static void
+log_select(struct view *view, struct line *line)
+{
+ struct log_state *state = (struct log_state *) view->private;
+
+ if (state->update_commit_ref && line->lineno > 1) {
+ /* We need to recalculate the previous commit,
+ since the user has likely scrolled up. */
+ 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->update_commit_ref = FALSE;
+}
+
static bool
pager_open(struct view *view, enum open_flags flags)
{
@@ -4427,11 +4454,30 @@ 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;
+
+ case REQ_MOVE_UP:
+ case REQ_PREVIOUS:
+ if (line->type == LINE_COMMIT && line->lineno > 1) {
+ /* We are at a commit, and heading upward. We
+ force log_select to find the previous
+ commit above, from the context. */
+ state->update_commit_ref = TRUE;
+ }
+ return pager_request(view, request, line);
+
+ case REQ_MOVE_PAGE_UP:
+ case REQ_MOVE_PAGE_DOWN:
+ /* We need to figure out the right commit again. */
+ state->update_commit_ref = TRUE;
+ return pager_request(view, request, line);
+
default:
return pager_request(view, request, line);
}
@@ -4441,13 +4487,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
next prev parent reply other threads:[~2013-08-03 0:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-03 0:23 [TIG][PATCH 0/3] Refactoring of the log view Kumar Appaiah
2013-08-03 0:23 ` Kumar Appaiah [this message]
2013-08-06 3:27 ` [[TIG][PATCH] 1/3] Add log_select function to find commit from context in " Jonas Fonseca
2013-08-06 4:08 ` Kumar Appaiah
2013-08-06 3:54 ` Jonas Fonseca
2013-08-03 0:23 ` [[TIG][PATCH] 2/3] Display correct diff the context in split " Kumar Appaiah
2013-08-06 3:50 ` Jonas Fonseca
2013-08-03 0:23 ` [[TIG][PATCH] 3/3] Revert "Scroll diff with arrow keys in log view" Kumar Appaiah
2013-08-06 4:00 ` [TIG][PATCH 0/3] Refactoring of the log view Jonas Fonseca
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375489399-11618-2-git-send-email-a.kumar@alumni.iitm.ac.in \
--to=a.kumar@alumni.iitm.ac.in \
--cc=fonseca@diku.dk \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).