From 62c17ab41152a24430b77044a41dea2a21b2a8cd Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Mon, 14 Jun 2021 10:57:44 -0400
Subject: [PATCH 01/20] Fix arg parsing on Windows

---
 cli/src/lib.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cli/src/lib.rs b/cli/src/lib.rs
index b247bfee6..8b61c12f8 100644
--- a/cli/src/lib.rs
+++ b/cli/src/lib.rs
@@ -31,8 +31,7 @@ For the public TaskChampion Rust API, see the `taskchampion` crate.
 
 */
 
-use std::os::unix::ffi::OsStringExt;
-use std::string::FromUtf8Error;
+use std::ffi::OsString;
 
 // NOTE: it's important that this 'mod' comes first so that the macros can be used in other modules
 mod macros;
@@ -63,8 +62,8 @@ pub fn main() -> Result<(), Error> {
     // parse the command line into a vector of &str, failing if
     // there are invalid utf-8 sequences.
     let argv: Vec<String> = std::env::args_os()
-        .map(|oss| String::from_utf8(oss.into_vec()))
-        .collect::<Result<_, FromUtf8Error>>()
+        .map(|oss| oss.into_string())
+        .collect::<Result<_, OsString>>()
         .map_err(|_| Error::for_arguments("arguments must be valid utf-8"))?;
     let argv: Vec<&str> = argv.iter().map(|s| s.as_ref()).collect();
 

From fbc97c871bee77bb949c92715dc3cb568d9a6925 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Tue, 15 Jun 2021 12:13:15 +1000
Subject: [PATCH 02/20] Test on Windows+macOS

---
 .github/workflows/tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1ea9f23c0..f526447ee 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,8 +16,12 @@ jobs:
         rust:
           - "1.47" # MSRV
           - "stable"
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
 
-    name: "Test - Rust ${{ matrix.rust }}"
+    name: "Test - Rust ${{ matrix.rust }} on ${{ matrix.os }"
 
     steps:
       - uses: actions/checkout@v1

From 41c5cc842d41f893b2324b2c6f6c6e9c0d69bff5 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Tue, 15 Jun 2021 12:16:09 +1000
Subject: [PATCH 03/20] Typo

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index f526447ee..b756ab0eb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
           - macOS-latest
           - windows-latest
 
-    name: "Test - Rust ${{ matrix.rust }} on ${{ matrix.os }"
+    name: "Test - Rust ${{ matrix.rust }} on ${{ matrix.os }}"
 
     steps:
       - uses: actions/checkout@v1

From 5769b2070289cfc86c88f15ce8bfc3321ecd9e2b Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Tue, 15 Jun 2021 12:20:55 +1000
Subject: [PATCH 04/20] Important missing line to make CI actually run on
 matrix.os

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index b756ab0eb..0e4836a2a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -22,6 +22,7 @@ jobs:
           - windows-latest
 
     name: "Test - Rust ${{ matrix.rust }} on ${{ matrix.os }}"
+    runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v1

From 2a2aef2b25c37b48fe5077bed1321ccf7b8e52d9 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Tue, 15 Jun 2021 12:25:04 +1000
Subject: [PATCH 05/20] Maybe this time

---
 .github/workflows/tests.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0e4836a2a..6baef4519 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,8 +9,6 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-
     strategy:
       matrix:
         rust:

From 8e84bf04465eebf5b86e71357d811acafdefd1ce Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Sun, 13 Jun 2021 15:36:18 -0400
Subject: [PATCH 06/20] Create a new doc if necessary in `ta config set`

---
 cli/src/settings/settings.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/cli/src/settings/settings.rs b/cli/src/settings/settings.rs
index 95d0e4d2e..440e6cb4a 100644
--- a/cli/src/settings/settings.rs
+++ b/cli/src/settings/settings.rs
@@ -184,10 +184,16 @@ impl Settings {
                 .ok_or_else(|| anyhow!("Could not determine config file name"))?
         };
 
-        let mut document = fs::read_to_string(filename.clone())
-            .context("Could not read existing configuration file")?
-            .parse::<Document>()
-            .context("Could not parse existing configuration file")?;
+        let exists = filename.exists();
+
+        let mut document = if exists {
+            fs::read_to_string(filename.clone())
+                .context("Could not read existing configuration file")?
+                .parse::<Document>()
+                .context("Could not parse existing configuration file")?
+        } else {
+            Document::new()
+        };
 
         // set the value as the correct type
         match key {

From cc5240eeec3c55a8d65091b73c109e0a794faf32 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Sun, 13 Jun 2021 15:40:57 -0400
Subject: [PATCH 07/20] Create config directory if necessary

---
 cli/src/settings/settings.rs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cli/src/settings/settings.rs b/cli/src/settings/settings.rs
index 440e6cb4a..83f8938ae 100644
--- a/cli/src/settings/settings.rs
+++ b/cli/src/settings/settings.rs
@@ -186,6 +186,14 @@ impl Settings {
 
         let exists = filename.exists();
 
+        // try to create the parent directory if the file does not exist
+        if !exists {
+            if let Some(dir) = filename.parent() {
+                fs::create_dir_all(dir)?;
+            }
+        }
+
+        // start with the existing document, or a blank document
         let mut document = if exists {
             fs::read_to_string(filename.clone())
                 .context("Could not read existing configuration file")?

From cae03c6d7e974a1d711021ec0a5d5213ed765294 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Sun, 20 Jun 2021 22:13:57 +1000
Subject: [PATCH 08/20] Initial changelog

Also simple process/script to manage entries in PR's without merge conflicts:

1. Unreleased entries area stored as text files in ".changelogs/"
2. On release these are concatenated together and put in CHANGELOG.md

Script basically just add line of text to a "YYYY-MM-DD-branch.txt" formatted file
---
 CHANGELOG.md         | 20 ++++++++++++++
 scripts/changelog.py | 64 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)
 create mode 100644 CHANGELOG.md
 create mode 100755 scripts/changelog.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..3f4b0775c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,20 @@
+# Changelog
+
+## [Unreleased]
+
+Note: unreleased change log entries are kept in `.changelogs/` directory in repo root, and can be added with `./script/changelog.py add "Added thing for reason"
+
+## 0.3.0 - 2021-01-11
+- Flexible named reports
+- Updates to the TaskChampion crate API
+- Usability improvements
+
+## 0.2.0 - 2020-11-30
+
+This release is the first "MVP" version of this tool. It can do basic task operations, and supports a synchronization. Major missing features are captured in issues, but briefly:
+
+    better command-line API, similar to TaskWarrior
+    authentication of the replica / server protocol
+    encryption of replica data before transmission to the server
+    lots of task features (tags, annotations, dependencies, ..)
+    lots of CLI features (filtering, modifying, ..)
diff --git a/scripts/changelog.py b/scripts/changelog.py
new file mode 100755
index 000000000..5775d99c0
--- /dev/null
+++ b/scripts/changelog.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+import os
+import argparse
+import datetime
+import subprocess
+from typing import List
+
+def ymd():
+    return datetime.datetime.now().strftime("%Y-%m-%d")
+
+def git_current_branch() -> str :
+    out = subprocess.check_output(["git", "branch", "--show-current"])
+    return out.strip().decode("utf-8")
+
+def get_dir() -> str:
+    here = os.path.dirname(os.path.abspath(__file__))
+    return os.path.join(
+        here,
+        "../.changelogs")
+
+def get_changefiles() -> List[str]:
+    changedir = get_dir()
+    changefiles = []
+    for f in os.listdir(changedir):
+        if f.endswith(".txt") and not f.startswith("."):
+            changefiles.append(os.path.join(changedir, f))
+
+    return changefiles
+
+def cmd_add(args):
+    text = args.text.strip()
+    if not text.startswith("- "):
+        text = "- %s" % text
+
+    timestamp = ymd()
+    branchname = git_current_branch()
+    fname = os.path.join(get_dir(), "%s-%s.txt" % (timestamp, branchname))
+    with open(fname, "a") as f:
+        f.write(text)
+        f.write("\n")
+
+def cmd_build(args):
+    print("## x.y.z - %s" % (ymd()))
+    for e in get_changefiles():
+        print(open(e).read().strip())
+
+def main() -> None:
+    parser = argparse.ArgumentParser()
+    subparsers = parser.add_subparsers(title='Sub commands', dest='command')
+    subparsers.required = True
+
+    parser_add = subparsers.add_parser('add')
+    parser_add.add_argument("text")
+    parser_add.set_defaults(func=cmd_add)
+
+    parser_build = subparsers.add_parser('build')
+    parser_build.set_defaults(func=cmd_build)
+
+    args = parser.parse_args()
+    args.func(args)
+
+
+if __name__ == "__main__":
+    main()

From 4a3b19bba608c521cc37ccb91dd7ee5520e70e2d Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Tue, 24 Aug 2021 22:26:30 +0530
Subject: [PATCH 09/20] added common business date acronyms

---
 cli/src/argparse/args/time.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cli/src/argparse/args/time.rs b/cli/src/argparse/args/time.rs
index 4581d0a41..029cfa8e1 100644
--- a/cli/src/argparse/args/time.rs
+++ b/cli/src/argparse/args/time.rs
@@ -154,11 +154,18 @@ fn named_date<Tz: TimeZone>(
     move |input: &str| {
         let local_today = now.with_timezone(&local).date();
         let remaining = &input[input.len()..];
+        let day_index = local_today.weekday().num_days_from_monday();
         match input {
             "yesterday" => Ok((remaining, local_today - Duration::days(1))),
             "today" => Ok((remaining, local_today)),
             "tomorrow" => Ok((remaining, local_today + Duration::days(1))),
             // TODO: lots more!
+            "eod"=>Ok((remaining,local_today+Duration::days(1))),
+            "sod"=>Ok((remaining,local_today)),
+            "eow"=> Ok((remaining,local_today+Duration::days((6-day_index).into()))),
+            "eoww"=>Ok((remaining,local_today+Duration::days((5-day_index).into()))),
+            "sow"=>Ok((remaining,local_today+Duration::days((6-day_index).into()))),
+            "soww"=>Ok((remaining,local_today+Duration::days((7-day_index).into()))),
             _ => Err(Err::Error(Error::new(input, ErrorKind::Tag))),
         }
         .map(|(rem, dt)| (rem, dt.and_hms(0, 0, 0).with_timezone(&Utc)))

From 90b06df30f31b5c08b7b8a1ecd69bc80da3319f1 Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Tue, 24 Aug 2021 22:38:27 +0530
Subject: [PATCH 10/20] refactor

---
 cli/src/argparse/args/time.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cli/src/argparse/args/time.rs b/cli/src/argparse/args/time.rs
index 029cfa8e1..dab4f0372 100644
--- a/cli/src/argparse/args/time.rs
+++ b/cli/src/argparse/args/time.rs
@@ -160,12 +160,12 @@ fn named_date<Tz: TimeZone>(
             "today" => Ok((remaining, local_today)),
             "tomorrow" => Ok((remaining, local_today + Duration::days(1))),
             // TODO: lots more!
-            "eod"=>Ok((remaining,local_today+Duration::days(1))),
-            "sod"=>Ok((remaining,local_today)),
-            "eow"=> Ok((remaining,local_today+Duration::days((6-day_index).into()))),
-            "eoww"=>Ok((remaining,local_today+Duration::days((5-day_index).into()))),
-            "sow"=>Ok((remaining,local_today+Duration::days((6-day_index).into()))),
-            "soww"=>Ok((remaining,local_today+Duration::days((7-day_index).into()))),
+            "eod" => Ok((remaining,local_today+Duration::days(1))),
+            "sod" => Ok((remaining,local_today)),
+            "eow" => Ok((remaining,local_today+Duration::days((6-day_index).into()))),
+            "eoww" => Ok((remaining,local_today+Duration::days((5-day_index).into()))),
+            "sow" => Ok((remaining,local_today+Duration::days((6-day_index).into()))),
+            "soww" => Ok((remaining,local_today+Duration::days((7-day_index).into()))),
             _ => Err(Err::Error(Error::new(input, ErrorKind::Tag))),
         }
         .map(|(rem, dt)| (rem, dt.and_hms(0, 0, 0).with_timezone(&Utc)))

From c5e18aec318c1df898cacd89707d463d3994c55a Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Tue, 24 Aug 2021 22:41:45 +0530
Subject: [PATCH 11/20] lint issue

---
 cli/src/argparse/args/time.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cli/src/argparse/args/time.rs b/cli/src/argparse/args/time.rs
index dab4f0372..1fe9565d6 100644
--- a/cli/src/argparse/args/time.rs
+++ b/cli/src/argparse/args/time.rs
@@ -160,12 +160,12 @@ fn named_date<Tz: TimeZone>(
             "today" => Ok((remaining, local_today)),
             "tomorrow" => Ok((remaining, local_today + Duration::days(1))),
             // TODO: lots more!
-            "eod" => Ok((remaining,local_today+Duration::days(1))),
+            "eod" => Ok((remaining,local_today + Duration::days(1))),
             "sod" => Ok((remaining,local_today)),
-            "eow" => Ok((remaining,local_today+Duration::days((6-day_index).into()))),
-            "eoww" => Ok((remaining,local_today+Duration::days((5-day_index).into()))),
-            "sow" => Ok((remaining,local_today+Duration::days((6-day_index).into()))),
-            "soww" => Ok((remaining,local_today+Duration::days((7-day_index).into()))),
+            "eow" => Ok((remaining,local_today + Duration::days((6-day_index).into()))),
+            "eoww" => Ok((remaining,local_today + Duration::days((5-day_index).into()))),
+            "sow" => Ok((remaining,local_today + Duration::days((6-day_index).into()))),
+            "soww" => Ok((remaining,local_today + Duration::days((7-day_index).into()))),
             _ => Err(Err::Error(Error::new(input, ErrorKind::Tag))),
         }
         .map(|(rem, dt)| (rem, dt.and_hms(0, 0, 0).with_timezone(&Utc)))

From f824d6123c6a6a6ebb41a6ecdef89f0089f4dfd5 Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Wed, 25 Aug 2021 12:42:37 +0530
Subject: [PATCH 12/20] added tests

---
 cli/src/argparse/args/time.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cli/src/argparse/args/time.rs b/cli/src/argparse/args/time.rs
index 1fe9565d6..47a82e1fc 100644
--- a/cli/src/argparse/args/time.rs
+++ b/cli/src/argparse/args/time.rs
@@ -308,6 +308,12 @@ mod test {
     #[case::today_from_evening(ldt(2021, 3, 1, 21, 30, 30), "today", ld(2021, 3, 1))]
     #[case::tomorrow(ld(2021, 3, 1), "tomorrow", ld(2021, 3, 2))]
     #[case::tomorow_from_evening(ldt(2021, 3, 1, 21, 30, 30), "tomorrow", ld(2021, 3, 2))]
+    #[case::end_of_week(ld(2021,8,25,), "eow", ld(2021,8,29))]
+    #[case::end_of_work_week(ld(2021,8,25), "eoww", ld(2021,8,28))]
+    #[case::start_of_week(ld(2021,8,25), "sow", ld(2021,8,29))]
+    #[case::start_of_work_week(ld(2021,8,25), "soww", ld(2021,8,30))]
+    #[case::end_of_today(ld(2021,8,25), "eod", ld(2021,8,26))]
+    #[case::start_of_today(ld(2021,8,25), "sod", ld(2021,8,25))]
     fn test_local_timestamp(
         #[case] now: Box<dyn Fn(FixedOffset) -> DateTime<Utc>>,
         #[values(*IST, *UTC_FO, *HST)] tz: FixedOffset,

From e8a4d8029b961daf6a1eefc95e8992fb27eba7c9 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Thu, 26 Aug 2021 19:56:53 +1000
Subject: [PATCH 13/20] Update contribute+release docs regarding changelog

---
 .changelogs/.gitignore |  0
 CONTRIBUTING.md        | 24 +++++++++++++++++++-----
 RELEASING.md           |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 .changelogs/.gitignore

diff --git a/.changelogs/.gitignore b/.changelogs/.gitignore
new file mode 100644
index 000000000..e69de29bb
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 568878926..658c0957f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,6 +7,10 @@ It also means that things are changing quickly, and lots of stuff is planned tha
 If you would like to work on TaskChampion, please contact the developers (via the issue tracker) before spending a lot of time working on a pull request.
 Doing so may save you some wasted time and frustration!
 
+A good starting point might be one of the issues tagged with ["good first issue"][first].
+
+[first]: https://github.com/taskchampion/taskchampion/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
+
 # Other Ways To Help
 
 The best way to help this project to grow is to help spread awareness of it.
@@ -15,7 +19,6 @@ Tell your friends, post to social media, blog about it -- whatever works best!
 Other ideas;
  * Improve the documentation where it's unclear or lacking some information
  * Build and maintain tools that integrate with TaskChampion
- * Devise a nice TaskChampion logo
 
 # Development Guide
 
@@ -44,8 +47,19 @@ You may be able to limit the scope of what you need to understand to just one cr
  
  You can generate the documentation for the `taskchampion` crate with `cargo doc --release --open -p taskchampion`.
  
- ## Making a Pull Request
+## Making a Pull Request
  
- We expect contributors to follow the [GitHub Flow](https://guides.github.com/introduction/flow/).
- Aside from that, we have no particular requirements on pull requests.
- Make your patch, double-check that it's complete (tests? docs? documentation comments?), and make a new pull request.
+We expect contributors to follow the [GitHub Flow](https://guides.github.com/introduction/flow/).
+Aside from that, we have no particular requirements on pull requests.
+Make your patch, double-check that it's complete (tests? docs? documentation comments?), and make a new pull request.
+
+Any non-trivial change (particularly those that change the behaviour of the application, or change the API) should be noted in the projects changelog.
+In order to manage this, changelog entries are stored as text files in the `.changelog/` directory at the repository root.
+
+To add a new changelog entry, you can simply run `python3 ./script/changelog.py add "Fixed thingo to increase zorbloxification [Issue #2](http://example.com)`
+
+This creates a file named `./changelogs/yyyy-mm-dd-branchname.txt` (timestamp, current git branch) which contains a markdown snippet.
+
+If you don't have a Python 3 intepreter installed, you can simply create this file manually. It should contain a list item like `- Fixed thingo [...]`
+
+Periodically (probably just before release), these changelog entries are concatenated combined together and added into the `CHANGELOG.md` file.
diff --git a/RELEASING.md b/RELEASING.md
index e58e51da7..3617abd76 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -1,5 +1,6 @@
 # Release process
 
+1. Ensure the changelog is updated with everything from the `.changelogs` directory. `python3 ./script/changelog.py build` will output a Markdown snippet to include in `CHANGELOG.md` then `rm .changelog/*.txt`
 1. Run `git pull upstream main`
 1. Run `cargo test`
 1. Run `cargo clean && cargo clippy`

From f013233c88c8822b36aa6b48aa665b72faaae31a Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Sat, 28 Aug 2021 00:59:09 +0530
Subject: [PATCH 14/20] document changes

---
 docs/src/time.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/src/time.md b/docs/src/time.md
index b82e1b2e1..7b7380a8f 100644
--- a/docs/src/time.md
+++ b/docs/src/time.md
@@ -28,3 +28,18 @@ Some of the units allow an adjectival form, such as `daily` or `annually`; this
 
 [ISO 8601 standard durations](https://en.wikipedia.org/wiki/ISO_8601#Durations) are also allowed.
 While the standard does not specify the length of "P1Y" or "P1M", Taskchampion treats those as 365 and 30 days, respectively.
+
+
+## Named Timestamps
+
+Some commonly used named timestamps
+
+ * `today` Start of today
+ * `yesterday` Start of yesterday
+ * `tomorrow` Start of tomorrow
+ * `sod` Start of today
+ * `eod` End of today
+ * `sow` Start of the next week
+ * `eow` End of the week
+ * 'eoww End of work week
+ * `soww` Start of the next work week
\ No newline at end of file

From d001b5dbc931860161a8a4f888f9bf2d5859f9df Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Sat, 28 Aug 2021 01:01:02 +0530
Subject: [PATCH 15/20] update doc

---
 docs/src/time.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/time.md b/docs/src/time.md
index 7b7380a8f..28ab9b735 100644
--- a/docs/src/time.md
+++ b/docs/src/time.md
@@ -41,5 +41,5 @@ Some commonly used named timestamps
  * `eod` End of today
  * `sow` Start of the next week
  * `eow` End of the week
- * 'eoww End of work week
+ * `eoww` End of work week
  * `soww` Start of the next work week
\ No newline at end of file

From 3edf45d238ec85c3e81882071e9b603e72391787 Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Sat, 28 Aug 2021 01:47:50 +0530
Subject: [PATCH 16/20] added ref pic

---
 docs/assets/cgi/name_timestamp.png | Bin 0 -> 8194 bytes
 docs/src/time.md                   |   5 ++++-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 docs/assets/cgi/name_timestamp.png

diff --git a/docs/assets/cgi/name_timestamp.png b/docs/assets/cgi/name_timestamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..d829039b72ece8d2cd64cc2b3548ec9376d72ce8
GIT binary patch
literal 8194
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

literal 0
HcmV?d00001

diff --git a/docs/src/time.md b/docs/src/time.md
index 28ab9b735..dc3ba28a4 100644
--- a/docs/src/time.md
+++ b/docs/src/time.md
@@ -42,4 +42,7 @@ Some commonly used named timestamps
  * `sow` Start of the next week
  * `eow` End of the week
  * `eoww` End of work week
- * `soww` Start of the next work week
\ No newline at end of file
+ * `soww` Start of the next work week
+
+
+![named timestamp](/docs/assets/cgi/named_timestamp.jpg)

From 037807e3acc104e17be7be38d2a6590a6af1b098 Mon Sep 17 00:00:00 2001
From: Ravi Sawlani <ravisawlani04@gmail.com>
Date: Sat, 28 Aug 2021 02:06:33 +0530
Subject: [PATCH 17/20] update image ref

---
 docs/{assets/cgi => src/images}/name_timestamp.png | Bin
 docs/src/time.md                                   |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename docs/{assets/cgi => src/images}/name_timestamp.png (100%)

diff --git a/docs/assets/cgi/name_timestamp.png b/docs/src/images/name_timestamp.png
similarity index 100%
rename from docs/assets/cgi/name_timestamp.png
rename to docs/src/images/name_timestamp.png
diff --git a/docs/src/time.md b/docs/src/time.md
index dc3ba28a4..4053aea29 100644
--- a/docs/src/time.md
+++ b/docs/src/time.md
@@ -45,4 +45,4 @@ Some commonly used named timestamps
  * `soww` Start of the next work week
 
 
-![named timestamp](/docs/assets/cgi/named_timestamp.jpg)
+![named timestamp](images/name_timestamp.png)

From 8ca7f70cef5e094c034043abe447d78eaf78d942 Mon Sep 17 00:00:00 2001
From: dbr <dbr.onix@gmail.com>
Date: Sun, 5 Sep 2021 17:02:48 +1000
Subject: [PATCH 18/20] Store changelog snippets as .md

---
 CONTRIBUTING.md      | 2 +-
 scripts/changelog.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 658c0957f..2adfeba3e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,7 +58,7 @@ In order to manage this, changelog entries are stored as text files in the `.cha
 
 To add a new changelog entry, you can simply run `python3 ./script/changelog.py add "Fixed thingo to increase zorbloxification [Issue #2](http://example.com)`
 
-This creates a file named `./changelogs/yyyy-mm-dd-branchname.txt` (timestamp, current git branch) which contains a markdown snippet.
+This creates a file named `./changelogs/yyyy-mm-dd-branchname.md` (timestamp, current git branch) which contains a markdown snippet.
 
 If you don't have a Python 3 intepreter installed, you can simply create this file manually. It should contain a list item like `- Fixed thingo [...]`
 
diff --git a/scripts/changelog.py b/scripts/changelog.py
index 5775d99c0..0eac4fa35 100755
--- a/scripts/changelog.py
+++ b/scripts/changelog.py
@@ -22,7 +22,7 @@ def get_changefiles() -> List[str]:
     changedir = get_dir()
     changefiles = []
     for f in os.listdir(changedir):
-        if f.endswith(".txt") and not f.startswith("."):
+        if f.endswith(".md") and not f.startswith("."):
             changefiles.append(os.path.join(changedir, f))
 
     return changefiles
@@ -34,7 +34,7 @@ def cmd_add(args):
 
     timestamp = ymd()
     branchname = git_current_branch()
-    fname = os.path.join(get_dir(), "%s-%s.txt" % (timestamp, branchname))
+    fname = os.path.join(get_dir(), "%s-%s.md" % (timestamp, branchname))
     with open(fname, "a") as f:
         f.write(text)
         f.write("\n")

From 72b494148515371e917d50231e5a7505160e0141 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Sun, 5 Sep 2021 21:55:09 +0000
Subject: [PATCH 19/20] fix new clippy warnings

---
 cli/src/invocation/mod.rs     | 2 +-
 cli/src/invocation/modify.rs  | 4 ++--
 cli/src/settings/report.rs    | 2 +-
 cli/src/settings/settings.rs  | 2 +-
 sync-server/src/storage/kv.rs | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/src/invocation/mod.rs b/cli/src/invocation/mod.rs
index b2335a345..640925a69 100644
--- a/cli/src/invocation/mod.rs
+++ b/cli/src/invocation/mod.rs
@@ -125,7 +125,7 @@ fn get_server(settings: &Settings) -> anyhow::Result<Box<dyn Server>> {
         settings.server_origin.as_ref(),
         settings.encryption_secret.as_ref(),
     ) {
-        let client_key = Uuid::parse_str(&client_key)?;
+        let client_key = Uuid::parse_str(client_key)?;
 
         log::debug!("Using sync-server with origin {}", origin);
         log::debug!("Sync client ID: {}", client_key);
diff --git a/cli/src/invocation/modify.rs b/cli/src/invocation/modify.rs
index dd943fdd1..2e27fba74 100644
--- a/cli/src/invocation/modify.rs
+++ b/cli/src/invocation/modify.rs
@@ -30,11 +30,11 @@ pub(super) fn apply_modification(
     }
 
     for tag in modification.add_tags.iter() {
-        task.add_tag(&tag)?;
+        task.add_tag(tag)?;
     }
 
     for tag in modification.remove_tags.iter() {
-        task.remove_tag(&tag)?;
+        task.remove_tag(tag)?;
     }
 
     if let Some(wait) = modification.wait {
diff --git a/cli/src/settings/report.rs b/cli/src/settings/report.rs
index 1911bf84e..78650ffe3 100644
--- a/cli/src/settings/report.rs
+++ b/cli/src/settings/report.rs
@@ -130,7 +130,7 @@ impl TryFrom<&toml::Value> for Report {
                 .map(|(i, v)| {
                     v.as_str()
                         .ok_or_else(|| anyhow!(".filter[{}]: not a string", i))
-                        .and_then(|s| Condition::parse_str(&s))
+                        .and_then(|s| Condition::parse_str(s))
                         .map_err(|e| anyhow!(".filter[{}]: {}", i, e))
                 })
                 .collect::<Result<Vec<_>>>()?,
diff --git a/cli/src/settings/settings.rs b/cli/src/settings/settings.rs
index 83f8938ae..e1809091f 100644
--- a/cli/src/settings/settings.rs
+++ b/cli/src/settings/settings.rs
@@ -97,7 +97,7 @@ impl Settings {
             "server_dir",
             "reports",
         ];
-        let table = table_with_keys(&config_toml, &table_keys)?;
+        let table = table_with_keys(config_toml, &table_keys)?;
 
         fn get_str_cfg<F: FnOnce(String)>(
             table: &Table,
diff --git a/sync-server/src/storage/kv.rs b/sync-server/src/storage/kv.rs
index bd5fa3502..19218a235 100644
--- a/sync-server/src/storage/kv.rs
+++ b/sync-server/src/storage/kv.rs
@@ -86,7 +86,7 @@ impl<'t> StorageTxn for Txn<'t> {
         let bucket = self.clients_bucket();
         let kvtxn = self.kvtxn();
 
-        let client = match kvtxn.get(&bucket, key) {
+        let client = match kvtxn.get(bucket, key) {
             Ok(buf) => buf,
             Err(Error::NotFound) => return Ok(None),
             Err(e) => return Err(e.into()),
@@ -101,7 +101,7 @@ impl<'t> StorageTxn for Txn<'t> {
         let bucket = self.clients_bucket();
         let kvtxn = self.kvtxn();
         let client = Client { latest_version_id };
-        kvtxn.set(&bucket, key, Msgpack::to_value_buf(client)?)?;
+        kvtxn.set(bucket, key, Msgpack::to_value_buf(client)?)?;
         Ok(())
     }
 
@@ -122,7 +122,7 @@ impl<'t> StorageTxn for Txn<'t> {
         let key = version_db_key(client_key, parent_version_id);
         let bucket = self.versions_bucket();
         let kvtxn = self.kvtxn();
-        let version = match kvtxn.get(&bucket, key) {
+        let version = match kvtxn.get(bucket, key) {
             Ok(buf) => buf,
             Err(Error::NotFound) => return Ok(None),
             Err(e) => return Err(e.into()),
@@ -147,7 +147,7 @@ impl<'t> StorageTxn for Txn<'t> {
             parent_version_id,
             history_segment,
         };
-        kvtxn.set(&bucket, key, Msgpack::to_value_buf(version)?)?;
+        kvtxn.set(bucket, key, Msgpack::to_value_buf(version)?)?;
         Ok(())
     }
 

From 91b2e1164f59a5cf7ac0240a4e7c266618d69586 Mon Sep 17 00:00:00 2001
From: "Dustin J. Mitchell" <dustin@v.igoro.us>
Date: Sun, 5 Sep 2021 21:57:34 +0000
Subject: [PATCH 20/20] run clippy on the MSRV

---
 .github/workflows/checks.yml | 7 +++++++
 .github/workflows/tests.yml  | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index dc11d46a8..3c96dafb7 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -27,6 +27,13 @@ jobs:
           path: target
           key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
 
+      - uses: actions-rs/toolchain@v1
+        with:
+          # Fixed version for clippy lints.  Bump this as necesary.  It must not
+          # be older than the MSRV in tests.yml.
+          toolchain: "1.54"
+          override: true
+
       - uses: actions-rs/cargo@v1.0.1
         with:
           command: check
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6baef4519..78a0e183e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       matrix:
         rust:
-          - "1.47" # MSRV
+          # MSRV; most not be higher than the clippy rust version in checks.yml
+          - "1.47"
           - "stable"
         os:
           - ubuntu-latest