mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 07:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

sparse: extract helper that updates sparse patterns within workspace lock

Browse source 
I assumed locked_wc.sparse_patterns() is cheap operation. If it isn't, a
locked_ws/wc should be passed to the callback instead.
This commit is contained in:
Yuya Nishihara 2024-03-28 20:52:25 +09:00
parent fff852f136
commit 0711ac30c3
1 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
cli/src/commands/sparse.rs
View file

@ -23,7 +23,9 @@ use jj_lib::repo_path::RepoPathBuf;
use jj_lib::settings::UserSettings; use jj_lib::settings::UserSettings;
use tracing::instrument; use tracing::instrument;
use crate::cli_util::{edit_temp_file, print_checkout_stats, CommandHelper}; use crate::cli_util::{
edit_temp_file, print_checkout_stats, CommandHelper, WorkspaceCommandHelper,
};
use crate::command_error::{ use crate::command_error::{
internal_error, internal_error_with_message, user_error_with_message, CommandError, internal_error, internal_error_with_message, user_error_with_message, CommandError,
}; };
@ -111,36 +113,29 @@ fn cmd_sparse_set(
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut workspace_command = command.workspace_helper(ui)?; let mut workspace_command = command.workspace_helper(ui)?;
let repo_path = workspace_command.repo().repo_path().to_owned(); let repo_path = workspace_command.repo().repo_path().to_owned();
let (mut locked_ws, wc_commit) = workspace_command.start_working_copy_mutation()?; update_sparse_patterns_with(ui, &mut workspace_command, |_ui, old_patterns| {
let mut new_patterns = HashSet::new(); let mut new_patterns = HashSet::new();
if args.reset { if args.reset {
new_patterns.insert(RepoPathBuf::root()); new_patterns.insert(RepoPathBuf::root());
} else { } else {
if !args.clear { if !args.clear {
new_patterns.extend(locked_ws.locked_wc().sparse_patterns()?.iter().cloned()); new_patterns.extend(old_patterns.iter().cloned());
for path in &args.remove { for path in &args.remove {
new_patterns.remove(path); new_patterns.remove(path);
}
}
for path in &args.add {
new_patterns.insert(path.to_owned());
} }
} }
for path in &args.add { let mut new_patterns = new_patterns.into_iter().collect_vec();
new_patterns.insert(path.to_owned());
}
}
let mut new_patterns = new_patterns.into_iter().collect_vec();
new_patterns.sort();
if args.edit {
new_patterns = edit_sparse(&repo_path, &new_patterns, command.settings())?;
new_patterns.sort(); new_patterns.sort();
} if args.edit {
let stats = locked_ws new_patterns = edit_sparse(&repo_path, &new_patterns, command.settings())?;
.locked_wc() new_patterns.sort();
.set_sparse_patterns(new_patterns) }
.map_err(|err| internal_error_with_message("Failed to update working copy paths", err))?; Ok(new_patterns)
let operation_id = locked_ws.locked_wc().old_operation_id().clone(); })
locked_ws.finish(operation_id)?;
print_checkout_stats(ui, stats, &wc_commit)?;
Ok(())
} }
fn edit_sparse( fn edit_sparse(
@ -180,3 +175,20 @@ fn edit_sparse(
}) })
.try_collect() .try_collect()
} }
fn update_sparse_patterns_with(
ui: &mut Ui,
workspace_command: &mut WorkspaceCommandHelper,
f: impl FnOnce(&mut Ui, &[RepoPathBuf]) -> Result<Vec<RepoPathBuf>, CommandError>,
) -> Result<(), CommandError> {
let (mut locked_ws, wc_commit) = workspace_command.start_working_copy_mutation()?;
let new_patterns = f(ui, locked_ws.locked_wc().sparse_patterns()?)?;
let stats = locked_ws
.locked_wc()
.set_sparse_patterns(new_patterns)
.map_err(|err| internal_error_with_message("Failed to update working copy paths", err))?;
let operation_id = locked_ws.locked_wc().old_operation_id().clone();
locked_ws.finish(operation_id)?;
print_checkout_stats(ui, stats, &wc_commit)?;
Ok(())
}