matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Use MapIntoHookError for mapping into hook error

Browse source
This commit is contained in:
Matthias Beyer 2016-09-07 18:39:47 +02:00
parent ec1b5f7e8b
commit ced6342d01
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
libimagstorestdhook/src/vcs/git/create.rs
View file

@ -21,6 +21,7 @@ use libimagerror::into::IntoError;
use libimagutil::debug_result::*; use libimagutil::debug_result::*;
use vcs::git::result::Result; use vcs::git::result::Result;
use vcs::git::error::MapIntoHookError;
use vcs::git::error::MapErrInto; use vcs::git::error::MapErrInto;
use vcs::git::error::GitHookErrorKind as GHEK; use vcs::git::error::GitHookErrorKind as GHEK;
use vcs::git::error::GitHookError as GHE; use vcs::git::error::GitHookError as GHE;
@ -90,10 +91,16 @@ impl StoreIdAccessor for CreateHook {
fn access(&self, id: &StoreId) -> HookResult<()> { fn access(&self, id: &StoreId) -> HookResult<()> {
use vcs::git::action::StoreAction; use vcs::git::action::StoreAction;
use vcs::git::config::commit_message; use vcs::git::config::commit_message;
use vcs::git::error::MapIntoHookError;
debug!("[GIT CREATE HOOK]: {:?}", id); debug!("[GIT CREATE HOOK]: {:?}", id);
let path = try!(id.into_pathbuf().map_err_into(GHEK::StoreIdHandlingError)); let path = try!(
id.clone()
.into_pathbuf()
.map_err_into(GHEK::StoreIdHandlingError)
.map_into_hook_error()
);
let cfg = try!( let cfg = try!(
self.runtime self.runtime
@ -102,11 +109,7 @@ impl StoreIdAccessor for CreateHook {
); );
debug!("[GIT CREATE HOOK]: Ensuring branch checkout"); debug!("[GIT CREATE HOOK]: Ensuring branch checkout");
try!(self try!(self.runtime.ensure_cfg_branch_is_checked_out());
.runtime
.ensure_cfg_branch_is_checked_out()
.map_err(Box::new)
.map_err(|e| HEK::HookExecutionError.into_error_with_cause(e)));
debug!("[GIT CREATE HOOK]: Branch checked out"); debug!("[GIT CREATE HOOK]: Branch checked out");
debug!("[GIT CREATE HOOK]: Getting repository"); debug!("[GIT CREATE HOOK]: Getting repository");
@ -115,14 +118,22 @@ impl StoreIdAccessor for CreateHook {
.repository() .repository()
.map_dbg_err_str("[GIT CREATE HOOK]: Couldn't fetch Repository") .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't fetch Repository")
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_into_hook_error()
); );
debug!("[GIT CREATE HOOK]: Repository object fetched"); debug!("[GIT CREATE HOOK]: Repository object fetched");
let index = try!(repo.index().map_err_into(GHEK::RepositoryIndexFetchingError)); let mut index = try!(
repo
.index()
.map_err_into(GHEK::RepositoryIndexFetchingError)
.map_into_hook_error()
);
let file_status = try!( let file_status = try!(
repo.status_file(&path).map_err_into(GHEK::RepositoryFileStatusError) repo
.status_file(&path)
.map_err_into(GHEK::RepositoryFileStatusError)
.map_into_hook_error()
); );
let cb = &mut |path: &Path, _matched_spec: &[u8]| -> i32 { let cb = &mut |path: &Path, _matched_spec: &[u8]| -> i32 {
@ -140,9 +151,13 @@ impl StoreIdAccessor for CreateHook {
try!( try!(
index.add_all(&[path], ADD_DEFAULT, Some(cb as &mut IndexMatchedPath)) index.add_all(&[path], ADD_DEFAULT, Some(cb as &mut IndexMatchedPath))
.map_err_into(GHEK::RepositoryPathAddingError) .map_err_into(GHEK::RepositoryPathAddingError)
.map_into_hook_error()
); );
index.write().map_err_into(GHEK::RepositoryIndexWritingError).map_err(|e| e.into()) index
.write()
.map_err_into(GHEK::RepositoryIndexWritingError)
.map_into_hook_error()
} }
} }