Commit graph

2963 commits

Author SHA1 Message Date
06c814d6e9 Revert "Add helper fn to check whether the repository WD is dirty"
This reverts commit eb378d47c2.
2016-09-20 10:27:48 +02:00
128ed27bb8 Revert "Abort the execution of the UpdateHook if repo isnt dirty"
This reverts commit b2a0758b1a.
2016-09-20 10:27:39 +02:00
e1177717ee Merge pull request #486 from matthiasbeyer/libimagstorestdhook/git
libimagstorestdhook/git
2016-09-20 09:04:36 +02:00
1ac54ad29a Merge pull request #752 from matthiasbeyer/libimagstorestdhook/git-integration
libimagstorestdhook/git: integration
2016-09-19 14:39:15 +02:00
321b0493fb Merge pull request #749 from matthiasbeyer/libimagstorestdhook/git-reenable-warning-deny
libimagstorestdhook/git: reenable warning deny
2016-09-19 14:39:00 +02:00
de6b641201 Merge branch 'master' into libimagstorestdhook/git-integration
This is a integration-merge, because the libimagstorestdhook/git branch
got really long and rebasing is not an option, as it would mainly
destroy history.

Using an integration branch is less hassle, really.
2016-09-19 10:44:57 +02:00
f5d73ace0e Fix debug output, use action to generate msg 2016-09-19 10:02:40 +02:00
43bdedea8e Fix check whether we should checkout the ensure_branch
We should test this not at the top of the function, as if we do not have
to check out the ensure_branch, we still have to verify that there
actually is a branch checked out we have to ensure.

What I'm saying is: We might have to be on "master", but we might not
have to check it out if we aren't.

Therefor, this commit moves the location where we check whether we
should checkout the branch.
2016-09-19 10:02:40 +02:00
a74b46deed Add error kind for wrong branch checked out 2016-09-19 09:52:21 +02:00
352f468a27 Fix: We have to specify the full ref name in the cfg 2016-09-19 09:47:37 +02:00
76f92da898 Remove unused import 2016-09-19 09:28:22 +02:00
cf77c51afb Variable hasnt to be mutable 2016-09-19 09:28:22 +02:00
cae605d21b Runtime::ensure_cfg_branch_is_checked_out() should check whether config enforces this 2016-09-19 09:28:22 +02:00
73c0f080ac Change abort_on_repo_init_err() to take Value instead of Option<Value> 2016-09-19 09:28:22 +02:00
4a0def0ede Fix debug messages in Runtime::ensure_cfg_branch_is_checked_out() 2016-09-19 09:28:22 +02:00
a4cdb2b873 UpdateHook: Ensure the right branch is checked out 2016-09-19 09:28:22 +02:00
0f1c360981 DeleteHook: Ensure the right branch is checked out 2016-09-19 09:28:22 +02:00
81cc6c822b UpdateHook: Add config-based abort if repo init failed 2016-09-19 09:28:22 +02:00
a321ad941c DeleteHook: Add config-based abort if repo init failed 2016-09-19 09:28:22 +02:00
573745b9f3 Add error kind for repo initialization errors 2016-09-19 09:28:22 +02:00
27eaf4cf6e Revert "Disable lints"
This reverts commit 010109a3c3.
2016-09-19 09:28:22 +02:00
172614004a Merge pull request #745 from matthiasbeyer/libimagstorestdhook/git-commit-template
libimagstorestdhook/git: Provide better commit template message, including action and store id
2016-09-19 09:27:06 +02:00
68e1f4f61c Provide better commit template message, including action and store id 2016-09-18 19:23:09 +02:00
8558e6b241 Merge pull request #748 from matthiasbeyer/libimagstorestdhook/git-debug-output
libimagstorestdhook/git: More debug output
2016-09-18 18:55:19 +02:00
5384be1d99 Merge pull request #747 from matthiasbeyer/libimagstorestdhook/git-fix-warn-messages
libimagstorestdhook/git: fix warn messages
2016-09-18 18:08:58 +02:00
614b90e643 Merge pull request #746 from matthiasbeyer/libimagstorestdhook/git-refactor-error-mapping
libimagstorestdhook/git: refactor error mapping
2016-09-18 18:08:52 +02:00
df95338165 Merge pull request #744 from matthiasbeyer/libimagstorestdhook/git-remove-unused-error-kinds
libimagstorestdhook/git: Remove unused error kinds
2016-09-18 17:19:45 +02:00
556c464bbf Remove unused error kinds 2016-09-18 15:08:19 +02:00
bdbf136fef Add debug output for DeleteHook 2016-09-18 15:03:07 +02:00
c5f95e3538 Add debug output for UpdateHook 2016-09-18 15:00:36 +02:00
15dcb26fd2 Minify Runtime::new() by refactoring error tracing 2016-09-18 14:54:38 +02:00
07ff755ed7 Minify error handling in Store::_update with try!() 2016-09-18 14:52:55 +02:00
b288e938f9 Minify error handling in Store::update() 2016-09-18 14:52:00 +02:00
cb3a536adb Fix warn!() output to be action sensitive 2016-09-18 14:50:55 +02:00
9a4cdad9a1 Add StoreAction::as_commit_message() utility fn 2016-09-18 14:50:41 +02:00
40dbdaa5e1 Fix git hook registration fail warn message. 2016-09-18 14:44:08 +02:00
c35b08b4dc Merge pull request #741 from matthiasbeyer/libimagentryselect-libimaginteraction-merge
Move code from libimagentryselect to libimaginteraction
2016-09-18 14:04:26 +02:00
cb039b0841 Merge pull request #730 from matthiasbeyer/travis-matrix-builds
Travis matrix builds
2016-09-18 09:50:30 +02:00
9b332815b9 Merge pull request #739 from matthiasbeyer/libimagstorestdhook/git-delete-hook
libimagstorestdhook/git delete hook
2016-09-18 09:49:46 +02:00
ee60f6057c Merge pull request #740 from matthiasbeyer/libimagstorestdhook/git-only-commit-if-changed
libimagstorestdhook: git: only commit if changed
2016-09-18 09:49:33 +02:00
23778d407c documentation: Remove dependency on libimagentryselect 2016-09-18 09:48:59 +02:00
12e7544a2a Move code from libimagentryselect to libimaginteraction 2016-09-17 19:26:06 +02:00
b2a0758b1a Abort the execution of the UpdateHook if repo isnt dirty 2016-09-17 19:10:13 +02:00
eb378d47c2 Add helper fn to check whether the repository WD is dirty 2016-09-17 19:10:13 +02:00
c535e221b9 Do two matrix builds: one for binaries, one for libraries 2016-09-17 18:43:46 +02:00
f9ea5c5013 DeleteHook should be executed after the delete action 2016-09-17 18:41:03 +02:00
d90e745185 Add implementation for delete hook 2016-09-17 18:41:03 +02:00
721238ce14 Add configuration for delete hook 2016-09-17 18:41:03 +02:00
47646d608b Impl Debug for DeleteHook 2016-09-17 17:51:08 +02:00
994d88e65d DeleteHook: Use Runtime object internally for storing config 2016-09-17 17:23:23 +02:00