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

cli: pass UserSettings in to update_working_copy() explicitly

Browse source
This commit is contained in:
Yuya Nishihara 2023-01-04 18:22:22 +09:00
parent 4b1008271b
commit 69bfaf8b76
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cli_util.rs
View file

@ -953,6 +953,7 @@ impl WorkspaceCommandHelper {
&self.workspace_id(), &self.workspace_id(),
self.workspace.working_copy_mut(), self.workspace.working_copy_mut(),
maybe_old_commit.as_ref(), maybe_old_commit.as_ref(),
&self.settings,
)?; )?;
if let Some(stats) = stats { if let Some(stats) = stats {
print_checkout_stats(ui, stats)?; print_checkout_stats(ui, stats)?;
@ -1227,6 +1228,7 @@ pub fn update_working_copy(
workspace_id: &WorkspaceId, workspace_id: &WorkspaceId,
wc: &mut WorkingCopy, wc: &mut WorkingCopy,
old_commit: Option<&Commit>, old_commit: Option<&Commit>,
settings: &UserSettings,
) -> Result<Option<CheckoutStats>, CommandError> { ) -> Result<Option<CheckoutStats>, CommandError> {
let new_commit_id = match repo.view().get_wc_commit_id(workspace_id) { let new_commit_id = match repo.view().get_wc_commit_id(workspace_id) {
Some(new_commit_id) => new_commit_id, Some(new_commit_id) => new_commit_id,
@ -1267,7 +1269,7 @@ pub fn update_working_copy(
repo.as_repo_ref(), repo.as_repo_ref(),
workspace_id, workspace_id,
&new_commit, &new_commit,
ui.settings(), settings,
)?; )?;
ui.write("\n")?; ui.write("\n")?;
} }