mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

git_backend: extract inner function that initializes backend with open git repo

Browse source
This commit is contained in:
Yuya Nishihara 2023-11-04 09:42:41 +09:00
parent dce640aaf1
commit ce46c10c96
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/src/git_backend.rs
View file

@ -126,27 +126,35 @@ impl GitBackend {
} }
pub fn init_internal(store_path: &Path) -> Result<Self, Box<GitBackendInitError>> { pub fn init_internal(store_path: &Path) -> Result<Self, Box<GitBackendInitError>> {
let git_repo_path = Path::new("git");
let git_repo = gix::ThreadSafeRepository::init( let git_repo = gix::ThreadSafeRepository::init(
store_path.join("git"), store_path.join(git_repo_path),
gix::create::Kind::Bare, gix::create::Kind::Bare,
gix::create::Options::default(), gix::create::Options::default(),
) )
.map_err(GitBackendInitError::InitRepository)?; .map_err(GitBackendInitError::InitRepository)?;
let extra_path = store_path.join("extra"); Self::init_with_repo(store_path, git_repo_path, git_repo)
fs::create_dir(&extra_path)
.context(&extra_path)
.map_err(GitBackendInitError::Path)?;
let target_path = store_path.join("git_target");
fs::write(&target_path, b"git")
.context(&target_path)
.map_err(GitBackendInitError::Path)?;
let extra_metadata_store = TableStore::init(extra_path, HASH_LENGTH);
Ok(GitBackend::new(git_repo, extra_metadata_store))
} }
pub fn init_external( pub fn init_external(
store_path: &Path, store_path: &Path,
git_repo_path: &Path, git_repo_path: &Path,
) -> Result<Self, Box<GitBackendInitError>> {
let canonical_git_repo_path = {
let path = store_path.join(git_repo_path);
path.canonicalize()
.context(&path)
.map_err(GitBackendInitError::Path)?
};
let git_repo = gix::ThreadSafeRepository::open(canonical_git_repo_path)
.map_err(GitBackendInitError::OpenRepository)?;
Self::init_with_repo(store_path, git_repo_path, git_repo)
}
fn init_with_repo(
store_path: &Path,
git_repo_path: &Path,
git_repo: gix::ThreadSafeRepository,
) -> Result<Self, Box<GitBackendInitError>> { ) -> Result<Self, Box<GitBackendInitError>> {
let extra_path = store_path.join("extra"); let extra_path = store_path.join("extra");
fs::create_dir(&extra_path) fs::create_dir(&extra_path)
@ -172,16 +180,8 @@ impl GitBackend {
.context(&target_path) .context(&target_path)
.map_err(GitBackendInitError::Path)?; .map_err(GitBackendInitError::Path)?;
}; };
let canonical_git_repo_path = {
let path = store_path.join(git_repo_path);
path.canonicalize()
.context(&path)
.map_err(GitBackendInitError::Path)?
};
let repo = gix::ThreadSafeRepository::open(canonical_git_repo_path)
.map_err(GitBackendInitError::OpenRepository)?;
let extra_metadata_store = TableStore::init(extra_path, HASH_LENGTH); let extra_metadata_store = TableStore::init(extra_path, HASH_LENGTH);
Ok(GitBackend::new(repo, extra_metadata_store)) Ok(GitBackend::new(git_repo, extra_metadata_store))
} }
pub fn load(store_path: &Path) -> Result<Self, Box<GitBackendLoadError>> { pub fn load(store_path: &Path) -> Result<Self, Box<GitBackendLoadError>> {