feat(rebase): use new picker when selecting a rebase target

Author: altsem

src/ops/rebase.rs

@@ -1,9 +1,11 @@
-use super::{Action, OpTrait, selected_rev};
+use super::{Action, OpTrait};
 use crate::{
     Res,
-    app::{App, PromptParams, State},
-    item_data::{ItemData, Ref, Rev},
+    app::{App, State},
+    git,
+    item_data::{ItemData, Ref},
     menu::arg::Arg,
+    picker::{PickerParams, PickerState},
     term::Term,
 };
 use std::{
@@ -66,23 +68,30 @@ impl OpTrait for RebaseAbort {
 
 pub(crate) struct RebaseElsewhere;
 impl OpTrait for RebaseElsewhere {
-    fn get_action(&self, _target: &ItemData) -> Option<Action> {
+    fn get_action(&self, target: &ItemData) -> Option<Action> {
+        let default_ref = if let ItemData::Reference { kind, .. } = target {
+            Some(kind.clone())
+        } else {
+            None
+        };
+
         Some(Rc::new(move |app: &mut App, term: &mut Term| {
-            let rev = app.prompt(
+            let args = app.state.pending_menu.as_ref().unwrap().args();
+            app.close_menu();
+            let result = app.pick(
                 term,
-                &PromptParams {
-                    prompt: "Rebase onto",
-                    create_default_value: Box::new(|app| {
-                        selected_rev(app)
-                            .as_ref()
-                            .map(Rev::shorthand)
-                            .map(String::from)
-                    }),
-                    ..Default::default()
-                },
+                PickerState::with_refs(PickerParams {
+                    prompt: "Rebase onto".into(),
+                    refs: &git::branches_tags(&app.state.repo)?,
+                    exclude_ref: git::head_ref(&app.state.repo)?,
+                    default: default_ref.clone().map(crate::item_data::Rev::Ref),
+                    allow_custom_input: true,
+                }),
             )?;
 
-            rebase_elsewhere(app, term, &rev)?;
+            if let Some(data) = result {
+                rebase_elsewhere(app, term, data.display(), &args)?;
+            }
             Ok(())
         }))
     }
@@ -92,10 +101,15 @@ impl OpTrait for RebaseElsewhere {
     }
 }
 
-fn rebase_elsewhere(app: &mut App, term: &mut Term, rev: &str) -> Res<()> {
+fn rebase_elsewhere(
+    app: &mut App,
+    term: &mut Term,
+    rev: &str,
+    args: &[std::ffi::OsString],
+) -> Res<()> {
     let mut cmd = Command::new("git");
     cmd.arg("rebase");
-    cmd.args(app.state.pending_menu.as_ref().unwrap().args());
+    cmd.args(args);
     cmd.arg(rev);
 
     app.close_menu();

src/tests/snapshots/gitu__tests__rebase__rebase_elsewhere_prompt.snap

@@ -2,24 +2,24 @@
 source: src/tests/rebase.rs
 expression: ctx.redact_buffer()
 ---
-▌On branch other-branch                                                         |
+ On branch other-branch                                                         |
                                                                                 |
  Recent commits                                                                 |
  b66a0bf other-branch origin/main add initial-file                              |
                                                                                 |
                                                                                 |
                                                                                 |
                                                                                 |
+────────────────────────────────────────────────────────────────────────────────|
+ 3/3   Rebase onto › █                                                          |
+▌main                                                                           |
+ origin/HEAD                                                                    |
+ origin/main                                                                    |
                                                                                 |
                                                                                 |
                                                                                 |
                                                                                 |
                                                                                 |
                                                                                 |
                                                                                 |
-                                                                                |
-                                                                                |
-                                                                                |
-────────────────────────────────────────────────────────────────────────────────|
-? Rebase onto: › █                                                              |
-styles_hash: 53f8a523dd3a4d8a
+styles_hash: 65f4fc0ca3a35c1e