Skip to content

use new picker during cherry-pick #517

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
altsem merged 2 commits into from
Mar 22, 2026
Merged

use new picker during cherry-pick #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36396b6
use new picker during cherry-pick
altsem Mar 22, 2026
2360934
Merge branch 'master' into cherry-pick-new-picker
altsem Mar 22, 2026
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
32 changes: 17 additions & 15 deletions src/ops/cherry_pick.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ use std::{process::Command, rc::Rc};

use crate::{
Res,
app::{App, PromptParams, State},
item_data::{ItemData, Rev},
app::{App, State},
git,
item_data::ItemData,
menu::arg::Arg,
picker::{PickerParams, PickerState},
term::Term,
};

Expand Down Expand Up @@ -52,23 +54,23 @@ impl OpTrait for CherryPickContinue {

pub(crate) struct CherryPick;
impl OpTrait for CherryPick {
fn get_action(&self, _target: &ItemData) -> Option<Action> {
fn get_action(&self, target: &ItemData) -> Option<Action> {
let rev = target.rev();
Some(Rc::new(move |app: &mut App, term: &mut Term| {
let commit = app.prompt(
let result = app.pick(
term,
&PromptParams {
prompt: "Cherry-pick commit",
create_default_value: Box::new(|app| {
selected_rev(app)
.as_ref()
.map(Rev::shorthand)
.map(String::from)
}),
..Default::default()
},
PickerState::with_refs(PickerParams {
prompt: "Cherry-pick".into(),
refs: &git::branches_tags(&app.state.repo)?,
exclude_ref: git::head_ref(&app.state.repo)?,
default: rev.clone().or_else(|| selected_rev(app)),
allow_custom_input: true,
}),
)?;

cherry_pick(app, term, &commit)?;
if let Some(data) = result {
cherry_pick(app, term, data.display())?;
}
Ok(())
}))
}
Expand Down
16 changes: 8 additions & 8 deletions src/tests/snapshots/gitu__tests__cherry_pick__cherry_pick_prompt.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
source: src/tests/cherry_pick.rs
expression: ctx.redact_buffer()
---
▌b66a0bf main origin/main add initial-file |
|
|
|
|
b66a0bf main origin/main add initial-file |
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────|
4/4 Cherry-pick › █ |
▌main |
other-branch |
origin/HEAD |
origin/main |
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────|
? Cherry-pick commit (default main): › █ |
styles_hash: bee94fff2519b82b
styles_hash: f868f120e27e8b1b