Skip to content

feat(tui): insert commits above or below existing commits #12925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davidpdrsn merged 1 commit into from
Mar 19, 2026
+847 −45
Merged

feat(tui): insert commits above or below existing commits #12925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions crates/but/src/command/legacy/status/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,7 @@ fn print_group(
print_commit(
&repo,
status_ctx,
stack_with_id.id,
commit.short_id.clone(),
&commit.inner,
CommitChanges::Remote(&details.diff_with_first_parent),
Expand Down Expand Up @@ -974,6 +975,7 @@ fn print_group(
print_commit(
&repo,
status_ctx,
stack_with_id.id,
commit.short_id.clone(),
&commit.inner.inner,
CommitChanges::Workspace(&commit.tree_changes_using_repo(&repo)?),
Expand Down Expand Up @@ -1088,6 +1090,7 @@ enum CommitChanges<'a> {
fn print_commit(
repo: &gix::Repository,
status_ctx: &StatusContext<'_>,
stack_id: Option<StackId>,
short_id: ShortId,
commit: &but_workspace::ref_info::Commit,
commit_changes: CommitChanges,
Expand Down Expand Up @@ -1166,6 +1169,7 @@ fn print_commit(
.collect(),
},
commit_cli_id.clone(),
stack_id,
)?;
let (message, is_empty_message) = commit_message_display_cli(
&commit.message,
Expand Down Expand Up @@ -1220,6 +1224,7 @@ fn print_commit(
.collect(),
},
commit_cli_id.clone(),
stack_id,
)?;
}
if status_ctx.flags.show_files {
Expand Down
34 changes: 26 additions & 8 deletions crates/but/src/command/legacy/status/output.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::sync::Arc;

use gitbutler_stack::StackId;
use ratatui::text::Span;

use crate::{CliId, command::legacy::status::render_oneshot, utils::WriteWithUtils};
Expand Down Expand Up @@ -151,12 +152,14 @@ impl StatusOutput<'_> {
connector: Vec<Span<'static>>,
line: CommitLineContent,
id: CliId,
stack_id: Option<StackId>,
) -> anyhow::Result<()> {
self.push_line(
Some(connector),
StatusOutputContent::Commit(line),
StatusOutputLineData::Commit {
cli_id: Arc::new(id),
stack_id,
},
)
}
Expand Down Expand Up @@ -309,15 +312,30 @@ impl StatusOutputLine {
pub(super) enum StatusOutputLineData {
UpdateNotice,
Connector,
StagedChanges { cli_id: Arc<CliId> },
StagedFile { cli_id: Arc<CliId> },
UnstagedChanges { cli_id: Arc<CliId> },
UnstagedFile { cli_id: Arc<CliId> },
Branch { cli_id: Arc<CliId> },
Commit { cli_id: Arc<CliId> },
StagedChanges {
cli_id: Arc<CliId>,
},
StagedFile {
cli_id: Arc<CliId>,
},
UnstagedChanges {
cli_id: Arc<CliId>,
},
UnstagedFile {
cli_id: Arc<CliId>,
},
Branch {
cli_id: Arc<CliId>,
},
Commit {
cli_id: Arc<CliId>,
stack_id: Option<StackId>,
},
CommitMessage,
EmptyCommitMessage,
File { cli_id: Arc<CliId> },
File {
cli_id: Arc<CliId>,
},
MergeBase,
UpstreamChanges,
Warning,
Expand All @@ -333,7 +351,7 @@ impl StatusOutputLineData {
| StatusOutputLineData::Branch { cli_id }
| StatusOutputLineData::StagedChanges { cli_id }
| StatusOutputLineData::StagedFile { cli_id }
| StatusOutputLineData::Commit { cli_id }
| StatusOutputLineData::Commit { cli_id, .. }
| StatusOutputLineData::File { cli_id } => Some(cli_id),
StatusOutputLineData::UpdateNotice
| StatusOutputLineData::Connector
Expand Down
35 changes: 34 additions & 1 deletion crates/but/src/command/legacy/status/tui/cursor/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
use std::sync::Arc;

use but_rebase::graph_rebase::mutate::InsertSide;
use gitbutler_stack::StackId;
use ratatui_textarea::TextArea;

use super::{Cursor, is_selectable_in_mode};
use crate::{
CliId,
command::legacy::status::{
output::{StatusOutputContent, StatusOutputLine, StatusOutputLineData},
tui::{InlineRewordMode, Mode, RubMode},
tui::{CommitMode, CommitSource, InlineRewordMode, Mode, RubMode},
},
};

Expand Down Expand Up @@ -135,6 +137,7 @@ fn select_finds_commit_line_by_object_id() {
}),
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id(wanted, "c1"),
stack_id: None,
}),
];

Expand All @@ -148,6 +151,7 @@ fn select_finds_commit_line_by_object_id() {
fn select_returns_none_when_commit_is_missing() {
let lines = vec![line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("1111111111111111111111111111111111111111", "c1"),
stack_id: None,
})];

assert_eq!(
Expand All @@ -165,9 +169,11 @@ fn select_uses_first_matching_commit_when_object_id_appears_multiple_times() {
let lines = vec![
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id(wanted, "c0"),
stack_id: None,
}),
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id(wanted, "c1"),
stack_id: None,
}),
];

Expand All @@ -182,6 +188,7 @@ fn select_branch_finds_branch_line_by_name() {
let lines = vec![
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("1111111111111111111111111111111111111111", "c0"),
stack_id: None,
}),
line(StatusOutputLineData::Branch {
cli_id: Arc::new(CliId::Branch {
Expand Down Expand Up @@ -444,6 +451,7 @@ fn selection_cli_id_for_reload_uses_commit_as_parent_for_hidden_file() {
let lines = vec![
line(StatusOutputLineData::Commit {
cli_id: parent_commit.clone(),
stack_id: None,
}),
line(StatusOutputLineData::File {
cli_id: unassigned("file0"),
Expand Down Expand Up @@ -801,6 +809,7 @@ fn move_next_section_skips_non_jump_targets_like_commits() {
}),
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("1111111111111111111111111111111111111111", "c0"),
stack_id: None,
}),
line(StatusOutputLineData::StagedChanges {
cli_id: unassigned("s0"),
Expand All @@ -825,6 +834,7 @@ fn move_next_section_can_jump_to_merge_base_line() {
}),
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("1111111111111111111111111111111111111111", "c0"),
stack_id: None,
}),
line(StatusOutputLineData::MergeBase),
];
Expand All @@ -847,6 +857,7 @@ fn move_previous_section_can_jump_from_merge_base_line() {
}),
line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("1111111111111111111111111111111111111111", "c0"),
stack_id: None,
}),
line(StatusOutputLineData::MergeBase),
];
Expand Down Expand Up @@ -1031,3 +1042,25 @@ fn is_selectable_is_true_in_inline_reword_mode() {
// Inline reword intentionally returns selectable so rows are not dimmed during editing.
assert!(is_selectable_in_mode(&selectable_line, &inline_reword));
}

#[test]
fn is_selectable_in_commit_mode_scopes_commit_targets_to_stack() {
let scoped_stack_id = StackId::single_branch_id();
let mode = Mode::Commit(CommitMode {
source: Arc::new(CommitSource::Unassigned { id: "zz".into() }),
scope_to_stack: Some(scoped_stack_id),
insert_side: InsertSide::Above,
});

let same_stack_commit_line = line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("1111111111111111111111111111111111111111", "c0"),
stack_id: Some(scoped_stack_id),
});
let other_stack_commit_line = line(StatusOutputLineData::Commit {
cli_id: commit_cli_id("2222222222222222222222222222222222222222", "c1"),
stack_id: None,
});

assert!(is_selectable_in_mode(&same_stack_commit_line, &mode));
assert!(!is_selectable_in_mode(&other_stack_commit_line, &mode));
}
Loading
Loading