martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-09-20 18:29:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

op_heads_store: remove Result that never fails (#111)

Browse Source
This commit is contained in:
Martin von Zweigbergk 2022-03-19 23:42:08 -07:00 committed by Martin von Zweigbergk
parent 40aa9741ec
commit 364f8010e7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/src/op_heads_store.rs
View File

@ -166,7 +166,7 @@ impl OpHeadsStore {
return Ok(op_heads.pop().unwrap());
}
let merged_repo = merge_op_heads(repo_loader, op_heads)?.leave_unpublished();
let merged_repo = merge_op_heads(repo_loader, op_heads).leave_unpublished();
let merge_operation = merged_repo.operation().clone();
locked_op_heads.finish(&merge_operation);
// TODO: Change the return type include the repo if we have it (as we do here)
@ -190,10 +190,7 @@ impl OpHeadsStore {
}
}
fn merge_op_heads(
repo_loader: &RepoLoader,
mut op_heads: Vec<Operation>,
) -> Result<UnpublishedOperation, OpHeadResolutionError> {
fn merge_op_heads(repo_loader: &RepoLoader, mut op_heads: Vec<Operation>) -> UnpublishedOperation {
op_heads.sort_by_key(|op| op.store_operation().metadata.end_time.timestamp.clone());
let base_repo = repo_loader.load_at(&op_heads[0]);
let mut tx = base_repo.start_transaction("resolve concurrent operations");
@ -216,5 +213,5 @@ fn merge_op_heads(
// TODO: We already have the resulting View in this case but Operation cannot
// keep it. Teach Operation to have a cached View so the caller won't have
// to re-read it from the store (by calling Operation::view())?
Ok(tx.write())
tx.write()
}