mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Store OpHeadsStore in UnpublishedOperation instead of RepoLoader

Browse source 
The only thing we need from the `RepoLoader` is the `OpHeadsStore`, so we can
extract it in UnpublishedOperation::new instead of keeping the entire
`RepoLoader` around.
This commit is contained in:
Evan Mesterhazy 2024-03-02 14:36:57 -05:00 committed by Evan Mesterhazy
parent 1439c902be
commit ff4a5aa491
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/src/transaction.rs
View file

@ -20,6 +20,7 @@ use itertools::Itertools as _;
use crate::backend::Timestamp;
use crate::index::ReadonlyIndex;
use crate::op_heads_store::OpHeadsStore;
use crate::op_store::OperationMetadata;
use crate::operation::Operation;
use crate::repo::{MutableRepo, ReadonlyRepo, Repo, RepoLoader, RepoLoaderError};
@ -132,7 +133,7 @@ impl Transaction {
.index_store()
.write_index(mut_index, operation.id())
.unwrap();
UnpublishedOperation::new(base_repo.loader(), operation, view, index)
UnpublishedOperation::new(&base_repo.loader(), operation, view, index)
}
}
@ -166,19 +167,21 @@ pub fn create_op_metadata(
/// finish the operation.
#[must_use = "Either publish() or leave_unpublished() must be called to finish the operation."]
pub struct UnpublishedOperation {
repo_loader: RepoLoader,
op_heads_store: Arc<dyn OpHeadsStore>,
repo: Arc<ReadonlyRepo>,
}
impl UnpublishedOperation {
fn new(
repo_loader: RepoLoader,
repo_loader: &RepoLoader,
operation: Operation,
view: View,
index: Box<dyn ReadonlyIndex>,
) -> Self {
let repo = repo_loader.create_from(operation, view, index);
UnpublishedOperation { repo_loader, repo }
UnpublishedOperation {
op_heads_store: repo_loader.op_heads_store().clone(),
repo: repo_loader.create_from(operation, view, index),
}
}
pub fn operation(&self) -> &Operation {
@ -186,9 +189,8 @@ impl UnpublishedOperation {
}
pub fn publish(self) -> Arc<ReadonlyRepo> {
let _lock = self.repo_loader.op_heads_store().lock();
self.repo_loader
.op_heads_store()
let _lock = self.op_heads_store.lock();
self.op_heads_store
.update_op_heads(self.operation().parent_ids(), self.operation().id());
self.repo
}