Commit graph

3000 commits

Author SHA1 Message Date
931845105b runtime: Remove unused import Signature 2016-09-10 17:08:56 +02:00
cb41c0c416 Merge pull request #728 from matthiasbeyer/libimagstorestdhook/git-custom-commit-msg
Libimagstorestdhook/git custom commit msg
2016-09-10 14:07:03 +02:00
797ea9e852 travis: Use makefile for building things 2016-09-09 20:15:17 +02:00
a00cbb9e43 Merge pull request #727 from matthiasbeyer/libimagentryedit/util-to-libimagutil
libimagentryedit/util to libimagutil
2016-09-09 18:57:54 +02:00
41c7cd2363 [CHERRY-PICK] Add newline before header
The lastest release of the `toml-rs` crate (2.1) removes leading spaces
before arrays and tables, causing our tests to fail.

This fixes it.
2016-09-09 17:22:20 +02:00
4b281dddc9 Implement editor calling 2016-09-09 16:34:19 +02:00
cc035525ec Add error kinds for editor calling 2016-09-09 16:34:19 +02:00
995593a3b7 Add string input 2016-09-09 16:34:19 +02:00
66d8b71bdf Add dep: libimaginteraction 2016-09-09 16:34:19 +02:00
47c3d0e483 Implement commit_message() 2016-09-09 16:34:19 +02:00
17805a0f1e Add default settings for committing in the update hook 2016-09-09 16:34:19 +02:00
05d38bdf49 [CHERRY-PICK] Move edit_entry_with_cmd() to libimagutil 2016-09-09 16:34:19 +02:00
027fffb5b5 Move edit_entry_with_cmd() to libimagutil 2016-09-09 16:33:14 +02:00
501d1f38a2 Refactor edit_in_tmpfile()
To offer variant where we can pass the editor as command.
2016-09-09 14:57:51 +02:00
9f1faf764f Merge pull request #726 from matthiasbeyer/libimagstore/storeid-remove-is-file
Remove StoreId::is_file()
2016-09-09 14:39:29 +02:00
636674b059 All StoreIds point to files, so this check does not make sense here 2016-09-09 12:56:29 +02:00
ff5a4b46c7 Remove StoreId::is_file() 2016-09-09 12:56:29 +02:00
21714660df Merge pull request #729 from matthiasbeyer/fix-header-missing-newline
Add newline before header
2016-09-09 12:54:28 +02:00
7b827ff149 Add newline before header
The lastest release of the `toml-rs` crate (2.1) removes leading spaces
before arrays and tables, causing our tests to fail.

This fixes it.
2016-09-09 11:52:12 +02:00
8f26b20830 [CHERRY-PICK] Refactor edit_in_tmpfile()
To offer variant where we can pass the editor as command.
2016-09-08 18:03:26 +02:00
e730699541 Merge pull request #725 from matthiasbeyer/libimagstore/storeid-remove-is-dir
Remove StoreId::is_dir()
2016-09-08 17:20:39 +02:00
e49050932a Fix missing parentheses in impl Debug for UpdateHook 2016-09-08 16:53:12 +02:00
a24335c9a3 Merge pull request #723 from matthiasbeyer/libimagstorestdhook/git-ci-fixes
libimagstorestdhook: git ci fixes
2016-09-08 16:50:43 +02:00
00acf9bb85 Merge pull request #717 from matthiasbeyer/use-result-trace-helper
Use result trace helper
2016-09-08 16:50:08 +02:00
88ff94fb6d Remove StoreId::is_dir() 2016-09-08 15:05:25 +02:00
0dc2baaee2 Write index after committing 2016-09-08 14:23:10 +02:00
bee4c2002d Write the tree before finding the parent commits 2016-09-08 14:23:10 +02:00
0366d0f8cb Add some debug output if commit worked 2016-09-08 14:23:10 +02:00
0cfeda8652 We only need to pass the local part to git2 here 2016-09-08 14:23:10 +02:00
a4231ac5d8 Add debug output in UpdateHook::access() 2016-09-08 14:23:10 +02:00
3252f9b751 Move Update-Hook execution into Store._update() 2016-09-08 14:23:10 +02:00
8f01cf15e4 Move hook impl to update hook as Store::create() is lazy
As Store::create() is lazy and does not write to disk, we do not have a
file on disk when the post-create-hook runs.

Therefor, the implementation of the git logic has to be in the update
hook.
2016-09-08 14:23:10 +02:00
157f4e79aa test setup: Prepare store directory before starting tests 2016-09-08 14:23:10 +02:00
daca530dd5 imag-store: Use Err/Ok Result map utils to refactor code 2016-09-08 14:05:13 +02:00
a39f07f9a5 imag-diary: Use Err/Ok Result map utils to refactor code 2016-09-08 14:04:41 +02:00
473e6d5b6a imag-notes: Use Err/Ok utils to map over results and refactor code 2016-09-08 13:57:09 +02:00
b9a9fd52c4 imag-todo: Use Err/Ok utils to map 2016-09-08 13:57:09 +02:00
23a42dcb0d imag-link: Use Err/Ok map utility functions to refactor code 2016-09-08 13:57:09 +02:00
d5d83400fa imag-counter: Use utils to map over Err/Ok 2016-09-08 13:56:51 +02:00
198170cf57 Merge pull request #635 from matthiasbeyer/bin/clap
Use clap in bin/imag binary.
2016-09-08 13:23:42 +02:00
712d666ce6 Merge pull request #713 from matthiasbeyer/use-warn-exit-helper
Use warn exit helper
2016-09-08 10:56:13 +02:00
539024781e Merge pull request #720 from mario-kr/fix_bin-target
Fix imag-bin-install target
2016-09-08 09:11:42 +02:00
0635bffd78 imag-store: Use util fn warn_exit() 2016-09-08 08:48:58 +02:00
c91de877d0 imag-tag: Use util fn warn_exit() 2016-09-08 08:48:58 +02:00
19711219e7 imag-diary: Use util fn warn_exit() 2016-09-08 08:48:58 +02:00
ac5ee9fb51 imag-link: Use util function warn_exit() 2016-09-08 08:48:58 +02:00
a200031eb1 imag-counter: use util function warn_exit() 2016-09-08 08:48:58 +02:00
566c463383 Merge branch 'libimagstorestdhook/git-update' into libimagstorestdhook/git 2016-09-07 22:09:31 +02:00
8d2c94b0b8 Merge branch 'libimagstorestdhook/git-refactor' into libimagstorestdhook/git-update 2016-09-07 22:09:19 +02:00
c19f269f59 Adapt ensure_cfg_branch_is_checked_out() for new Runtime::repository() interface 2016-09-07 22:06:07 +02:00