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

repo: remove now-unused working copy path

Browse source
This commit is contained in:
Martin von Zweigbergk 2021-11-25 12:33:39 -08:00
parent b4f2b88522
commit f27f110d10
1 changed files with 0 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/repo.rs
View file

@ -98,7 +98,6 @@ impl<'a> RepoRef<'a> {
pub struct ReadonlyRepo {
repo_path: PathBuf,
wc_path: PathBuf,
store: Arc<Store>,
op_store: Arc<dyn OpStore>,
op_heads_store: Arc<OpHeadsStore>,
@ -113,7 +112,6 @@ impl Debug for ReadonlyRepo {
fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), std::fmt::Error> {
f.debug_struct("Repo")
.field("repo_path", &self.repo_path)
.field("wc_path", &self.wc_path)
.field("store", &self.store)
.finish()
}
@ -160,8 +158,6 @@ impl ReadonlyRepo {
) -> Arc<ReadonlyRepo> {
let repo_settings = user_settings.with_repo(&repo_path).unwrap();
let wc_path = repo_path.parent().unwrap().to_path_buf();
let signature = signature(user_settings);
let checkout_commit = backend::Commit {
parents: vec![],
@ -192,7 +188,6 @@ impl ReadonlyRepo {
Arc::new(ReadonlyRepo {
repo_path,
wc_path,
store,
op_store,
op_heads_store,
@ -210,7 +205,6 @@ impl ReadonlyRepo {
pub fn loader(&self) -> RepoLoader {
RepoLoader {
wc_path: self.wc_path.clone(),
repo_path: self.repo_path.clone(),
repo_settings: self.settings.clone(),
store: self.store.clone(),
@ -228,10 +222,6 @@ impl ReadonlyRepo {
&self.repo_path
}
pub fn working_copy_path(&self) -> &PathBuf {
&self.wc_path
}
pub fn op_id(&self) -> &OperationId {
self.operation.id()
}
@ -304,7 +294,6 @@ impl ReadonlyRepo {
}
pub struct RepoLoader {
wc_path: PathBuf,
repo_path: PathBuf,
repo_settings: RepoSettings,
store: Arc<Store>,
@ -315,7 +304,6 @@ pub struct RepoLoader {
impl RepoLoader {
pub fn init(user_settings: &UserSettings, repo_path: PathBuf) -> Self {
let wc_path = repo_path.parent().unwrap().to_owned();
let store_path = repo_path.join("store");
if store_path.is_file() {
// This is the old format. Let's be nice and upgrade any existing repos.
@ -343,7 +331,6 @@ impl RepoLoader {
let op_heads_store = Arc::new(OpHeadsStore::load(repo_path.join("op_heads")));
let index_store = Arc::new(IndexStore::load(repo_path.join("index")));
Self {
wc_path,
repo_path,
repo_settings,
store,
@ -357,10 +344,6 @@ impl RepoLoader {
&self.repo_path
}
pub fn working_copy_path(&self) -> &PathBuf {
&self.wc_path
}
pub fn store(&self) -> &Arc<Store> {
&self.store
}
@ -396,7 +379,6 @@ impl RepoLoader {
) -> Arc<ReadonlyRepo> {
let repo = ReadonlyRepo {
repo_path: self.repo_path.clone(),
wc_path: self.wc_path.clone(),
store: self.store.clone(),
op_store: self.op_store.clone(),
op_heads_store: self.op_heads_store.clone(),
@ -412,7 +394,6 @@ impl RepoLoader {
fn _finish_load(&self, operation: Operation, view: View) -> Arc<ReadonlyRepo> {
let repo = ReadonlyRepo {
repo_path: self.repo_path.clone(),
wc_path: self.wc_path.clone(),
store: self.store.clone(),
op_store: self.op_store.clone(),
op_heads_store: self.op_heads_store.clone(),