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

repo: use Transaction for creating repo-init operation

Browse source 
Since the operation log has a root operation, we don't need to create
the repo-initialization operation in order to create a valid
`ReadonlyRepo` instance. I think it's conceptually simpler to create
the instance at the root operation id and then add the initial
operation using the usual `Transaction` API. That's what this patch
does.

Doing that also brought two issues to light:

 1. The empty view object doesn't have the root commit as head.
 2. The initialized `OpHeadsStore` doesn't have the root operation as
     head.

Both of those seem somewhat reasonable, but maybe we should change
them. For now, I just made the initial repo (before the initial
operation) have a single op head (to compensate for (2)). It might be
worth addressing both issues so the repo is in a better state before
we create the initial operation. Until we do, we probably shouldn't
drop the initial operation.
This commit is contained in:
Martin von Zweigbergk 2024-02-09 23:08:57 -08:00 committed by Martin von Zweigbergk
parent 305a507ae3
commit 48a9f9ef56
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/src/repo.rs
View file

@ -172,6 +172,7 @@ impl ReadonlyRepo {
let op_heads_store = op_heads_store_initializer(user_settings, &op_heads_path); let op_heads_store = op_heads_store_initializer(user_settings, &op_heads_path);
let op_heads_type_path = op_heads_path.join("type"); let op_heads_type_path = op_heads_path.join("type");
fs::write(&op_heads_type_path, op_heads_store.name()).context(&op_heads_type_path)?; fs::write(&op_heads_type_path, op_heads_store.name()).context(&op_heads_type_path)?;
op_heads_store.update_op_heads(&[], op_store.root_operation_id());
let op_heads_store: Arc<dyn OpHeadsStore> = Arc::from(op_heads_store); let op_heads_store: Arc<dyn OpHeadsStore> = Arc::from(op_heads_store);
let index_path = repo_path.join("index"); let index_path = repo_path.join("index");
@ -189,33 +190,33 @@ impl ReadonlyRepo {
.context(&submodule_store_type_path)?; .context(&submodule_store_type_path)?;
let submodule_store = Arc::from(submodule_store); let submodule_store = Arc::from(submodule_store);
let operation_metadata = let root_operation_data = op_store
crate::transaction::create_op_metadata(user_settings, "initialize repo".to_string()); .read_operation(op_store.root_operation_id())
let mut root_view = op_store::View::default(); .expect("failed to read root operation");
root_view.head_ids.insert(store.root_commit_id().clone()); let root_operation = Operation::new(
let root_view_id = op_store.write_view(&root_view).unwrap(); op_store.clone(),
let init_operation = op_store::Operation { op_store.root_operation_id().clone(),
view_id: root_view_id, root_operation_data,
parents: vec![op_store.root_operation_id().clone()], );
metadata: operation_metadata, let root_view = root_operation.view().expect("failed to read root view");
}; let repo = Arc::new(ReadonlyRepo {
let init_operation_id = op_store.write_operation(&init_operation).unwrap();
let init_operation = Operation::new(op_store.clone(), init_operation_id, init_operation);
op_heads_store.update_op_heads(&[], init_operation.id());
let view = View::new(root_view);
Ok(Arc::new(ReadonlyRepo {
repo_path, repo_path,
store, store,
op_store, op_store,
op_heads_store, op_heads_store,
operation: init_operation, operation: root_operation,
settings: repo_settings, settings: repo_settings,
index_store, index_store,
index: OnceCell::new(), index: OnceCell::new(),
change_id_index: OnceCell::new(), change_id_index: OnceCell::new(),
view, view: root_view,
submodule_store, submodule_store,
})) });
let mut tx = repo.start_transaction(user_settings);
tx.mut_repo()
.add_head(&repo.store().root_commit())
.expect("failed to add root commit as head");
Ok(tx.commit("initialize repo"))
} }
pub fn loader(&self) -> RepoLoader { pub fn loader(&self) -> RepoLoader {