examples: use settings_for_new_workspace() when initializing workspace

Spotted while replacing callers of CommandHelper::settings().
jj-vcs · Jan 6, 2025 · 127f7e2 · 127f7e2
1 parent 1f6e207
commit 127f7e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cli/examples/custom-backend/main.rs b/cli/examples/custom-backend/main.rs
@@ -73,13 +73,13 @@ fn run_custom_command(
     match command {
         CustomCommand::InitJit => {
             let wc_path = command_helper.cwd();
+            let settings = command_helper.settings_for_new_workspace(wc_path)?;
             // Initialize a workspace with the custom backend
             Workspace::init_with_backend(
-                command_helper.settings(),
+                &settings,
                 wc_path,
                 &|settings, store_path| Ok(Box::new(JitBackend::init(settings, store_path)?)),
-                Signer::from_settings(command_helper.settings())
-                    .map_err(WorkspaceInitError::SignInit)?,
+                Signer::from_settings(&settings).map_err(WorkspaceInitError::SignInit)?,
             )?;
             Ok(())
         }

diff --git a/cli/examples/custom-working-copy/main.rs b/cli/examples/custom-working-copy/main.rs
@@ -63,17 +63,17 @@ fn run_custom_command(
     match command {
         CustomCommand::InitConflicts => {
             let wc_path = command_helper.cwd();
+            let settings = command_helper.settings_for_new_workspace(wc_path)?;
             let backend_initializer = |settings: &UserSettings, store_path: &Path| {
                 let backend: Box<dyn Backend> =
                     Box::new(GitBackend::init_internal(settings, store_path)?);
                 Ok(backend)
             };
             Workspace::init_with_factories(
-                command_helper.settings(),
+                &settings,
                 wc_path,
                 &backend_initializer,
-                Signer::from_settings(command_helper.settings())
-                    .map_err(WorkspaceInitError::SignInit)?,
+                Signer::from_settings(&settings).map_err(WorkspaceInitError::SignInit)?,
                 &ReadonlyRepo::default_op_store_initializer(),
                 &ReadonlyRepo::default_op_heads_store_initializer(),
                 &ReadonlyRepo::default_index_store_initializer(),