martinvonz/jj
1
1
Fork 0
mirror of https://github.com/martinvonz/jj.git synced 2024-11-11 13:46:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

repo: move MutableRepo from transaction module to repo module

Browse Source
This commit is contained in:
Martin von Zweigbergk 2021-01-31 18:00:14 -08:00
parent 2d03b514fc
commit 4ecbd89378
3 changed files with 67 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/evolution.rs
View File

@ -18,13 +18,13 @@ use std::sync::{Arc, Mutex};
use crate::commit::Commit;
use crate::commit_builder::CommitBuilder;
use crate::dag_walk::{bfs, closest_common_node, leaves, walk_ancestors};
use crate::repo::{ReadonlyRepo, Repo};
use crate::repo::{MutableRepo, ReadonlyRepo, Repo};
use crate::repo_path::DirRepoPath;
use crate::rewrite::{merge_commit_trees, rebase_commit};
use crate::settings::UserSettings;
use crate::store::{ChangeId, CommitId};
use crate::store_wrapper::StoreWrapper;
use crate::transaction::{MutableRepo, Transaction};
use crate::transaction::Transaction;
use crate::trees::merge_trees;
use crate::view::View;

67
lib/src/repo.rs
View File

@ -22,7 +22,7 @@ use std::sync::{Arc, Mutex, MutexGuard};
use thiserror::Error;
use crate::commit_builder::{new_change_id, signature};
use crate::evolution::{Evolution, ReadonlyEvolution};
use crate::evolution::{Evolution, MutableEvolution, ReadonlyEvolution};
use crate::git_store::GitStore;
use crate::index::IndexFile;
use crate::local_store::LocalStore;
@ -31,8 +31,8 @@ use crate::settings::{RepoSettings, UserSettings};
use crate::store;
use crate::store::{Store, StoreError};
use crate::store_wrapper::StoreWrapper;
use crate::transaction::{MutableRepo, Transaction};
use crate::view::{ReadonlyView, View};
use crate::transaction::Transaction;
use crate::view::{MutableView, ReadonlyView, View};
use crate::working_copy::WorkingCopy;
#[derive(Debug, Error, PartialEq, Eq)]
@ -324,3 +324,64 @@ impl Repo for ReadonlyRepo {
self.evolution.as_ref().unwrap()
}
}
pub struct MutableRepo<'r> {
repo: &'r ReadonlyRepo,
view: Option<MutableView>,
evolution: Option<MutableEvolution<'static, 'static>>,
}
impl<'r> Repo for MutableRepo<'r> {
fn store(&self) -> &Arc<StoreWrapper> {
self.repo.store()
}
fn view(&self) -> &dyn View {
self.view.as_ref().unwrap()
}
fn evolution(&self) -> &dyn Evolution {
self.evolution.as_ref().unwrap()
}
}
impl<'r> MutableRepo<'r> {
pub fn new(
repo: &'r ReadonlyRepo,
view: &ReadonlyView,
evolution: &ReadonlyEvolution<'r>,
) -> Arc<MutableRepo<'r>> {
let mut_view = view.start_modification();
let mut mut_repo = Arc::new(MutableRepo {
repo,
view: Some(mut_view),
evolution: None,
});
let repo_ref: &MutableRepo = mut_repo.as_ref();
let static_lifetime_repo: &'static MutableRepo = unsafe { std::mem::transmute(repo_ref) };
let mut_evolution: MutableEvolution<'_, '_> =
evolution.start_modification(static_lifetime_repo);
let static_lifetime_mut_evolution: MutableEvolution<'static, 'static> =
unsafe { std::mem::transmute(mut_evolution) };
Arc::get_mut(&mut mut_repo).unwrap().evolution = Some(static_lifetime_mut_evolution);
mut_repo
}
pub fn base_repo(&self) -> &'r ReadonlyRepo {
self.repo
}
pub fn view_mut(&mut self) -> &mut MutableView {
self.view.as_mut().unwrap()
}
pub fn take_view(mut self) -> MutableView {
self.view.take().unwrap()
}
pub fn evolution_mut<'m>(&'m mut self) -> &'m mut MutableEvolution<'r, 'm> {
let evolution: &mut MutableEvolution<'static, 'static> = self.evolution.as_mut().unwrap();
let evolution: &mut MutableEvolution<'r, 'm> = unsafe { std::mem::transmute(evolution) };
evolution
}
}

65
lib/src/transaction.rs
View File

@ -15,15 +15,13 @@
use crate::commit::Commit;
use crate::commit_builder::CommitBuilder;
use crate::conflicts;
use crate::evolution::{Evolution, MutableEvolution, ReadonlyEvolution};
use crate::op_store;
use crate::operation::Operation;
use crate::repo::{ReadonlyRepo, Repo};
use crate::repo::{MutableRepo, ReadonlyRepo, Repo};
use crate::settings::UserSettings;
use crate::store;
use crate::store::{CommitId, Timestamp};
use crate::store_wrapper::StoreWrapper;
use crate::view::{MutableView, ReadonlyView, View};
use std::ops::Deref;
use std::sync::Arc;
@ -34,12 +32,6 @@ pub struct Transaction<'r> {
closed: bool,
}
pub struct MutableRepo<'r> {
repo: &'r ReadonlyRepo,
view: Option<MutableView>,
evolution: Option<MutableEvolution<'static, 'static>>,
}
impl<'r> Transaction<'r> {
pub fn new(mut_repo: Arc<MutableRepo<'r>>, description: &str) -> Transaction<'r> {
Transaction {
@ -188,58 +180,3 @@ impl<'r> Drop for Transaction<'r> {
}
}
}
impl<'r> Repo for MutableRepo<'r> {
fn store(&self) -> &Arc<StoreWrapper> {
self.repo.store()
}
fn view(&self) -> &dyn View {
self.view.as_ref().unwrap()
}
fn evolution(&self) -> &dyn Evolution {
self.evolution.as_ref().unwrap()
}
}
impl<'r> MutableRepo<'r> {
pub fn new(
repo: &'r ReadonlyRepo,
view: &ReadonlyView,
evolution: &ReadonlyEvolution<'r>,
) -> Arc<MutableRepo<'r>> {
let mut_view = view.start_modification();
let mut mut_repo = Arc::new(MutableRepo {
repo,
view: Some(mut_view),
evolution: None,
});
let repo_ref: &MutableRepo = mut_repo.as_ref();
let static_lifetime_repo: &'static MutableRepo = unsafe { std::mem::transmute(repo_ref) };
let mut_evolution: MutableEvolution<'_, '_> =
evolution.start_modification(static_lifetime_repo);
let static_lifetime_mut_evolution: MutableEvolution<'static, 'static> =
unsafe { std::mem::transmute(mut_evolution) };
Arc::get_mut(&mut mut_repo).unwrap().evolution = Some(static_lifetime_mut_evolution);
mut_repo
}
pub fn base_repo(&self) -> &'r ReadonlyRepo {
self.repo
}
pub fn view_mut(&mut self) -> &mut MutableView {
self.view.as_mut().unwrap()
}
pub fn take_view(mut self) -> MutableView {
self.view.take().unwrap()
}
pub fn evolution_mut<'m>(&'m mut self) -> &'m mut MutableEvolution<'r, 'm> {
let evolution: &mut MutableEvolution<'static, 'static> = self.evolution.as_mut().unwrap();
let evolution: &mut MutableEvolution<'r, 'm> = unsafe { std::mem::transmute(evolution) };
evolution
}
}