Merge pull request #13329 from gitbutlerapp/dp-fix-selection-after-rubbing

Fix some selections after rubbing

Author: davidpdrsn

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

@@ -99,19 +99,15 @@ pub(super) fn perform_operation(
 ) -> anyhow::Result<Option<SelectAfterReload>> {
     let selection = match operation {
         RubOperation::UnassignUncommitted(operation) => {
-            let path = operation.hunk_assignments.first().path_bytes.clone();
             operation.execute_inner(ctx)?;
-            SelectAfterReload::UncommittedFile {
-                path,
-                stack_id: None,
-            }
+            SelectAfterReload::Unassigned
         }
         RubOperation::UncommittedToCommit(operation) => {
-            let assignment = operation.hunk_assignments.first();
-            let path = assignment.path_bytes.clone();
-            let stack_id = assignment.stack_id;
-            operation.execute_inner(ctx)?;
-            SelectAfterReload::UncommittedFile { path, stack_id }
+            let result = operation.execute_inner(ctx)?;
+            result
+                .new_commit
+                .map(SelectAfterReload::Commit)
+                .unwrap_or(SelectAfterReload::Unassigned)
         }
         RubOperation::UncommittedToBranch(operation) => {
             let assignment = operation.hunk_assignments.first();

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

@@ -337,7 +337,7 @@ fn commit_mode_from_staged_changes_stays_within_current_stack() {
         .assert_current_line_eq(str!["┊●   << amend >> 9477ae7 add A"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);
+        .assert_current_line_eq(str!["┊●   [..] add A"]);
 
     tui.input_then_render([KeyCode::Up, KeyCode::Up])
         .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);

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

@@ -139,7 +139,7 @@ fn discard_stack_confirm_yes_discards_staged_changes() {
         .assert_current_line_eq(str!["┊●   << amend >> 9477ae7 add A"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);
+        .assert_current_line_eq(str!["┊●   [..] add A"]);
 
     tui.input_then_render([KeyCode::Up, KeyCode::Up])
         .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);

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

@@ -41,7 +41,7 @@ fn rub_api_unassigned_to_commit() {
         ]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"])
+        .assert_current_line_eq(str!["┊●   [..] (no commit message)"])
         .assert_rendered_term_svg_eq(file!["snapshots/rub_api_unassigned_to_commit.svg"]);
 }
 
@@ -235,7 +235,7 @@ fn rub_api_unassigned_to_stack_operation() {
         .assert_current_line_eq(str!["┊●   << amend >> 9477ae7 add A"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes]"]);
+        .assert_current_line_eq(str!["┊●   [..] add A"]);
 }
 
 // Tests RubOperation::UncommittedToStack.
@@ -262,7 +262,7 @@ fn rub_api_uncommitted_to_stack_operation() {
         .assert_current_line_eq(str!["┊●   << amend >> 9477ae7 add A"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes]"]);
+        .assert_current_line_eq(str!["┊●   [..] add A"]);
 }
 
 // Tests RubOperation::StackToUnassigned.
@@ -288,7 +288,7 @@ fn rub_api_stack_to_unassigned_operation() {
         .assert_current_line_eq(str!["┊●   << amend >> 9477ae7 add A"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);
+        .assert_current_line_eq(str!["┊●   [..] add A"]);
 }
 
 // Tests RubOperation::StackToStack.
@@ -315,7 +315,7 @@ fn rub_api_stack_to_stack_operation() {
         .assert_current_line_eq(str!["┊●   << amend >> 9477ae7 add A"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes]"]);
+        .assert_current_line_eq(str!["┊●   [..] add A"]);
 
     tui.input_then_render([
         KeyCode::Up,
@@ -338,17 +338,11 @@ fn rub_api_stack_to_stack_operation() {
         .assert_current_line_eq(str!["┊●   << amend >> d3e2ba3 add B"]);
 
     tui.input_then_render(KeyCode::Enter)
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);
+        .assert_current_line_eq(str!["┊●   [..] add B"]);
 
     tui.input_then_render((KeyModifiers::SHIFT, KeyCode::Char('K')))
-        .assert_current_line_eq(str!["╭┄zz [unassigned changes] (no changes)"]);
+        .assert_current_line_eq(str!["┊╭┄h0 [B]"]);
 
-    tui.input_then_render('r').assert_current_line_eq(str![
-        "╭┄<< source >> << noop >> zz [unassigned changes] (no changes)"
-    ]);
-
-    tui.input_then_render([KeyCode::Up, KeyCode::Up])
-        .assert_current_line_eq(str![
-            "╭┄<< source >> << noop >> zz [unassigned changes] (no changes)"
-        ]);
+    tui.input_then_render('r')
+        .assert_current_line_eq(str!["┊╭┄h0 [B]"]);
 }