Support GoToParent action in Detail and UserCommand views (#111)

lusingander · web-flow · commit 12f360bbfc16 · 2025-12-07T17:52:50.000+09:00
* Support GoToParent action in Detail and UserCommand views

* Fix helps

* Update README
diff --git a/README.md b/README.md
@@ -209,16 +209,17 @@ The default key bindings can be overridden. Please refer to [default-keybind.tom
 
 #### Commit Detail
 
-| Key                                 | Description                     | Corresponding keybind           |
-| ----------------------------------- | ------------------------------- | ------------------------------- |
-| <kbd>Esc</kbd> <kbd>Backspace</kbd> | Close commit details            | `close` `cancel`                |
-| <kbd>Down/Up</kbd> <kbd>j/k</kbd>   | Scroll down/up                  | `navigate_down` `navigate_up`   |
-| <kbd>Ctrl-f/b</kbd>                 | Scroll page down/up             | `page_down` `page_up`           |
-| <kbd>Ctrl-d/u</kbd>                 | Scroll half page down/up        | `half_page_down` `half_page_up` |
-| <kbd>g/G</kbd>                      | Go to top/bottom                | `go_to_top` `go_to_bottom`      |
-| <kbd>J/K</kbd>                      | Select older/newer commit       | `select_down` `select_up`       |
-| <kbd>c/C</kbd>                      | Copy commit short/full hash     | `short_copy` `full_copy`        |
-| <kbd>d</kbd>                        | Toggle custom user command view | `user_command_view_toggle_1`    |
+| Key                                  | Description                     | Corresponding keybind           |
+| ------------------------------------ | ------------------------------- | ------------------------------- |
+| <kbd>Esc</kbd> <kbd>Backspace</kbd>  | Close commit details            | `close` `cancel`                |
+| <kbd>Down/Up</kbd> <kbd>j/k</kbd>    | Scroll down/up                  | `navigate_down` `navigate_up`   |
+| <kbd>Ctrl-f/b</kbd>                  | Scroll page down/up             | `page_down` `page_up`           |
+| <kbd>Ctrl-d/u</kbd>                  | Scroll half page down/up        | `half_page_down` `half_page_up` |
+| <kbd>g/G</kbd>                       | Go to top/bottom                | `go_to_top` `go_to_bottom`      |
+| <kbd>J/K</kbd>                       | Select older/newer commit       | `select_down` `select_up`       |
+| <kbd>Alt-Down</kbd> <kbd>Alt-j</kbd> | Select parent commit            | `go_to_parent`                  |
+| <kbd>c/C</kbd>                       | Copy commit short/full hash     | `short_copy` `full_copy`        |
+| <kbd>d</kbd>                         | Toggle custom user command view | `user_command_view_toggle_1`    |
 
 #### Refs List
 
@@ -233,15 +234,16 @@ The default key bindings can be overridden. Please refer to [default-keybind.tom
 
 #### User Command
 
-| Key                                              | Description                 | Corresponding keybind           |
-| ------------------------------------------------ | --------------------------- | ------------------------------- |
-| <kbd>Esc</kbd> <kbd>Backspace</kbd> <kbd>?</kbd> | Close user command          | `close` `cancel` `help_toggle`  |
-| <kbd>Down/Up</kbd> <kbd>j/k</kbd>                | Scroll down/up              | `navigate_down` `navigate_up`   |
-| <kbd>J/K</kbd>                                   | Scroll down/up              | `select_down` `select_up`       |
-| <kbd>Ctrl-f/b</kbd>                              | Scroll page down/up         | `page_down` `page_up`           |
-| <kbd>Ctrl-d/u</kbd>                              | Scroll half page down/up    | `half_page_down` `half_page_up` |
-| <kbd>g/G</kbd>                                   | Go to top/bottom            | `go_to_top` `go_to_bottom`      |
-| <kbd>J/K</kbd>                                   | Select older/newer commit   | `select_down` `select_up`       |
+| Key                                  | Description                 | Corresponding keybind           |
+| ------------------------------------ | --------------------------- | ------------------------------- |
+| <kbd>Esc</kbd> <kbd>Backspace</kbd>  | Close user command          | `close` `cancel`                |
+| <kbd>Down/Up</kbd> <kbd>j/k</kbd>    | Scroll down/up              | `navigate_down` `navigate_up`   |
+| <kbd>J/K</kbd>                       | Scroll down/up              | `select_down` `select_up`       |
+| <kbd>Ctrl-f/b</kbd>                  | Scroll page down/up         | `page_down` `page_up`           |
+| <kbd>Ctrl-d/u</kbd>                  | Scroll half page down/up    | `half_page_down` `half_page_up` |
+| <kbd>g/G</kbd>                       | Go to top/bottom            | `go_to_top` `go_to_bottom`      |
+| <kbd>J/K</kbd>                       | Select older/newer commit   | `select_down` `select_up`       |
+| <kbd>Alt-Down</kbd> <kbd>Alt-j</kbd> | Select parent commit        | `go_to_parent`                  |
 
 #### Help
 
diff --git a/src/app.rs b/src/app.rs
@@ -236,6 +236,9 @@ impl App<'_> {
                 AppEvent::SelectNewerCommit => {
                     self.select_newer_commit();
                 }
+                AppEvent::SelectParentCommit => {
+                    self.select_parent_commit();
+                }
                 AppEvent::CopyToClipboard { name, value } => {
                     self.copy_to_clipboard(name, value);
                 }
@@ -553,6 +556,14 @@ impl App<'_> {
         }
     }
 
+    fn select_parent_commit(&mut self) {
+        if let View::Detail(ref mut view) = self.view {
+            view.select_parent_commit(self.repository);
+        } else if let View::UserCommand(ref mut view) = self.view {
+            view.select_parent_commit(self.repository, self.view_area);
+        }
+    }
+
     fn clear_status_line(&mut self) {
         self.status_line = StatusLine::None;
     }
diff --git a/src/event.rs b/src/event.rs
@@ -27,6 +27,7 @@ pub enum AppEvent {
     ClearHelp,
     SelectNewerCommit,
     SelectOlderCommit,
+    SelectParentCommit,
     CopyToClipboard { name: String, value: String },
     ClearStatusLine,
     UpdateStatusInput(String, Option<u16>, Option<String>),
diff --git a/src/view/detail.rs b/src/view/detail.rs
@@ -105,6 +105,9 @@ impl<'a> DetailView<'a> {
             UserEvent::SelectUp => {
                 self.tx.send(AppEvent::SelectNewerCommit);
             }
+            UserEvent::GoToParent => {
+                self.tx.send(AppEvent::SelectParentCommit);
+            }
             UserEvent::ShortCopy => {
                 self.copy_commit_short_hash();
             }
@@ -171,6 +174,10 @@ impl<'a> DetailView<'a> {
         self.update_selected_commit(repository, |state| state.select_prev());
     }
 
+    pub fn select_parent_commit(&mut self, repository: &Repository) {
+        self.update_selected_commit(repository, |state| state.select_parent());
+    }
+
     fn update_selected_commit<F>(&mut self, repository: &Repository, update_commit_list_state: F)
     where
         F: FnOnce(&mut CommitListState<'a>),
diff --git a/src/view/help.rs b/src/view/help.rs
@@ -290,6 +290,7 @@ fn build_lines(
         (vec![UserEvent::GoToBottom], "Go to bottom".into()),
         (vec![UserEvent::SelectDown], "Select older commit".into()),
         (vec![UserEvent::SelectUp], "Select newer commit".into()),
+        (vec![UserEvent::GoToParent], "Select parent commit".into()),
         (vec![UserEvent::ShortCopy], "Copy commit short hash".into()),
         (vec![UserEvent::FullCopy], "Copy commit hash".into()),
     ];
@@ -320,6 +321,7 @@ fn build_lines(
         (vec![UserEvent::GoToBottom], "Go to bottom".into()),
         (vec![UserEvent::SelectDown], "Select older commit".into()),
         (vec![UserEvent::SelectUp], "Select newer commit".into()),
+        (vec![UserEvent::GoToParent], "Select parent commit".into()),
     ];
     user_command_helps.extend(user_command_view_toggle_helps);
     let (user_command_key_lines, user_command_value_lines) = build_block_lines("User Command:", user_command_helps, color_theme, keybind);
diff --git a/src/view/user_command.rs b/src/view/user_command.rs
@@ -130,6 +130,9 @@ impl<'a> UserCommandView<'a> {
             UserEvent::SelectUp => {
                 self.tx.send(AppEvent::SelectNewerCommit);
             }
+            UserEvent::GoToParent => {
+                self.tx.send(AppEvent::SelectParentCommit);
+            }
             UserEvent::HelpToggle => {
                 self.tx.send(AppEvent::OpenHelp);
             }
@@ -194,6 +197,10 @@ impl<'a> UserCommandView<'a> {
         self.update_selected_commit(repository, view_area, |state| state.select_prev());
     }
 
+    pub fn select_parent_commit(&mut self, repository: &Repository, view_area: Rect) {
+        self.update_selected_commit(repository, view_area, |state| state.select_parent());
+    }
+
     fn update_selected_commit<F>(
         &mut self,
         repository: &Repository,

Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,9 @@ impl App<'_> {`
`236`	`236`	`AppEvent::SelectNewerCommit => {`
`237`	`237`	`self.select_newer_commit();`
`238`	`238`	`}`
	`239`	`+ AppEvent::SelectParentCommit => {`
	`240`	`+ self.select_parent_commit();`
	`241`	`+ }`
`239`	`242`	`AppEvent::CopyToClipboard { name, value } => {`
`240`	`243`	`self.copy_to_clipboard(name, value);`
`241`	`244`	`}`
`@@ -553,6 +556,14 @@ impl App<'_> {`
`553`	`556`	`}`
`554`	`557`	`}`
`555`	`558`
	`559`	`+ fn select_parent_commit(&mut self) {`
	`560`	`+ if let View::Detail(ref mut view) = self.view {`
	`561`	`+ view.select_parent_commit(self.repository);`
	`562`	`+ } else if let View::UserCommand(ref mut view) = self.view {`
	`563`	`+ view.select_parent_commit(self.repository, self.view_area);`
	`564`	`+ }`
	`565`	`+ }`
	`566`	`+`
`556`	`567`	`fn clear_status_line(&mut self) {`
`557`	`568`	`self.status_line = StatusLine::None;`
`558`	`569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ impl<'a> DetailView<'a> {`
`105`	`105`	`UserEvent::SelectUp => {`
`106`	`106`	`self.tx.send(AppEvent::SelectNewerCommit);`
`107`	`107`	`}`
	`108`	`+ UserEvent::GoToParent => {`
	`109`	`+ self.tx.send(AppEvent::SelectParentCommit);`
	`110`	`+ }`
`108`	`111`	`UserEvent::ShortCopy => {`
`109`	`112`	`self.copy_commit_short_hash();`
`110`	`113`	`}`
`@@ -171,6 +174,10 @@ impl<'a> DetailView<'a> {`
`171`	`174`	`self.update_selected_commit(repository, \|state\| state.select_prev());`
`172`	`175`	`}`
`173`	`176`
	`177`	`+ pub fn select_parent_commit(&mut self, repository: &Repository) {`
	`178`	`+ self.update_selected_commit(repository, \|state\| state.select_parent());`
	`179`	`+ }`
	`180`	`+`
`174`	`181`	`fn update_selected_commit<F>(&mut self, repository: &Repository, update_commit_list_state: F)`
`175`	`182`	`where`
`176`	`183`	`F: FnOnce(&mut CommitListState<'a>),`
Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ impl<'a> UserCommandView<'a> {`
`130`	`130`	`UserEvent::SelectUp => {`
`131`	`131`	`self.tx.send(AppEvent::SelectNewerCommit);`
`132`	`132`	`}`
	`133`	`+ UserEvent::GoToParent => {`
	`134`	`+ self.tx.send(AppEvent::SelectParentCommit);`
	`135`	`+ }`
`133`	`136`	`UserEvent::HelpToggle => {`
`134`	`137`	`self.tx.send(AppEvent::OpenHelp);`
`135`	`138`	`}`
`@@ -194,6 +197,10 @@ impl<'a> UserCommandView<'a> {`
`194`	`197`	`self.update_selected_commit(repository, view_area, \|state\| state.select_prev());`
`195`	`198`	`}`
`196`	`199`
	`200`	`+ pub fn select_parent_commit(&mut self, repository: &Repository, view_area: Rect) {`
	`201`	`+ self.update_selected_commit(repository, view_area, \|state\| state.select_parent());`
	`202`	`+ }`
	`203`	`+`
`197`	`204`	`fn update_selected_commit<F>(`
`198`	`205`	`&mut self,`
`199`	`206`	`repository: &Repository,`