Commit graph

3040 commits

Author SHA1 Message Date
352bccde51 Respecify view-in-editor argument
As we use the `--editor` flag in the Runtime, we should not override it
here.

By passing `--editor foo` one can override the editor application-wide,
the argument is now `--in-editor` therefor.
2016-09-21 17:20:39 +02:00
2b2116fb95 View in stdout if not specified otherwise 2016-09-21 17:20:39 +02:00
8e331f1f08 Move viewer implementation for imag-diary to libimagdiary 2016-09-21 16:58:21 +02:00
f98afd4b01 Move dependencies 2016-09-21 16:58:21 +02:00
90bb61674f Merge pull request #758 from matthiasbeyer/libimagstorestdhook/git-fix-empty-commits
libimagstorestdhook/git: fix empty commits
2016-09-20 17:10:21 +02:00
5085d75208 Return if the file is not new and not modified 2016-09-20 15:19:35 +02:00
9dc4054a92 Add debug output on file status 2016-09-20 15:19:35 +02:00
5a6d8adc55 Merge pull request #757 from matthiasbeyer/libimagstorestdhook/git-revert-no-commit-on-clean-wd
libimagstorestdhook/git revert no commit on clean wd
2016-09-20 12:23:56 +02:00
896f5e2bc4 Merge pull request #756 from matthiasbeyer/libimagstorestdhook/git-hook-disable
Libimagstorestdhook/git hook disable
2016-09-20 12:07:43 +02:00
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
050aec2aa1 Merge pull request #734 from matthiasbeyer/test-via-makefile
Execute tests via Makefile
2016-09-20 10:20:59 +02:00
52bb74da15 util: get_bool_cfg(): Output with warn!() instead of debug!() 2016-09-20 09:35:03 +02:00
b4fb226bb7 util: get_bool_cfg(): more debug output 2016-09-20 09:35:03 +02:00
da8736d003 UpdateHook: return Ok(()) if disabled 2016-09-20 09:35:03 +02:00
fbd195db25 DeleteHook: return Ok(()) if disabled 2016-09-20 09:35:03 +02:00
d115e4ca8e Add config helper to check whether hook is enabled or not 2016-09-20 09:35:02 +02:00
ece7fe061c Add settings for enable/disable hook 2016-09-20 09:35:02 +02:00
ba1df8bb48 Remove unused config sections 2016-09-20 09:08:59 +02:00
e1177717ee Merge pull request #486 from matthiasbeyer/libimagstorestdhook/git
libimagstorestdhook/git
2016-09-20 09:04:36 +02:00
e24619a08f Minify travis script by using Makefile 2016-09-19 22:13:23 +02:00
fb2300a799 Add Makefile for testing imag-store 2016-09-19 22:12:14 +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
b25aa29fee Fix make call in travis config 2016-09-19 10:08:13 +02:00
Julian Ganz
d041d62d09 Replace invocation of "find" with test for a Makefile 2016-09-19 10:07:18 +02:00
Julian Ganz
c5d660d3f7 Make "test" a postfix to library targets rather than a prefix 2016-09-19 10:07:18 +02:00
Julian Ganz
f6dc039554 Make the binary tests depend on the binaries 2016-09-19 10:07:18 +02:00
Julian Ganz
0ff53a6925 Add general testing target 2016-09-19 10:07:18 +02:00
Julian Ganz
f9b4818607 Add a convenience target for binary tests 2016-09-19 10:07:18 +02:00
57114e159f Execute tests by calling another Makefile 2016-09-19 10:07:18 +02:00
12b6da5c90 Add first idea how to exec all the tests in the Makefile 2016-09-19 10:07:18 +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