From b791eea8d7990df97d6cc01458764fa8e8171e45 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 26 Apr 2019 16:06:21 +0200 Subject: [PATCH 1/5] Revert "Add vacation notice" This reverts commit 3f9c98a85149c27f0088c73bad00690efd7f22ac. Signed-off-by: Matthias Beyer # Conflicts: # README.md --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index bf5646e5..cf98f843 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,6 @@ but we do not consider anything stable or usable at this moment. Feel free to play around anyways.** -## Vacation notice - -**Notice:** I, the author of imag, will be on vacation from mid-May 2018 until -early 2019. I hope I can continue develop imag during that time, but I cannot -guarantee that. I hope I can continue development of imag after that and I -certainly plan to do so. - -But from May 2018 until February 2019, expect long response times. - ## Goal / What is imag? From 535595a7c8bc18c80c5c1e8e7f10223a9cf940c5 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 26 Apr 2019 16:07:20 +0200 Subject: [PATCH 2/5] alias: Add note = notes imag-notes should have been imag-note, but re-releasing it just because of this slight inconvenience seems overblown. Signed-off-by: Matthias Beyer --- imagrc.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/imagrc.toml b/imagrc.toml index ccd0f163..d17268e7 100644 --- a/imagrc.toml +++ b/imagrc.toml @@ -70,6 +70,7 @@ progressticker_chars = "|/-\\-/-\\" # [imag.aliases] store = [ "s", "st" ] +notes = [ "note" ] # imag-notes really should be imag-note [imag.logging] level = "debug" From 3d8fef06886500f73d526d3179e4a1f78e0bfe88 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 26 Apr 2019 16:12:23 +0200 Subject: [PATCH 3/5] Add changelog for version 0.9.1 This was cherry-picked from the 0.9.1 release, where I made the mistake to add one commit for all updated stuff, instead of adding the changelog in one commit and all other stuff in other commits. But because we should have that information on master, we cherry-pick the commit 7137a3ce7 partially here. Signed-off-by: Matthias Beyer (cherry picked from commit 7137a3ce7) --- doc/src/09020-changelog.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/src/09020-changelog.md b/doc/src/09020-changelog.md index 77be775c..0d41b5d6 100644 --- a/doc/src/09020-changelog.md +++ b/doc/src/09020-changelog.md @@ -14,6 +14,20 @@ the changelog (though updating of dependencies is). Please note that we do not have a "Breaking changes" section as we are in Version 0.y.z and thus we can break the API like we want and need to. +## 0.9.1 + +Bugfix release for fixing: + +* Fix off by one error in error tracing +* Fix negation error in imag-habit filtering mechanism +* Fix config override mechanism +* "status" subcommand might not be present in imag-habit, but standard command + should work anyways +* We go to the next month, not to the current one (off by one error) +* 'start-time' cannot be None in imag-timetrack, clap ensures that +* Do not use deprecated StoreId::exists() function in libimagentrycategory + + ## 0.9.0 * [f912d3e7f3](https://git.imag-pim.org/imag/commit/?id=f912d3e7f362e524347cd061f316d3569dfb18a0) From 29b04a269a96e22353728f56ba33b3e331bb1f61 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 26 Apr 2019 16:15:34 +0200 Subject: [PATCH 4/5] doc: Rewrite section on error handling in libraries Signed-off-by: Matthias Beyer --- doc/src/03010-conventions.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/doc/src/03010-conventions.md b/doc/src/03010-conventions.md index ccee1323..5e9ffe7e 100644 --- a/doc/src/03010-conventions.md +++ b/doc/src/03010-conventions.md @@ -63,12 +63,8 @@ think hard whether this is really necessary. ### Library error types/kinds -Libraries must use "error-chain" to create error types and kinds. -Most likely, a library needs some kinds for wrapping the errors from underlying -libraries, such as the store itself. +Libraries must use "failure" to create error objects. -A library must _never_ introduce multiple error types, but is free to introduce -as many error kinds as required. ### Libraries with commandline frontends From 9c467d046258fbad94227a1eaa5506c6103b5afc Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 27 Apr 2019 01:33:04 +0200 Subject: [PATCH 5/5] Add debug output Signed-off-by: Matthias Beyer --- bin/domain/imag-contact/src/main.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/domain/imag-contact/src/main.rs b/bin/domain/imag-contact/src/main.rs index bc950fa1..bd071800 100644 --- a/bin/domain/imag-contact/src/main.rs +++ b/bin/domain/imag-contact/src/main.rs @@ -116,6 +116,7 @@ fn main() { fn list(rt: &Runtime) { let scmd = rt.cli().subcommand_matches("list").unwrap(); let list_format = get_contact_print_format("contact.list_format", rt, &scmd); + debug!("List format: {:?}", list_format); let iterator = rt .store() @@ -134,6 +135,7 @@ fn list(rt: &Runtime) { .enumerate(); if scmd.is_present("json") { + debug!("Listing as JSON"); let v : Vec = iterator.map(|tpl| tpl.1).collect(); match ::serde_json::to_string(&v) { @@ -144,6 +146,7 @@ fn list(rt: &Runtime) { } } } else { + debug!("Not listing as JSON"); let output = rt.stdout(); let mut output = output.lock(); iterator