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

repo: rename .jj/repo/store/backend to .jj/repo/store/type

Browse source 
We decided to call the files identifying the backend type `type`. We
already use that name for `OpStore` and `OpHeadsStore`.
This commit is contained in:
Martin von Zweigbergk 2023-01-24 20:00:58 -08:00 committed by Martin von Zweigbergk
parent 7f4e714ffe
commit 0d1ec835c1
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/repo.rs
View file

@ -156,7 +156,7 @@ impl ReadonlyRepo {
let store_path = repo_path.join("store"); let store_path = repo_path.join("store");
fs::create_dir(&store_path).context(&store_path)?; fs::create_dir(&store_path).context(&store_path)?;
let backend = backend_factory(&store_path); let backend = backend_factory(&store_path);
let backend_path = store_path.join("backend"); let backend_path = store_path.join("type");
fs::write(&backend_path, backend.name()).context(&backend_path)?; fs::write(&backend_path, backend.name()).context(&backend_path)?;
let store = Store::new(backend); let store = Store::new(backend);
let repo_settings = user_settings.with_repo(&repo_path).unwrap(); let repo_settings = user_settings.with_repo(&repo_path).unwrap();
@ -383,17 +383,21 @@ impl StoreFactories {
} }
pub fn load_backend(&self, store_path: &Path) -> Box<dyn Backend> { pub fn load_backend(&self, store_path: &Path) -> Box<dyn Backend> {
// TODO: Change the 'backend' file to 'type', for consistency with other stores // For compatibility with existing repos. TODO: Delete in 0.8+.
let backend_type = match fs::read_to_string(store_path.join("backend")) { if store_path.join("backend").is_file() {
fs::rename(store_path.join("backend"), store_path.join("type"))
.expect("Failed to rename 'backend' file to 'type'");
}
let backend_type = match fs::read_to_string(store_path.join("type")) {
Ok(content) => content, Ok(content) => content,
Err(err) if err.kind() == ErrorKind::NotFound => { Err(err) if err.kind() == ErrorKind::NotFound => {
// For compatibility with existing repos. TODO: Delete in spring of 2023 or so. // For compatibility with existing repos. TODO: Delete in 0.8+.
let inferred_type = if store_path.join("git_target").is_file() { let inferred_type = if store_path.join("git_target").is_file() {
String::from("git") String::from("git")
} else { } else {
String::from("local") String::from("local")
}; };
fs::write(store_path.join("backend"), &inferred_type).unwrap(); fs::write(store_path.join("type"), &inferred_type).unwrap();
inferred_type inferred_type
} }
Err(_) => { Err(_) => {