mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cli: make check_rewritable() not evaluate revset to commit objects

Browse source
This commit is contained in:
Yuya Nishihara 2024-03-31 19:09:25 +09:00
parent 784d735ecc
commit b3d3b26656
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cli/src/cli_util.rs
View file

@ -1019,16 +1019,15 @@ impl WorkspaceCommandHelper {
let immutable = revset_util::parse_immutable_expression(&self.revset_parse_context())?;
let mut expression = self.attach_revset_evaluator(immutable)?;
expression.intersect_with(&to_rewrite_revset);
if let Some(commit) = expression.evaluate_to_commits()?.next() {
let commit = commit?;
let error = if commit.id() == self.repo().store().root_commit_id() {
if let Some(commit_id) = expression.evaluate_to_commit_ids()?.next() {
let error = if &commit_id == self.repo().store().root_commit_id() {
user_error(format!(
"The root commit {} is immutable",
short_commit_hash(commit.id()),
short_commit_hash(&commit_id),
))
} else {
user_error_with_hint(
format!("Commit {} is immutable", short_commit_hash(commit.id()),),
format!("Commit {} is immutable", short_commit_hash(&commit_id)),
"Configure the set of immutable commits via \
`revset-aliases.immutable_heads()`.",
)