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

cli: stop using shared id prefix context to compute immutable heads

Browse source 
It's unlikely that the immutable set is defined by short hashes, and more
importantly, the cache must not be initialized by using tx.repo().
This commit is contained in:
Yuya Nishihara 2024-06-23 19:48:30 +09:00
parent f8e106a194
commit 297a0ebb68
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cli/src/cli_util.rs
View file

@ -1112,6 +1112,11 @@ impl WorkspaceCommandHelper {
Ok(())
};
}
// Not using self.id_prefix_context() because the disambiguation data
// must not be calculated and cached against arbitrary repo. It's also
// unlikely that the immutable expression contains short hashes.
let id_prefix_context = IdPrefixContext::new(self.revset_extensions.clone());
let to_rewrite_revset =
RevsetExpression::commits(commits.into_iter().cloned().collect_vec());
let immutable = revset_util::parse_immutable_expression(&self.revset_parse_context())
@ -1121,7 +1126,7 @@ impl WorkspaceCommandHelper {
let mut expression = RevsetExpressionEvaluator::new(
repo,
self.revset_extensions.clone(),
self.id_prefix_context()?,
&id_prefix_context,
immutable,
);
expression.intersect_with(&to_rewrite_revset);