mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 02:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

transaction: remove useless Option wrapping MutableRepo

Browse source
This commit is contained in:
Yuya Nishihara 2023-01-15 17:53:48 +09:00 committed by Martin von Zweigbergk
parent 985555f393
commit 11c6903786
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/src/transaction.rs
View file

@ -25,7 +25,7 @@ use crate::settings::UserSettings;
use crate::view::View; use crate::view::View;
pub struct Transaction { pub struct Transaction {
repo: Option<MutableRepo>, mut_repo: MutableRepo,
parent_ops: Vec<Operation>, parent_ops: Vec<Operation>,
op_metadata: OperationMetadata, op_metadata: OperationMetadata,
end_time: Option<Timestamp>, end_time: Option<Timestamp>,
@ -41,7 +41,7 @@ impl Transaction {
let op_metadata = create_op_metadata(user_settings, description.to_string()); let op_metadata = create_op_metadata(user_settings, description.to_string());
let end_time = user_settings.operation_timestamp(); let end_time = user_settings.operation_timestamp();
Transaction { Transaction {
repo: Some(mut_repo), mut_repo,
parent_ops, parent_ops,
op_metadata, op_metadata,
end_time, end_time,
@ -49,7 +49,7 @@ impl Transaction {
} }
pub fn base_repo(&self) -> &ReadonlyRepo { pub fn base_repo(&self) -> &ReadonlyRepo {
self.repo.as_ref().unwrap().base_repo() self.mut_repo.base_repo()
} }
pub fn set_tag(&mut self, key: String, value: String) { pub fn set_tag(&mut self, key: String, value: String) {
@ -57,11 +57,11 @@ impl Transaction {
} }
pub fn repo(&self) -> &MutableRepo { pub fn repo(&self) -> &MutableRepo {
self.repo.as_ref().unwrap() &self.mut_repo
} }
pub fn mut_repo(&mut self) -> &mut MutableRepo { pub fn mut_repo(&mut self) -> &mut MutableRepo {
self.repo.as_mut().unwrap() &mut self.mut_repo
} }
pub fn merge_operation(&mut self, other_op: Operation) { pub fn merge_operation(&mut self, other_op: Operation) {
@ -89,7 +89,7 @@ impl Transaction {
/// That means that a repo can be loaded at the operation, but the /// That means that a repo can be loaded at the operation, but the
/// operation will not be seen when loading the repo at head. /// operation will not be seen when loading the repo at head.
pub fn write(mut self) -> UnpublishedOperation { pub fn write(mut self) -> UnpublishedOperation {
let mut_repo = self.repo.take().unwrap(); let mut_repo = self.mut_repo;
// TODO: Should we instead just do the rebasing here if necessary? // TODO: Should we instead just do the rebasing here if necessary?
assert!( assert!(
!mut_repo.has_rewrites(), !mut_repo.has_rewrites(),