matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Refactor to use Result::map_dbg_err_str()

Browse source
This commit is contained in:
Matthias Beyer 2016-07-29 16:53:05 +02:00
parent 3ea3e03cab
commit 3a6f469b7d
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -16,6 +16,7 @@ use libimagstore::hook::accessor::{HookDataAccessor, HookDataAccessorProvider};
use libimagstore::hook::accessor::StoreIdAccessor; use libimagstore::hook::accessor::StoreIdAccessor;
use libimagerror::trace::trace_error; use libimagerror::trace::trace_error;
use libimagerror::into::IntoError; use libimagerror::into::IntoError;
use libimagutil::debug_result::*;
use vcs::git::result::Result; use vcs::git::result::Result;
use vcs::git::error::MapErrInto; use vcs::git::error::MapErrInto;
@ -93,20 +94,20 @@ impl StoreIdAccessor for CreateHook {
self.runtime self.runtime
.config_value_or_err() .config_value_or_err()
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't get Value object from config"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't get Value object from config")
.and_then(|cfg| { .and_then(|cfg| {
debug!("[GIT CREATE HOOK]: Getting repository"); debug!("[GIT CREATE HOOK]: Getting repository");
self.runtime self.runtime
.repository() .repository()
.map(|r| (r, cfg)) .map(|r| (r, cfg))
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't fetch Repository"); e }) .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_err(|e| e.into())
}) })
.and_then(|(repo, cfg)| { .and_then(|(repo, cfg)| {
repo.signature() repo.signature()
.map(|s| (repo, cfg, s)) .map(|s| (repo, cfg, s))
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't fetch Signature"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't fetch Signature")
.map_err_into(GHEK::RepositorySignatureFetchingError) .map_err_into(GHEK::RepositorySignatureFetchingError)
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_err(|e| e.into())
@ -114,7 +115,7 @@ impl StoreIdAccessor for CreateHook {
.and_then(|(repo, cfg, sig)| { .and_then(|(repo, cfg, sig)| {
repo.index() repo.index()
.map(|idx| (repo, cfg, sig, idx)) .map(|idx| (repo, cfg, sig, idx))
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't fetch Index"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't fetch Index")
.map_err_into(GHEK::RepositoryIndexFetchingError) .map_err_into(GHEK::RepositoryIndexFetchingError)
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_err(|e| e.into())
@ -125,13 +126,13 @@ impl StoreIdAccessor for CreateHook {
.and_then(|id| idx.add_path(&id).map_err_into(GHEK::RepositoryPathAddingError)) .and_then(|id| idx.add_path(&id).map_err_into(GHEK::RepositoryPathAddingError))
.map(|_| (repo, cfg, sig, idx)) .map(|_| (repo, cfg, sig, idx))
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't add Path: {:?}", e); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't add Path: {:?}")
.map_err(|e| e.into()) .map_err(|e| e.into())
}) })
.and_then(|(repo, cfg, sig, mut idx)| { .and_then(|(repo, cfg, sig, mut idx)| {
idx.write_tree() idx.write_tree()
.map(|oid| (repo, cfg, sig, idx, oid)) .map(|oid| (repo, cfg, sig, idx, oid))
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't write Tree"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't write Tree")
.map_err_into(GHEK::RepositoryTreeWritingError) .map_err_into(GHEK::RepositoryTreeWritingError)
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_err(|e| e.into())
@ -139,7 +140,7 @@ impl StoreIdAccessor for CreateHook {
.and_then(|(repo, cfg, sig, idx, oid)| { .and_then(|(repo, cfg, sig, idx, oid)| {
repo.find_tree(oid) repo.find_tree(oid)
.map(|tree| (repo, cfg, sig, idx, oid, tree)) .map(|tree| (repo, cfg, sig, idx, oid, tree))
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't find Tree"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't find Tree")
.map_err_into(GHEK::RepositoryTreeFindingError) .map_err_into(GHEK::RepositoryTreeFindingError)
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_err(|e| e.into())
@ -148,14 +149,14 @@ impl StoreIdAccessor for CreateHook {
let cmtmsg = commit_message(cfg, StoreAction::Create); let cmtmsg = commit_message(cfg, StoreAction::Create);
repo.find_commit(oid) repo.find_commit(oid)
.map(|cmt| (repo, sig, tree, cmt, cmtmsg)) .map(|cmt| (repo, sig, tree, cmt, cmtmsg))
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't find Commit"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't find Commit")
.map_err_into(GHEK::RepositoryCommitFindingError) .map_err_into(GHEK::RepositoryCommitFindingError)
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_err(|e| e.into())
}) })
.and_then(|(repo, sig, tree, cmt, commitmsg)| { .and_then(|(repo, sig, tree, cmt, commitmsg)| {
repo.commit(Some("HEAD"), &sig, &sig, &commitmsg[..], &tree, &[&cmt]) repo.commit(Some("HEAD"), &sig, &sig, &commitmsg[..], &tree, &[&cmt])
.map_err(|e| { debug!("[GIT CREATE HOOK]: Couldn't create Commit"); e }) .map_dbg_err_str("[GIT CREATE HOOK]: Couldn't create Commit")
.map_err_into(GHEK::RepositoryCommittingError) .map_err_into(GHEK::RepositoryCommittingError)
.map_err_into(GHEK::RepositoryError) .map_err_into(GHEK::RepositoryError)
.map_err(|e| e.into()) .map_err(|e| e.into())