mirror of
https://github.com/martinvonz/jj.git
synced 2025-01-18 18:27:38 +00:00
examples: use settings_for_new_workspace() when initializing workspace
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
nix / flake check (push) Waiting to run
build / build (, macos-13) (push) Waiting to run
build / build (, macos-14) (push) Waiting to run
build / build (, ubuntu-latest) (push) Waiting to run
build / build (, windows-latest) (push) Waiting to run
build / build (--all-features, ubuntu-latest) (push) Waiting to run
build / Build jj-lib without Git support (push) Waiting to run
build / Check protos (push) Waiting to run
build / Check formatting (push) Waiting to run
build / Run doctests (push) Waiting to run
build / Check that MkDocs can build the docs (push) Waiting to run
build / Check that MkDocs can build the docs with latest Python and uv (push) Waiting to run
build / cargo-deny (advisories) (push) Waiting to run
build / cargo-deny (bans licenses sources) (push) Waiting to run
build / Clippy check (push) Waiting to run
Codespell / Codespell (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Some checks are pending
binaries / Build binary artifacts (push) Waiting to run
nix / flake check (push) Waiting to run
build / build (, macos-13) (push) Waiting to run
build / build (, macos-14) (push) Waiting to run
build / build (, ubuntu-latest) (push) Waiting to run
build / build (, windows-latest) (push) Waiting to run
build / build (--all-features, ubuntu-latest) (push) Waiting to run
build / Build jj-lib without Git support (push) Waiting to run
build / Check protos (push) Waiting to run
build / Check formatting (push) Waiting to run
build / Run doctests (push) Waiting to run
build / Check that MkDocs can build the docs (push) Waiting to run
build / Check that MkDocs can build the docs with latest Python and uv (push) Waiting to run
build / cargo-deny (advisories) (push) Waiting to run
build / cargo-deny (bans licenses sources) (push) Waiting to run
build / Clippy check (push) Waiting to run
Codespell / Codespell (push) Waiting to run
website / prerelease-docs-build-deploy (ubuntu-latest) (push) Waiting to run
Scorecards supply-chain security / Scorecards analysis (push) Waiting to run
Spotted while replacing callers of CommandHelper::settings().
This commit is contained in:
parent
1f6e207e25
commit
127f7e23ac
2 changed files with 6 additions and 6 deletions
|
@ -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(())
|
||||
}
|
||||
|
|
|
@ -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(),
|
||||
|
|
Loading…
Reference in a new issue