mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-28 23:55:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

git_backend: propagate init_internal() error to caller

Browse source
This commit is contained in:
Yuya Nishihara 2023-07-05 22:37:29 +09:00
parent 2db4c906ad
commit 84060d750b
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
examples/custom-backend/main.rs
View file

@ -54,7 +54,7 @@ fn run_custom_command(
let wc_path = command_helper.cwd();
// Initialize a workspace with the custom backend
Workspace::init_with_backend(command_helper.settings(), wc_path, |store_path| {
Ok(Box::new(JitBackend::init(store_path)))
Ok(Box::new(JitBackend::init(store_path)?))
})?;
Ok(())
}
@ -75,10 +75,9 @@ struct JitBackend {
}
impl JitBackend {
fn init(store_path: &Path) -> Self {
JitBackend {
inner: GitBackend::init_internal(store_path),
}
fn init(store_path: &Path) -> BackendResult<Self> {
let inner = GitBackend::init_internal(store_path)?;
Ok(JitBackend { inner })
}
fn load(store_path: &Path) -> Self {

18
lib/src/git_backend.rs
View file

@ -42,6 +42,8 @@ const CONFLICT_SUFFIX: &str = ".jjconflict";
#[derive(Debug, Error)]
pub enum GitBackendInitError {
#[error("Failed to initialize git repository: {0}")]
InitRepository(#[source] git2::Error),
#[error("Failed to open git repository: {0}")]
OpenRepository(#[source] git2::Error),
#[error(transparent)]
@ -78,13 +80,15 @@ impl GitBackend {
}
}
pub fn init_internal(store_path: &Path) -> Self {
let git_repo = git2::Repository::init_bare(store_path.join("git")).unwrap();
pub fn init_internal(store_path: &Path) -> Result<Self, GitBackendInitError> {
let git_repo = git2::Repository::init_bare(store_path.join("git"))
.map_err(GitBackendInitError::InitRepository)?;
let extra_path = store_path.join("extra");
fs::create_dir(&extra_path).unwrap();
fs::write(store_path.join("git_target"), b"git").unwrap();
fs::create_dir(&extra_path).context(&extra_path)?;
let target_path = store_path.join("git_target");
fs::write(&target_path, b"git").context(&target_path)?;
let extra_metadata_store = TableStore::init(extra_path, HASH_LENGTH);
GitBackend::new(git_repo, extra_metadata_store)
Ok(GitBackend::new(git_repo, extra_metadata_store))
}
pub fn init_external(
@ -912,7 +916,7 @@ mod tests {
#[test]
fn commit_has_ref() {
let temp_dir = testutils::new_temp_dir();
let store = GitBackend::init_internal(temp_dir.path());
let store = GitBackend::init_internal(temp_dir.path()).unwrap();
let signature = Signature {
name: "Someone".to_string(),
email: "someone@example.com".to_string(),
@ -943,7 +947,7 @@ mod tests {
#[test]
fn overlapping_git_commit_id() {
let temp_dir = testutils::new_temp_dir();
let store = GitBackend::init_internal(temp_dir.path());
let store = GitBackend::init_internal(temp_dir.path()).unwrap();
let mut commit1 = Commit {
parents: vec![store.root_commit_id().clone()],
predecessors: vec![],

2
lib/src/workspace.rs
View file

@ -144,7 +144,7 @@ impl Workspace {
workspace_root: &Path,
) -> Result<(Self, Arc<ReadonlyRepo>), WorkspaceInitError> {
Self::init_with_backend(user_settings, workspace_root, |store_path| {
Ok(Box::new(GitBackend::init_internal(store_path)))
Ok(Box::new(GitBackend::init_internal(store_path)?))
})
}