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

git_backend: leverage std::fs::read/write() helpers

Browse source
This commit is contained in:
Yuya Nishihara 2023-07-05 20:48:00 +09:00
parent 6d6b87f4b0
commit a09a406817
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/src/git_backend.rs
View file

@ -14,11 +14,10 @@
use std::any::Any;
use std::fmt::{Debug, Error, Formatter};
use std::fs::File;
use std::io::{Cursor, Read, Write};
use std::io::{Cursor, Read};
use std::path::Path;
use std::slice;
use std::sync::{Arc, Mutex, MutexGuard};
use std::{fs, slice};
use git2::Oid;
use itertools::Itertools;
@ -66,18 +65,19 @@ impl GitBackend {
pub fn init_internal(store_path: &Path) -> Self {
let git_repo = git2::Repository::init_bare(store_path.join("git")).unwrap();
let extra_path = store_path.join("extra");
std::fs::create_dir(&extra_path).unwrap();
let mut git_target_file = File::create(store_path.join("git_target")).unwrap();
git_target_file.write_all(b"git").unwrap();
fs::create_dir(&extra_path).unwrap();
fs::write(store_path.join("git_target"), b"git").unwrap();
let extra_metadata_store = TableStore::init(extra_path, HASH_LENGTH);
GitBackend::new(git_repo, extra_metadata_store)
}
pub fn init_external(store_path: &Path, git_repo_path: &Path) -> Result<Self, BackendError> {
let extra_path = store_path.join("extra");
std::fs::create_dir(&extra_path)?;
let mut git_target_file = File::create(store_path.join("git_target"))?;
git_target_file.write_all(git_repo_path.to_str().unwrap().as_bytes())?;
fs::create_dir(&extra_path)?;
fs::write(
store_path.join("git_target"),
git_repo_path.to_str().unwrap().as_bytes(),
)?;
let repo = git2::Repository::open(store_path.join(git_repo_path))
.map_err(|err| BackendError::Other(format!("Failed to open git repository: {err}")))?;
let extra_metadata_store = TableStore::init(extra_path, HASH_LENGTH);
@ -85,10 +85,7 @@ impl GitBackend {
}
pub fn load(store_path: &Path) -> Self {
let mut git_target_file = File::open(store_path.join("git_target")).unwrap();
let mut buf = Vec::new();
git_target_file.read_to_end(&mut buf).unwrap();
let git_repo_path_str = String::from_utf8(buf).unwrap();
let git_repo_path_str = fs::read_to_string(store_path.join("git_target")).unwrap();
let git_repo_path = store_path.join(git_repo_path_str).canonicalize().unwrap();
let repo = git2::Repository::open(git_repo_path).unwrap();
let extra_metadata_store = TableStore::load(store_path.join("extra"), HASH_LENGTH);