cybercyst/jj
1
0
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2025-05-05 23:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

repo: propagate erros from update_heads()

Browse Source
This commit is contained in:
Martin von Zweigbergk 2025-04-16 22:27:37 -07:00
parent 4a8cbe43a2
commit 5ad7ea24d3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/repo.rs
View File

@ -85,6 +85,7 @@ use crate::refs::diff_named_remote_refs;
use crate::refs::merge_ref_targets; use crate::refs::merge_ref_targets;
use crate::refs::merge_remote_refs; use crate::refs::merge_remote_refs;
use crate::revset; use crate::revset;
use crate::revset::RevsetEvaluationError;
use crate::revset::RevsetExpression; use crate::revset::RevsetExpression;
use crate::revset::RevsetIteratorExt as _; use crate::revset::RevsetIteratorExt as _;
use crate::rewrite::merge_commit_trees; use crate::rewrite::merge_commit_trees;
@ -1076,7 +1077,8 @@ impl MutableRepo {
options: &RewriteRefsOptions, options: &RewriteRefsOptions,
) -> BackendResult<()> { ) -> BackendResult<()> {
self.update_all_references(options)?; self.update_all_references(options)?;
self.update_heads(); self.update_heads()
.map_err(|err| err.into_backend_error())?;
Ok(()) Ok(())
} }
@ -1162,17 +1164,16 @@ impl MutableRepo {
Ok(()) Ok(())
} }
fn update_heads(&mut self) { fn update_heads(&mut self) -> Result<(), RevsetEvaluationError> {
let old_commits_expression = let old_commits_expression =
RevsetExpression::commits(self.parent_mapping.keys().cloned().collect()); RevsetExpression::commits(self.parent_mapping.keys().cloned().collect());
let heads_to_add_expression = old_commits_expression let heads_to_add_expression = old_commits_expression
.parents() .parents()
.minus(&old_commits_expression); .minus(&old_commits_expression);
let heads_to_add = heads_to_add_expression let heads_to_add: Vec<_> = heads_to_add_expression
.evaluate(self) .evaluate(self)?
.unwrap()
.iter() .iter()
.map(Result::unwrap); // TODO: Return error to caller .try_collect()?;
let mut view = self.view().store_view().clone(); let mut view = self.view().store_view().clone();
for commit_id in self.parent_mapping.keys() { for commit_id in self.parent_mapping.keys() {
@ -1180,6 +1181,7 @@ impl MutableRepo {
} }
view.head_ids.extend(heads_to_add); view.head_ids.extend(heads_to_add);
self.set_view(view); self.set_view(view);
Ok(())
} }
/// Find descendants of `root`, unless they've already been rewritten /// Find descendants of `root`, unless they've already been rewritten