ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: borrow RepoLoader from Workspace

Browse source 
It should be slightly cheaper than constructing new RepoLoader.
This commit is contained in:
Yuya Nishihara 2024-09-15 20:06:50 +09:00
parent 9dc2cf802c
commit cb07e5ab67
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cli/src/commands/operation/diff.rs
View file

@ -84,8 +84,7 @@ pub fn cmd_op_diff(
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let workspace_command = command.workspace_helper(ui)?; let workspace_command = command.workspace_helper(ui)?;
let workspace_env = workspace_command.env(); let workspace_env = workspace_command.env();
let repo = workspace_command.repo(); let repo_loader = workspace_command.workspace().repo_loader();
let repo_loader = &repo.loader();
let from_op; let from_op;
let to_op; let to_op;
if args.from.is_some() || args.to.is_some() { if args.from.is_some() || args.to.is_some() {

3
cli/src/commands/operation/show.rs
View file

@ -53,8 +53,7 @@ pub fn cmd_op_show(
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let workspace_command = command.workspace_helper(ui)?; let workspace_command = command.workspace_helper(ui)?;
let workspace_env = workspace_command.env(); let workspace_env = workspace_command.env();
let repo = workspace_command.repo(); let repo_loader = workspace_command.workspace().repo_loader();
let repo_loader = &repo.loader();
let op = workspace_command.resolve_single_op(&args.operation)?; let op = workspace_command.resolve_single_op(&args.operation)?;
let parents: Vec<_> = op.parents().try_collect()?; let parents: Vec<_> = op.parents().try_collect()?;
let parent_op = repo_loader.merge_operations(command.settings(), parents, None)?; let parent_op = repo_loader.merge_operations(command.settings(), parents, None)?;