diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2016-09-18 18:55:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-18 18:55:19 +0200 |
commit | 8558e6b2414582c37ba7df3fbb7d13512a066e02 (patch) | |
tree | ec4cd1f5408bd62c37d65a8bea297fdc22790b74 /libimagstorestdhook/src | |
parent | 5384be1d99c0cd873b711e501e8b959e4dfb8f62 (diff) | |
parent | bdbf136fef36622a52ae2796c2a63611b9c8c9fb (diff) |
Merge pull request #748 from matthiasbeyer/libimagstorestdhook/git-debug-output
libimagstorestdhook/git: More debug output
Diffstat (limited to 'libimagstorestdhook/src')
-rw-r--r-- | libimagstorestdhook/src/vcs/git/delete.rs | 12 | ||||
-rw-r--r-- | libimagstorestdhook/src/vcs/git/update.rs | 10 |
2 files changed, 20 insertions, 2 deletions
diff --git a/libimagstorestdhook/src/vcs/git/delete.rs b/libimagstorestdhook/src/vcs/git/delete.rs index 63e9f65c..8b1c791b 100644 --- a/libimagstorestdhook/src/vcs/git/delete.rs +++ b/libimagstorestdhook/src/vcs/git/delete.rs @@ -96,6 +96,7 @@ impl StoreIdAccessor for DeleteHook { repo.signature() .map_err_into(GHEK::MkSignature) .map_dbg_err_str("Failed to fetch signature") + .map_dbg_str("[GIT DELETE HOOK]: Fetched signature object") .map_into_hook_error() ); @@ -103,6 +104,7 @@ impl StoreIdAccessor for DeleteHook { repo.head() .map_err_into(GHEK::HeadFetchError) .map_dbg_err_str("Failed to fetch HEAD") + .map_dbg_str("[GIT DELETE HOOK]: Fetched HEAD") .map_into_hook_error() ); @@ -111,6 +113,7 @@ impl StoreIdAccessor for DeleteHook { .status_file(id.local()) .map_dbg_err_str("Failed to fetch file status") .map_dbg_err(|e| format!("\t-> {:?}", e)) + .map_dbg_str("[GIT DELETE HOOK]: Fetched file status") .map_err_into(GHEK::RepositoryFileStatusError) .map_into_hook_error() ); @@ -130,6 +133,7 @@ impl StoreIdAccessor for DeleteHook { index.add_all(&[id.local()], ADD_DEFAULT, Some(cb as &mut IndexMatchedPath)) .map_err_into(GHEK::RepositoryPathAddingError) .map_dbg_err_str("Failed to add to index") + .map_dbg_str("[GIT DELETE HOOK]: Fetched index") .map_into_hook_error() ); @@ -137,6 +141,7 @@ impl StoreIdAccessor for DeleteHook { index.write_tree() .map_err_into(GHEK::RepositoryIndexWritingError) .map_dbg_err_str("Failed to write tree") + .map_dbg_str("[GIT DELETE HOOK]: Wrote index tree") .map_into_hook_error() ); @@ -146,6 +151,7 @@ impl StoreIdAccessor for DeleteHook { repo.find_commit(head.target().unwrap()) .map_err_into(GHEK::RepositoryParentFetchingError) .map_dbg_err_str("Failed to find commit HEAD") + .map_dbg_str("[GIT DELETE HOOK]: Found commit HEAD") .map_into_hook_error() ); parents.push(commit); @@ -158,15 +164,18 @@ impl StoreIdAccessor for DeleteHook { repo.find_tree(tree_id) .map_err_into(GHEK::RepositoryParentFetchingError) .map_dbg_err_str("Failed to find tree") + .map_dbg_str("[GIT DELETE HOOK]: Found tree for index") .map_into_hook_error() ); let message = try!(commit_message(&repo, cfg, action) - .map_dbg_err_str("Failed to get commit message")); + .map_dbg_err_str("Failed to get commit message") + .map_dbg_str("[GIT DELETE HOOK]: Got commit message")); try!(repo.commit(Some("HEAD"), &signature, &signature, &message, &tree, &parents) .map_dbg_str("Committed") .map_dbg_err_str("Failed to commit") + .map_dbg_str("[GIT DELETE HOOK]: Committed") .map_err_into(GHEK::RepositoryCommittingError) .map_into_hook_error() ); @@ -174,6 +183,7 @@ impl StoreIdAccessor for DeleteHook { index.write() .map_err_into(GHEK::RepositoryIndexWritingError) .map_dbg_err_str("Failed to write tree") + .map_dbg_str("[GIT DELETE HOOK]: Wrote index") .map_into_hook_error() .map(|_| ()) } diff --git a/libimagstorestdhook/src/vcs/git/update.rs b/libimagstorestdhook/src/vcs/git/update.rs index d13dd987..a85a61a1 100644 --- a/libimagstorestdhook/src/vcs/git/update.rs +++ b/libimagstorestdhook/src/vcs/git/update.rs @@ -117,6 +117,7 @@ impl StoreIdAccessor for UpdateHook { repo.signature() .map_err_into(GHEK::MkSignature) .map_dbg_err_str("Failed to fetch signature") + .map_dbg_str("[GIT UPDATE HOOK]: Fetched signature object") .map_into_hook_error() ); @@ -124,6 +125,7 @@ impl StoreIdAccessor for UpdateHook { repo.head() .map_err_into(GHEK::HeadFetchError) .map_dbg_err_str("Failed to fetch HEAD") + .map_dbg_str("[GIT UPDATE HOOK]: Fetched HEAD") .map_into_hook_error() ); @@ -132,6 +134,7 @@ impl StoreIdAccessor for UpdateHook { .status_file(id.local()) .map_dbg_err_str("Failed to fetch file status") .map_dbg_err(|e| format!("\t-> {:?}", e)) + .map_dbg_str("[GIT UPDATE HOOK]: Fetched file status") .map_err_into(GHEK::RepositoryFileStatusError) .map_into_hook_error() ); @@ -150,6 +153,7 @@ impl StoreIdAccessor for UpdateHook { index.add_all(&[id.local()], ADD_DEFAULT, Some(cb as &mut IndexMatchedPath)) .map_err_into(GHEK::RepositoryPathAddingError) .map_dbg_err_str("Failed to add to index") + .map_dbg(|_| format!("[GIT UPDATE HOOK]: Added id ({:?}) to index", id)) .map_into_hook_error() ); @@ -157,6 +161,7 @@ impl StoreIdAccessor for UpdateHook { index.write_tree() .map_err_into(GHEK::RepositoryIndexWritingError) .map_dbg_err_str("Failed to write tree") + .map_dbg_str("[GIT UPDATE HOOK]: Wrote tree") .map_into_hook_error() ); @@ -166,6 +171,7 @@ impl StoreIdAccessor for UpdateHook { repo.find_commit(head.target().unwrap()) .map_err_into(GHEK::RepositoryParentFetchingError) .map_dbg_err_str("Failed to find commit HEAD") + .map_dbg_str("[GIT UPDATE HOOK]: Fetched commit parents of HEAD") .map_into_hook_error() ); parents.push(commit); @@ -178,11 +184,13 @@ impl StoreIdAccessor for UpdateHook { repo.find_tree(tree_id) .map_err_into(GHEK::RepositoryParentFetchingError) .map_dbg_err_str("Failed to find tree") + .map_dbg_str("[GIT UPDATE HOOK]: Found Tree for parents") .map_into_hook_error() ); let message = try!(commit_message(&repo, cfg, StoreAction::Update) - .map_dbg_err_str("Failed to get commit message")); + .map_dbg_err_str("Failed to get commit message") + .map_dbg_str("[GIT UPDATE HOOK]: Fetched commit message")); try!(repo.commit(Some("HEAD"), &signature, &signature, &message, &tree, &parents) .map_dbg_str("Committed") |