mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-01 00:50:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

branch.rs: move find_globs function out of cmd_branch_forget

Browse source 
This prepares for using it in `cmd_branch_delete`.
This commit is contained in:
Ilya Grigoriev 2023-06-23 23:27:48 -07:00
parent 144a44914a
commit 97815851f7
1 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
src/commands/branch.rs
View file

@ -201,6 +201,41 @@ fn cmd_branch_set(
Ok(()) Ok(())
} }
/// This function may return the same branch more than once
fn find_globs(view: &View, globs: &[String]) -> Result<Vec<String>, CommandError> {
let mut matching_branches: Vec<String> = vec![];
let mut failed_globs = vec![];
for glob_str in globs {
let glob = glob::Pattern::new(glob_str)?;
let names = view
.branches()
.iter()
.map(|(branch_name, _branch_target)| branch_name)
.filter(|branch_name| glob.matches(branch_name))
.cloned()
.collect_vec();
if names.is_empty() {
failed_globs.push(glob);
}
matching_branches.extend(names.into_iter());
}
match &failed_globs[..] {
[] => { /* No problem */ }
[glob] => {
return Err(user_error(format!(
"The provided glob '{glob}' did not match any branches"
)))
}
globs => {
return Err(user_error(format!(
"The provided globs '{}' did not match any branches",
globs.iter().join("', '")
)))
}
};
Ok(matching_branches)
}
fn cmd_branch_delete( fn cmd_branch_delete(
ui: &mut Ui, ui: &mut Ui,
command: &CommandHelper, command: &CommandHelper,
@ -231,40 +266,6 @@ fn cmd_branch_forget(
command: &CommandHelper, command: &CommandHelper,
args: &BranchForgetArgs, args: &BranchForgetArgs,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
fn find_globs(view: &View, globs: &[String]) -> Result<Vec<String>, CommandError> {
let mut matching_branches: Vec<String> = vec![];
let mut failed_globs = vec![];
for glob_str in globs {
let glob = glob::Pattern::new(glob_str)?;
let names = view
.branches()
.iter()
.map(|(branch_name, _branch_target)| branch_name)
.filter(|branch_name| glob.matches(branch_name))
.cloned()
.collect_vec();
if names.is_empty() {
failed_globs.push(glob);
}
matching_branches.extend(names.into_iter());
}
match &failed_globs[..] {
[] => { /* No problem */ }
[glob] => {
return Err(user_error(format!(
"The provided glob '{glob}' did not match any branches"
)))
}
globs => {
return Err(user_error(format!(
"The provided globs '{}' did not match any branches",
globs.iter().join("', '")
)))
}
};
Ok(matching_branches)
}
let mut workspace_command = command.workspace_helper(ui)?; let mut workspace_command = command.workspace_helper(ui)?;
let view = workspace_command.repo().view(); let view = workspace_command.repo().view();
for branch_name in args.names.iter() { for branch_name in args.names.iter() {