Expand relevant sections only when opening the help view

Closes #782, closes #886

Author: koutcher

include/tig/help.h

@@ -21,6 +21,8 @@ extern struct view help_view;
 static inline void
 open_help_view(struct view *prev, enum open_flags flags)
 {
+	if (update_keymap_visibility(prev->name, strlen(prev->name)))
+		flags |= OPEN_RELOAD;
 	open_view(prev, &help_view, flags);
 }
 

include/tig/keys.h

@@ -65,6 +65,7 @@ key_to_control(const struct key *key)
 }
 
 struct keymap *get_keymap(const char *name, size_t namelen);
+bool update_keymap_visibility(const char *name, size_t namelen);
 
 const char *get_key_name(const struct key key[], size_t keys, bool quote_comma);
 enum status_code get_key_value(const char **name, struct key *key);

src/keys.c

@@ -48,6 +48,23 @@ get_keymap(const char *name, size_t namelen)
 	return NULL;
 }
 
+bool
+update_keymap_visibility(const char *name, size_t namelen)
+{
+	bool changed = false;
+	int i;
+
+	/* Skip generic and search keymaps. */
+	for (i = 2; i < ARRAY_SIZE(keymaps); i++) {
+		bool hidden = !!strncmp(keymaps[i].name, name, namelen);
+		if (keymaps[i].hidden != hidden) {
+			keymaps[i].hidden = hidden;
+			changed = true;
+		}
+	}
+	return changed;
+}
+
 static bool
 keybinding_matches(const struct keybinding *keybinding, const struct key key[],
 		  size_t keys, bool *conflict_ptr)

test/help/all-keybindings-test

@@ -7,6 +7,9 @@ export LINES=130
 
 steps '
 	:view-help
+	:2
+	:enter
+	:enter
 	:save-display help-default.screen
 '
 

test/help/all-keybindings-test.expected

@@ -126,4 +126,4 @@ External commands:
                            ! ?git stash drop %(stash)
 [-] pager bindings
 Internal commands:
-[help] - line 1 of 148                                                                 86%
+[help] - line 2 of 148                                                                 86%

test/help/default-test

@@ -53,7 +53,7 @@ View manipulation
                        <Tab> view-next           Move focus to the next view
                      R, <F5> refresh             Reload and refresh view
                            O maximize            Maximize the current view
-[help] - line 1 of 148                                                       18%
+[help] - line 1 of 107                                                       26%
 EOF
 
 assert_equals 'help-search.screen' <<EOF
@@ -85,7 +85,7 @@ View manipulation
                        <Tab> view-next           Move focus to the next view
                      R, <F5> refresh             Reload and refresh view
                            O maximize            Maximize the current view
-[help] - line 20 of 148                                                      18%
+[help] - line 20 of 107                                                      26%
 EOF
 
 assert_equals 'help-collapsed.screen' <<EOF
@@ -94,28 +94,28 @@ Quick reference for tig keybindings:
 
 [+] generic bindings
 [+] search bindings
-[-] main bindings
-Option toggling:
-  G :toggle commit-title-graph
-  F :toggle commit-title-refs
-Internal commands:
-  H :goto HEAD
-External commands:
-  C ?git cherry-pick %(commit)
-[-] diff bindings
-Option toggling:
-  [ :toggle diff-context -1
-  ] :toggle diff-context +1
+[+] main bindings
+[+] diff bindings
+[+] reflog bindings
+[+] refs bindings
+[+] status bindings
+[+] stage bindings
+[+] stash bindings
+[-] pager bindings
 Internal commands:
   @ :/^@@
-[-] reflog bindings
-Option toggling:
-  F :toggle commit-title-refs
-External commands:
-  C ?git checkout %(branch)
-  ! ?git reset --hard %(commit)
-[-] refs bindings
-External commands:
-  C ?git checkout %(branch)
-[help] - line 5 of 75                                                        37%
+[-] toggle bindings
+Toggle keys (enter: o <key>):
+                           . line-number                  Toggle line numbers
+                           D date                         Toggle dates
+                           A author                       Toggle author
+                           ~ line-graphics                Toggle graphics
+                           g commit-title-graph           Toggle revision graph
+                           # file-name                    Toggle file names
+                           * file-size                    Toggle file sizes
+                           W ignore-space                 Toggle space changes
+                           l commit-order                 Toggle commit order
+                           F commit-title-refs            Toggle reference display
+                           C show-changes                 Toggle local change display
+[help] - line 5 of 34                                                        82%
 EOF

test/help/user-command-test

@@ -52,8 +52,8 @@ View manipulation
 Searching
      <Down>, <Ctrl-N>, <Ctrl-J> find-next           Find next search match
        <Up>, <Ctrl-P>, <Ctrl-K> find-prev           Find previous search match
-[-] main bindings
-Cursor navigation
-                              G move-last-line      Move cursor to last line
-[help] - line 82 of 168                                                                          64%
+[+] main bindings
+[+] diff bindings
+[+] reflog bindings
+[help] - line 82 of 132                                                                          82%
 EOF

test/tigrc/parse-test

@@ -67,6 +67,8 @@ EOF
 
 steps "
 	:view-help
+	:9
+	:enter
 	:save-display help.screen
 "
 
@@ -126,5 +128,5 @@ External commands:
    4 <quitting command
    5 +echoed command
    0 @?<+all modifiers
-[help] - line 1 of 37                                                        48%
+[help] - line 9 of 37                                                        48%
 EOF