Merge pull request #13359 from gitbutlerapp/dp-show-commit-markers-in-between

Show commit markers in between commits in TUI

Author: davidpdrsn

crates/but/src/command/legacy/status/tui/cursor/tests.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use but_rebase::graph_rebase::mutate::InsertSide;
 use gitbutler_stack::StackId;
 use ratatui_textarea::TextArea;
 
@@ -1528,7 +1527,6 @@ fn is_selectable_in_commit_mode_scopes_commit_targets_to_stack() {
             id: "zz".into(),
         })),
         scope_to_stack: Some(scoped_stack_id),
-        insert_side: InsertSide::Above,
         empty_message: false,
     });
 

crates/but/src/command/legacy/status/tui/details/mod.rs

@@ -216,9 +216,7 @@ impl Details {
 
             Message::Commit(commit_message) => match commit_message {
                 CommitMessage::Confirm | CommitMessage::CreateEmpty => true,
-                CommitMessage::Start
-                | CommitMessage::SetInsertSide(_)
-                | CommitMessage::ToggleEmptyMessage => false,
+                CommitMessage::Start | CommitMessage::ToggleEmptyMessage => false,
             },
             Message::Rub(rub_message) => match rub_message {
                 RubMessage::Start
@@ -240,7 +238,7 @@ impl Details {
                 FilesMessage::ToggleGlobalFilesList | FilesMessage::ToggleFilesForCommit => true,
             },
             Message::Move(move_message) => match move_message {
-                MoveMessage::Start | MoveMessage::SetInsertSide(_) => false,
+                MoveMessage::Start => false,
                 MoveMessage::Confirm => true,
             },
             Message::Details(details_message) => match details_message {

crates/but/src/command/legacy/status/tui/key_bind.rs

@@ -1,6 +1,5 @@
 use std::{borrow::Cow, collections::HashMap};
 
-use but_rebase::graph_rebase::mutate::InsertSide;
 use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 use strum::IntoEnumIterator;
 
@@ -568,22 +567,6 @@ fn register_commit_mode_key_binds(key_binds: &mut KeyBinds) {
         hide_from_hotbar: false,
     });
 
-    key_binds.register(KeyBindDef {
-        short_description: "above",
-        key_matcher: press().code(KeyCode::Char('a')),
-        modes: Vec::from([ModeDiscriminant::Commit]),
-        message: Message::Commit(CommitMessage::SetInsertSide(InsertSide::Above)),
-        hide_from_hotbar: false,
-    });
-
-    key_binds.register(KeyBindDef {
-        short_description: "below",
-        key_matcher: press().code(KeyCode::Char('b')),
-        modes: Vec::from([ModeDiscriminant::Commit]),
-        message: Message::Commit(CommitMessage::SetInsertSide(InsertSide::Below)),
-        hide_from_hotbar: false,
-    });
-
     key_binds.register(KeyBindDef {
         short_description: "empty message",
         key_matcher: press().code(KeyCode::Char('e')),
@@ -618,22 +601,6 @@ fn register_move_mode_key_binds(key_binds: &mut KeyBinds) {
         hide_from_hotbar: false,
     });
 
-    key_binds.register(KeyBindDef {
-        short_description: "above",
-        key_matcher: press().code(KeyCode::Char('a')),
-        modes: Vec::from([ModeDiscriminant::Move]),
-        message: Message::Move(MoveMessage::SetInsertSide(InsertSide::Above)),
-        hide_from_hotbar: false,
-    });
-
-    key_binds.register(KeyBindDef {
-        short_description: "below",
-        key_matcher: press().code(KeyCode::Char('b')),
-        modes: Vec::from([ModeDiscriminant::Move]),
-        message: Message::Move(MoveMessage::SetInsertSide(InsertSide::Below)),
-        hide_from_hotbar: false,
-    });
-
     key_binds.register(KeyBindDef {
         short_description: "back",
         key_matcher: press().code(KeyCode::Char('m')),