From 40617b094f9c6cc876f82b5439ba5c1f0e3a052f Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sat, 29 Aug 2020 20:16:42 +0200 Subject: [PATCH 001/400] Update project version Signed-off-by: Thomas Lauf --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26380f67..0e767651 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set (HAVE_CMAKE true) project (timew) include (CXXSniffer) -set (PROJECT_VERSION "1.3.0") +set (PROJECT_VERSION "1.4.1") string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) From 8cca35dff25a3de5fb103153c90e67576b3abe77 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sat, 29 Aug 2020 20:17:10 +0200 Subject: [PATCH 002/400] Remove deleted file `COPYING` from `CMakeLists.txt` -Closes #377 Signed-off-by: Thomas Lauf --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e767651..7da21e74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ if (EXISTS ${CMAKE_SOURCE_DIR}/test) add_subdirectory (test EXCLUDE_FROM_ALL) endif (EXISTS ${CMAKE_SOURCE_DIR}/test) -set (doc_FILES ChangeLog README.md INSTALL AUTHORS COPYING LICENSE) +set (doc_FILES ChangeLog README.md INSTALL AUTHORS LICENSE) foreach (doc_FILE ${doc_FILES}) install (FILES ${doc_FILE} DESTINATION ${TIMEW_DOCDIR}) endforeach (doc_FILE) From 04da28faddef3b938e9c0c73f321df3f9241b2d8 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sat, 29 Aug 2020 20:27:29 +0200 Subject: [PATCH 003/400] Enter commit hash for release 1.4.1 Signed-off-by: Thomas Lauf --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 192db610..8f59b246 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ ------ current release --------------------------- -1.4.1 (2020-08-29) - +1.4.1 (2020-08-29) - 6747beb2963475f50d2d58b1da5465247eb9e28e - #378 Summary with `:all` hint is empty for open interval From 4aa8489243adb69958d7717fb2f010c72fd4505a Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sat, 29 Aug 2020 20:30:33 +0200 Subject: [PATCH 004/400] Prepare for release 1.4.2 Signed-off-by: Thomas Lauf --- CMakeLists.txt | 2 +- ChangeLog | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7da21e74..6468f121 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set (HAVE_CMAKE true) project (timew) include (CXXSniffer) -set (PROJECT_VERSION "1.4.1") +set (PROJECT_VERSION "1.4.2") string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) diff --git a/ChangeLog b/ChangeLog index 8f59b246..33ff79a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,16 @@ ------ current release --------------------------- +1.4.2 (2020-08-29) - + +- #377 make install with error due to missing file `COPYING` + (thanks to Dirk Deimeke) + +------ old releases ------------------------------ + 1.4.1 (2020-08-29) - 6747beb2963475f50d2d58b1da5465247eb9e28e - #378 Summary with `:all` hint is empty for open interval ------- old releases ------------------------------ - 1.4.0 (2020-08-29) - 2447c3817212d0fd987a8fe749d181ba7073a978 - #126 DOM-Query for ids From ae5e44c558193a35a1c63e81aadd84273108acf6 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 1 Sep 2020 06:10:32 -0500 Subject: [PATCH 005/400] CmdSummary: Show recent intervals that start later in day than first interval with :all It was possible for `summary` command, when used with the :all hint, to skip over any intervals that start later than the first interval in the database. Signed-off-by: Shaun Ruffell --- src/commands/CmdSummary.cpp | 2 +- test/summary.t | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index c47e2d36..735fbff8 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -121,7 +121,7 @@ int CmdSummary ( days_end = Datetime (); } - for (Datetime day = days_start; day < days_end; day++) + for (Datetime day = days_start.startOfDay (); day < days_end; ++day) { auto day_range = getFullDay (day); time_t daily_total = 0; diff --git a/test/summary.t b/test/summary.t index ccbd1862..eed8a2a4 100755 --- a/test/summary.t +++ b/test/summary.t @@ -215,6 +215,20 @@ W{5} {2:%Y-%m-%d} {2:%a} @1 BAZ 10:00:00 11:00:00 1:00:00 1:00:00 """.format(yesterday, now, tomorrow, yesterday.isocalendar()[1], now.isocalendar()[1], tomorrow.isocalendar()[1]), out) + def test_with_all_hint_and_first_interval_later_in_day(self): + """Summary should handle :all hint with first interval that starts later in day than latest interval""" + now = datetime.now() + yesterday = now - timedelta(days=1) + + self.t("track {0:%Y-%m-%dT%H:%M:%S} - {1:%Y-%m-%dT%H:%M:%S} FOO".format(yesterday + timedelta(seconds=2), + yesterday + timedelta(seconds=3))) + self.t("track {0:%Y-%m-%dT%H:%M:%S} - {1:%Y-%m-%dT%H:%M:%S} BAR".format(now - timedelta(seconds=1), now)) + + code, out, err = self.t("summary :ids :all") + self.assertIn("@2", out) + self.assertIn("@1", out) + self.assertRegex(out, r'\s{30}0:00:02') + def test_with_named_date_yesterday(self): """Summary should work with 'yesterday'""" now = datetime.now() From 4487b9a61740b2bdf3ec2614430bde729dbaac4e Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 3 Sep 2020 22:03:58 +0200 Subject: [PATCH 006/400] Enter commit hash for release 1.4.2 Signed-off-by: Thomas Lauf --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 33ff79a9..84579a5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ ------ current release --------------------------- -1.4.2 (2020-08-29) - +1.4.2 (2020-08-29) - 4aa8489243adb69958d7717fb2f010c72fd4505a - #377 make install with error due to missing file `COPYING` (thanks to Dirk Deimeke) From 78fe021e47b23540a2aa22af4b702ac6759190f0 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 3 Sep 2020 22:05:51 +0200 Subject: [PATCH 007/400] Update ChangeLog Signed-off-by: Thomas Lauf --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 84579a5d..87a199c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ + +- #379 CmdSummary: Fix calculation of display start in summary table + (thanks to Shaun Ruffell) + ------ current release --------------------------- 1.4.2 (2020-08-29) - 4aa8489243adb69958d7717fb2f010c72fd4505a From 2e4d3266cf76ccdd32148781516641b6645859ea Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 3 Sep 2020 23:34:29 +0200 Subject: [PATCH 008/400] Add space Signed-off-by: Thomas Lauf --- test/docker/gentoo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/docker/gentoo b/test/docker/gentoo index db7b4424..6b690927 100644 --- a/test/docker/gentoo +++ b/test/docker/gentoo @@ -4,7 +4,7 @@ FROM gentoo/stage3-x86:latest # copy the entire portage volume in COPY --from=gentoo/portage:latest /var/db/repos/gentoo /var/db/repos/gentoo -RUN (CNT=60 ; while [[ ${CNT} -ne 0 ]] ; do echo "RUNNING (${CNT})" ; sleep 60 ; ((CNT--)) ; done ) & \ +RUN ( CNT=60 ; while [[ ${CNT} -ne 0 ]] ; do echo "RUNNING (${CNT})" ; sleep 60 ; ((CNT--)) ; done ) & \ emerge -qv \ dev-util/cmake \ dev-vcs/git \ From 985717e9c88bf362aabe944e0a9b912368762935 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Fri, 4 Sep 2020 10:43:13 +0200 Subject: [PATCH 009/400] Deactivate Gentoo Docker image due to its high maintenance costs - See issue #380 for details Signed-off-by: Thomas Lauf --- .travis.yml | 9 +++++---- docker-compose.yml | 17 +++++++++-------- test/docker/gentoo | 1 + 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6fd79697..33115d5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,11 @@ sudo: required language: generic matrix: include: - - name: "Gentoo (latest)" - os: linux - env: CONTAINER=gentoo - services: docker +# Deactivated, see https://github.com/GothenburgBitFactory/timewarrior/issues/380 +# - name: "Gentoo (latest)" +# os: linux +# env: CONTAINER=gentoo +# services: docker - name: "Centos 7" os: linux env: CONTAINER=centos7 diff --git a/docker-compose.yml b/docker-compose.yml index 21fc13a9..fa453434 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,14 +72,15 @@ services: security_opt: - label=type:container_runtime_t tty: true - test-gentoo: - build: - context: . - dockerfile: test/docker/gentoo - network_mode: "host" - security_opt: - - label=type:container_runtime_t - tty: true +# Deactivated, see https://github.com/GothenburgBitFactory/timewarrior/issues/380 +# test-gentoo: +# build: +# context: . +# dockerfile: test/docker/gentoo +# network_mode: "host" +# security_opt: +# - label=type:container_runtime_t +# tty: true test-opensuse1500: build: context: . diff --git a/test/docker/gentoo b/test/docker/gentoo index 6b690927..a956c566 100644 --- a/test/docker/gentoo +++ b/test/docker/gentoo @@ -1,3 +1,4 @@ +# Currently deactivated, see https://github.com/GothenburgBitFactory/timewarrior/issues/380 # image is based on stage3-x86 FROM gentoo/stage3-x86:latest From d90eab17a0cc3a36a85b9af3d4c4a2003cc9db5e Mon Sep 17 00:00:00 2001 From: Joerg Kastning Date: Tue, 15 Sep 2020 11:15:51 +0200 Subject: [PATCH 010/400] Fixed URL for tarball download --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0e8c76ac..148404f5 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,12 @@ There are two ways to retrieve the Timewarrior sources: * Or download the tarball with curl, - curl -O https://taskwarrior.org/download/timew-1.3.0.tar.gz + curl -O https://github.com/GothenburgBitFactory/timewarrior/releases/download/v1.4.2/timew-1.4.2.tar.gz and expand the tarball - tar xzf timew-1.3.0.tar.gz - cd timew-1.3.0 + tar xzf timew-1.4.2.tar.gz + cd timew-1.4.2 Build Timewarrior, optionally run the test suite (note: the tarball does not contain tests), and install it. From 5b1deaab5954aa93e7b51d8208988f06087d5ce2 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 1 Oct 2020 08:34:44 +0200 Subject: [PATCH 011/400] Do not overwrite interval index when parsing DOM reference - Closes #390 Signed-off-by: Thomas Lauf --- ChangeLog | 2 ++ src/dom.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87a199c6..ba673eff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ - #379 CmdSummary: Fix calculation of display start in summary table (thanks to Shaun Ruffell) +- #390 dom.tracked.X.tag.Y always returns dom.tracked.1.tag.Y + (thanks to pweaver2019) ------ current release --------------------------- diff --git a/src/dom.cpp b/src/dom.cpp index 9e494550..3fa3db96 100644 --- a/src/dom.cpp +++ b/src/dom.cpp @@ -196,18 +196,18 @@ bool domGet ( return true; } - int n; + int m; // dom.tracked..tag. if (pig.skipLiteral ("tag.") && - pig.getDigits (n)) + pig.getDigits (m)) { std::vector tags; for (auto& tag : tracked[count - n].tags ()) tags.push_back (tag); - if (n <= static_cast (tags.size ())) + if (m <= static_cast (tags.size ())) { - value = format ("{1}", tags[n - 1]); + value = format ("{1}", tags[m - 1]); return true; } } From a8b4055ad5a68327de19fe2142b8a82ad75479a2 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Thu, 1 Oct 2020 08:35:35 +0200 Subject: [PATCH 012/400] Quote tags if needed when outputting them on one line Signed-off-by: Thomas Lauf --- src/dom.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/dom.cpp b/src/dom.cpp index 3fa3db96..f6c55c42 100644 --- a/src/dom.cpp +++ b/src/dom.cpp @@ -124,10 +124,7 @@ bool domGet ( std::stringstream s; - for (const auto& tag : tags) - { - s << format ( "{1} ", tag ); - } + s << joinQuotedIfNeeded ( " ", tags ); value = s.str(); return true; From dafca6662d70b2dd7434f764465f1f051c7292d6 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Fri, 2 Oct 2020 09:07:32 +0200 Subject: [PATCH 013/400] Accommodate tests for missing space at end of line Signed-off-by: Thomas Lauf --- test/dom.t | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/dom.t b/test/dom.t index dfe947ba..fff70cb3 100755 --- a/test/dom.t +++ b/test/dom.t @@ -195,7 +195,7 @@ class TestDOMTracked(TestCase): self.t("track {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z bar".format(three_hours_before_utc, two_hours_before_utc)) code, out, err = self.t("get dom.tracked.tags") - self.assertEqual("bar foo \n", out) + self.assertEqual("bar foo\n", out) def test_dom_tracked_tags_filtered_by_time(self): """Test dom.tracked.tags with tags filtered by time""" @@ -211,7 +211,7 @@ class TestDOMTracked(TestCase): self.t("track {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z baz".format(two_hours_before_utc, one_hour_before_utc)) code, out, err = self.t("get dom.tracked.tags {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z".format(five_hours_before_utc, two_hours_before_utc)) - self.assertEqual("bar foo \n", out) + self.assertEqual("bar foo\n", out) def test_dom_tracked_tags_filtered_by_tag(self): """Test dom.tracked.tags with tags filtered by tag""" @@ -227,7 +227,7 @@ class TestDOMTracked(TestCase): self.t("track {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z foo baz".format(two_hours_before_utc, one_hour_before_utc)) code, out, err = self.t("get dom.tracked.tags foo") - self.assertEqual("baz foo \n", out) + self.assertEqual("baz foo\n", out) def test_dom_tracked_ids_with_emtpy_database(self): """Test dom.tracked.ids with empty database""" From 532d1b4e910d8431ffeabd5bb7a8e405a57e586e Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Fri, 2 Oct 2020 09:20:22 +0200 Subject: [PATCH 014/400] Add test for `get dom.tracked.tags` with a tag with quotes Signed-off-by: Thomas Lauf --- test/dom.t | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/test/dom.t b/test/dom.t index fff70cb3..e9f8ad7a 100755 --- a/test/dom.t +++ b/test/dom.t @@ -197,6 +197,20 @@ class TestDOMTracked(TestCase): code, out, err = self.t("get dom.tracked.tags") self.assertEqual("bar foo\n", out) + def test_dom_tracked_tags_with_quoted_tag(self): + """Test dom.tracked.tags with a tag with quotes""" + now_utc = datetime.now().utcnow() + two_hours_before_utc = now_utc - timedelta(hours=2) + three_hours_before_utc = now_utc - timedelta(hours=3) + four_hours_before_utc = now_utc - timedelta(hours=4) + five_hours_before_utc = now_utc - timedelta(hours=5) + + self.t("track {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z \"with quotes\"".format(five_hours_before_utc, four_hours_before_utc)) + self.t("track {:%Y-%m-%dT%H:%M:%S}Z - {:%Y-%m-%dT%H:%M:%S}Z bar".format(three_hours_before_utc, two_hours_before_utc)) + + code, out, err = self.t("get dom.tracked.tags") + self.assertEqual("bar \"with quotes\"\n", out) + def test_dom_tracked_tags_filtered_by_time(self): """Test dom.tracked.tags with tags filtered by time""" now_utc = datetime.now().utcnow() From ace5cbe876d7abd9cb9e3b44bea3b8a383da0aab Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Mon, 9 Nov 2020 21:50:47 +0100 Subject: [PATCH 015/400] Update libshared to 9d4a44f877611484233bab42fd9e5af3ef47b26c Signed-off-by: Thomas Lauf --- src/libshared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libshared b/src/libshared index b8b57965..9d4a44f8 160000 --- a/src/libshared +++ b/src/libshared @@ -1 +1 @@ -Subproject commit b8b5796595dbf221656a25faaaed2f7a88b0aff6 +Subproject commit 9d4a44f877611484233bab42fd9e5af3ef47b26c From ce021a87e332677e5d8ede39f21272eb95c7d775 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Tue, 17 Nov 2020 12:38:40 -0600 Subject: [PATCH 016/400] test: Thread.isAlive() -> Thread.is_alive() Python added Thread.is_alive() in 2.6 and removed Thread.isAlive() in 3.9. This change is needed to run the tests with Python 3.9. https://bugs.python.org/issue37804 Signed-off-by: Shaun Ruffell --- test/basetest/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/basetest/utils.py b/test/basetest/utils.py index 2b1358b3..4d4103b8 100644 --- a/test/basetest/utils.py +++ b/test/basetest/utils.py @@ -136,7 +136,7 @@ def _retrieve_output(thread, timeout, queue, thread_error): """Fetch output from binary subprocess queues""" # Try to join the thread on failure abort thread.join(timeout) - if thread.isAlive(): + if thread.is_alive(): # Join should have killed the thread. This is unexpected raise TimeoutWaitingFor(thread_error + ". Unexpected error") From c9b212ce15940cade77c03d284ed854982acb7f7 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 17 Oct 2020 20:42:15 +0200 Subject: [PATCH 017/400] Update dark_blue.theme fixed the description --- doc/themes/dark_blue.theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/themes/dark_blue.theme b/doc/themes/dark_blue.theme index 8c2ae551..95c399ef 100644 --- a/doc/themes/dark_blue.theme +++ b/doc/themes/dark_blue.theme @@ -25,7 +25,7 @@ ############################################################################### define theme: - description = "dark_green.theme: A dark green theme." + description = "dark_blue.theme: A dark blue theme." colors: # General UI color. exclusion = "gray8 on gray4" From 2babc52dc579083549ca8553dedc60f8a4b25b16 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sun, 20 Dec 2020 15:30:07 -0500 Subject: [PATCH 018/400] build: Update libshared to version supporting Unicode 11 --- src/CMakeLists.txt | 2 +- src/libshared | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f0df1cfb..2178a554 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -51,7 +51,7 @@ set (libshared_SRCS libshared/src/Args.cpp libshared/src/Args.h libshared/src/shared.cpp libshared/src/shared.h libshared/src/unicode.cpp libshared/src/unicode.h libshared/src/utf8.cpp libshared/src/utf8.h - libshared/src/wcwidth6.cpp) + libshared/src/wcwidth.h) add_library (timew STATIC ${timew_SRCS}) add_library (libshared STATIC ${libshared_SRCS}) diff --git a/src/libshared b/src/libshared index 9d4a44f8..4ff753b3 160000 --- a/src/libshared +++ b/src/libshared @@ -1 +1 @@ -Subproject commit 9d4a44f877611484233bab42fd9e5af3ef47b26c +Subproject commit 4ff753b3889b0287322df5f92e4d71d5f2b7190e From 572c29e7dd79ad4ab0b3e0b8e9202dff74c54cb1 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sun, 20 Dec 2020 15:34:28 -0500 Subject: [PATCH 019/400] ChangeLog: Add entry about Unicode support --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index ba673eff..9ed0b13f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ (thanks to Shaun Ruffell) - #390 dom.tracked.X.tag.Y always returns dom.tracked.1.tag.Y (thanks to pweaver2019) +- Width determination of Unicode characters now works for up to + Unicode 11 (from Unicode 5). Emojis are correctly displayed. ------ current release --------------------------- From e5870380a4554c5fde343f53dfdb38cf3ce6a1b1 Mon Sep 17 00:00:00 2001 From: Tomas Babej Date: Sat, 2 Jan 2021 02:52:39 -0500 Subject: [PATCH 020/400] doc: Update copyright to 2021 --- LICENSE | 2 +- completion/timew-completion.bash | 2 +- doc/holidays/refresh | 2 +- ext/on-modify.timewarrior | 2 +- ext/totals.py | 2 +- src/AtomicFile.cpp | 2 +- src/AtomicFile.h | 2 +- src/CLI.cpp | 2 +- src/CLI.h | 2 +- src/Chart.cpp | 2 +- src/Database.cpp | 2 +- src/Database.h | 2 +- src/Datafile.cpp | 2 +- src/Datafile.h | 2 +- src/DatetimeParser.cpp | 2 +- src/DatetimeParser.h | 2 +- src/Interval.cpp | 2 +- src/Interval.h | 2 +- src/IntervalFactory.cpp | 2 +- src/Journal.cpp | 2 +- src/Journal.h | 2 +- src/Rules.cpp | 2 +- src/TagInfoDatabase.cpp | 2 +- src/TagInfoDatabase.h | 2 +- src/commands/CmdAnnotate.cpp | 2 +- src/commands/CmdCancel.cpp | 2 +- src/commands/CmdChart.cpp | 2 +- src/commands/CmdConfig.cpp | 2 +- src/commands/CmdContinue.cpp | 2 +- src/commands/CmdDefault.cpp | 2 +- src/commands/CmdDelete.cpp | 2 +- src/commands/CmdDiagnostics.cpp | 2 +- src/commands/CmdExport.cpp | 2 +- src/commands/CmdFill.cpp | 2 +- src/commands/CmdGaps.cpp | 2 +- src/commands/CmdGet.cpp | 2 +- src/commands/CmdHelp.cpp | 2 +- src/commands/CmdJoin.cpp | 2 +- src/commands/CmdLengthen.cpp | 2 +- src/commands/CmdModify.cpp | 2 +- src/commands/CmdMove.cpp | 2 +- src/commands/CmdReport.cpp | 2 +- src/commands/CmdResize.cpp | 2 +- src/commands/CmdShorten.cpp | 2 +- src/commands/CmdSplit.cpp | 2 +- src/commands/CmdStart.cpp | 2 +- src/commands/CmdStop.cpp | 2 +- src/commands/CmdSummary.cpp | 2 +- src/commands/CmdTag.cpp | 2 +- src/commands/CmdTags.cpp | 2 +- src/commands/CmdTrack.cpp | 2 +- src/commands/CmdUndo.cpp | 2 +- src/commands/CmdUntag.cpp | 2 +- src/data.cpp | 2 +- src/dom.cpp | 2 +- src/helper.cpp | 2 +- src/init.cpp | 2 +- src/log.cpp | 2 +- src/timew.cpp | 2 +- src/timew.h | 2 +- src/validate.cpp | 2 +- test/AtomicFileTest.cpp | 2 +- test/Datafile.t.cpp | 2 +- test/DatetimeParser.t.cpp | 2 +- test/TagInfoDatabase.t.cpp | 2 +- test/TempDir.h | 2 +- test/annotate.t | 2 +- test/dom.t | 2 +- test/export.t | 2 +- test/help.t | 2 +- test/interval.t.cpp | 2 +- test/modify.t | 2 +- test/move.t | 2 +- test/simpletap/__init__.py | 2 +- test/start.t | 2 +- test/stop.t | 2 +- test/summary.t | 2 +- test/track.t | 2 +- 78 files changed, 78 insertions(+), 78 deletions(-) diff --git a/LICENSE b/LICENSE index fe9ca587..e4152d34 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Timewarrior - a command line time tracker -Copyright 2015 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +Copyright 2015 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/completion/timew-completion.bash b/completion/timew-completion.bash index 3e691ed9..9eb757d7 100644 --- a/completion/timew-completion.bash +++ b/completion/timew-completion.bash @@ -1,6 +1,6 @@ # Bash completion for TimeWarrior # -# Copyright (C) 2017 - 2020 Thomas Lauf +# Copyright (C) 2017 - 2021, Thomas Lauf # function __get_commands() { diff --git a/doc/holidays/refresh b/doc/holidays/refresh index 789e471b..34c67833 100755 --- a/doc/holidays/refresh +++ b/doc/holidays/refresh @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/ext/on-modify.timewarrior b/ext/on-modify.timewarrior index 2fcc520e..46d82a97 100755 --- a/ext/on-modify.timewarrior +++ b/ext/on-modify.timewarrior @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/ext/totals.py b/ext/totals.py index 7c1e90e2..0a5ff053 100755 --- a/ext/totals.py +++ b/ext/totals.py @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/src/AtomicFile.cpp b/src/AtomicFile.cpp index ec5549d2..8b8e2fc4 100644 --- a/src/AtomicFile.cpp +++ b/src/AtomicFile.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Shaun Ruffell, Thomas Lauf. +// Copyright 2021, Shaun Ruffell, Thomas Lauf. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/AtomicFile.h b/src/AtomicFile.h index 348cb3a2..fbe6260f 100644 --- a/src/AtomicFile.h +++ b/src/AtomicFile.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Shaun Ruffell, Thomas Lauf. +// Copyright 2021, Shaun Ruffell, Thomas Lauf. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/CLI.cpp b/src/CLI.cpp index 020c8538..04cc6771 100644 --- a/src/CLI.cpp +++ b/src/CLI.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/CLI.h b/src/CLI.h index b1d4b676..663603cb 100644 --- a/src/CLI.h +++ b/src/CLI.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Chart.cpp b/src/Chart.cpp index add1ab8c..7368db79 100644 --- a/src/Chart.cpp +++ b/src/Chart.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2019 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2019 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Database.cpp b/src/Database.cpp index 8d8defcc..8255f90a 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Database.h b/src/Database.h index 174ce877..47fbc7b7 100644 --- a/src/Database.h +++ b/src/Database.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Datafile.cpp b/src/Datafile.cpp index 2fd85454..48222d6e 100644 --- a/src/Datafile.cpp +++ b/src/Datafile.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Datafile.h b/src/Datafile.h index ea608f4c..6cf0e6b8 100644 --- a/src/Datafile.h +++ b/src/Datafile.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/DatetimeParser.cpp b/src/DatetimeParser.cpp index c715f652..fd1f14d0 100644 --- a/src/DatetimeParser.cpp +++ b/src/DatetimeParser.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez +// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/DatetimeParser.h b/src/DatetimeParser.h index 4543801d..0cf0242d 100644 --- a/src/DatetimeParser.h +++ b/src/DatetimeParser.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Interval.cpp b/src/Interval.cpp index 6484b785..62035e01 100644 --- a/src/Interval.cpp +++ b/src/Interval.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Interval.h b/src/Interval.h index 9ae06ca2..799e3109 100644 --- a/src/Interval.h +++ b/src/Interval.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/IntervalFactory.cpp b/src/IntervalFactory.cpp index 0a2d2c36..21dd2a23 100644 --- a/src/IntervalFactory.cpp +++ b/src/IntervalFactory.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Journal.cpp b/src/Journal.cpp index fb08797d..de153754 100644 --- a/src/Journal.cpp +++ b/src/Journal.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Journal.h b/src/Journal.h index ecd2e0a0..22355b57 100644 --- a/src/Journal.h +++ b/src/Journal.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/Rules.cpp b/src/Rules.cpp index f2b72ada..5341cccb 100644 --- a/src/Rules.cpp +++ b/src/Rules.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2015 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2015 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/TagInfoDatabase.cpp b/src/TagInfoDatabase.cpp index 7d03a02d..599bbfb6 100644 --- a/src/TagInfoDatabase.cpp +++ b/src/TagInfoDatabase.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/TagInfoDatabase.h b/src/TagInfoDatabase.h index 6d1d759b..d55fc145 100644 --- a/src/TagInfoDatabase.h +++ b/src/TagInfoDatabase.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp index d9b471a6..c15b6ccf 100644 --- a/src/commands/CmdAnnotate.cpp +++ b/src/commands/CmdAnnotate.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdCancel.cpp b/src/commands/CmdCancel.cpp index 59954e29..c555fa80 100644 --- a/src/commands/CmdCancel.cpp +++ b/src/commands/CmdCancel.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdChart.cpp b/src/commands/CmdChart.cpp index 4561c47d..fc7243d2 100644 --- a/src/commands/CmdChart.cpp +++ b/src/commands/CmdChart.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdConfig.cpp b/src/commands/CmdConfig.cpp index 380ae1c1..7413054a 100644 --- a/src/commands/CmdConfig.cpp +++ b/src/commands/CmdConfig.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdContinue.cpp b/src/commands/CmdContinue.cpp index a23702e2..331c07b4 100644 --- a/src/commands/CmdContinue.cpp +++ b/src/commands/CmdContinue.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdDefault.cpp b/src/commands/CmdDefault.cpp index 20f7e9e9..865aa571 100644 --- a/src/commands/CmdDefault.cpp +++ b/src/commands/CmdDefault.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp index b59dca26..a1571c49 100644 --- a/src/commands/CmdDelete.cpp +++ b/src/commands/CmdDelete.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdDiagnostics.cpp b/src/commands/CmdDiagnostics.cpp index 9ecc3be6..280e11f0 100644 --- a/src/commands/CmdDiagnostics.cpp +++ b/src/commands/CmdDiagnostics.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdExport.cpp b/src/commands/CmdExport.cpp index 0cbec73b..fc6dd4cc 100644 --- a/src/commands/CmdExport.cpp +++ b/src/commands/CmdExport.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdFill.cpp b/src/commands/CmdFill.cpp index a5392a0a..f068183d 100644 --- a/src/commands/CmdFill.cpp +++ b/src/commands/CmdFill.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdGaps.cpp b/src/commands/CmdGaps.cpp index 900efd68..62bdabb1 100644 --- a/src/commands/CmdGaps.cpp +++ b/src/commands/CmdGaps.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdGet.cpp b/src/commands/CmdGet.cpp index 6f861837..b7c66227 100644 --- a/src/commands/CmdGet.cpp +++ b/src/commands/CmdGet.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp index 4ea79780..07adb51e 100644 --- a/src/commands/CmdHelp.cpp +++ b/src/commands/CmdHelp.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdJoin.cpp b/src/commands/CmdJoin.cpp index 1f809803..849eb483 100644 --- a/src/commands/CmdJoin.cpp +++ b/src/commands/CmdJoin.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdLengthen.cpp b/src/commands/CmdLengthen.cpp index 6624c56b..37fc4bac 100644 --- a/src/commands/CmdLengthen.cpp +++ b/src/commands/CmdLengthen.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp index 339beccb..844e5bf2 100644 --- a/src/commands/CmdModify.cpp +++ b/src/commands/CmdModify.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdMove.cpp b/src/commands/CmdMove.cpp index c3fcf623..53f3451a 100644 --- a/src/commands/CmdMove.cpp +++ b/src/commands/CmdMove.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdReport.cpp b/src/commands/CmdReport.cpp index b11f629c..4c533d17 100644 --- a/src/commands/CmdReport.cpp +++ b/src/commands/CmdReport.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdResize.cpp b/src/commands/CmdResize.cpp index 6906aba8..5f5b7720 100644 --- a/src/commands/CmdResize.cpp +++ b/src/commands/CmdResize.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2017 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2017 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdShorten.cpp b/src/commands/CmdShorten.cpp index c5b45847..8066e2ba 100644 --- a/src/commands/CmdShorten.cpp +++ b/src/commands/CmdShorten.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdSplit.cpp b/src/commands/CmdSplit.cpp index d23c9f15..3f592a23 100644 --- a/src/commands/CmdSplit.cpp +++ b/src/commands/CmdSplit.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdStart.cpp b/src/commands/CmdStart.cpp index 5c9f537f..95447f40 100644 --- a/src/commands/CmdStart.cpp +++ b/src/commands/CmdStart.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdStop.cpp b/src/commands/CmdStop.cpp index 0ca09774..b430198e 100644 --- a/src/commands/CmdStop.cpp +++ b/src/commands/CmdStop.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index 735fbff8..0d45d05f 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdTag.cpp b/src/commands/CmdTag.cpp index 8034aa6f..b8306732 100644 --- a/src/commands/CmdTag.cpp +++ b/src/commands/CmdTag.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp index 1b792305..c3f0ca06 100644 --- a/src/commands/CmdTags.cpp +++ b/src/commands/CmdTags.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdTrack.cpp b/src/commands/CmdTrack.cpp index 61f784ca..393283c6 100644 --- a/src/commands/CmdTrack.cpp +++ b/src/commands/CmdTrack.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdUndo.cpp b/src/commands/CmdUndo.cpp index d0afe9c2..1b94714f 100644 --- a/src/commands/CmdUndo.cpp +++ b/src/commands/CmdUndo.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/commands/CmdUntag.cpp b/src/commands/CmdUntag.cpp index fbeff8e3..637c8c7d 100644 --- a/src/commands/CmdUntag.cpp +++ b/src/commands/CmdUntag.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/data.cpp b/src/data.cpp index 7c5d0d78..baa66a46 100644 --- a/src/data.cpp +++ b/src/data.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/dom.cpp b/src/dom.cpp index f6c55c42..008b52a7 100644 --- a/src/dom.cpp +++ b/src/dom.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/helper.cpp b/src/helper.cpp index d63bbf85..dcc002ef 100644 --- a/src/helper.cpp +++ b/src/helper.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/init.cpp b/src/init.cpp index 5e8333b4..9c397821 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/log.cpp b/src/log.cpp index ec2ca374..47297384 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016, 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016, 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/timew.cpp b/src/timew.cpp index 49695d30..9b0bae70 100644 --- a/src/timew.cpp +++ b/src/timew.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2015 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2015 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/timew.h b/src/timew.h index 4996a5db..edc616cb 100644 --- a/src/timew.h +++ b/src/timew.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/src/validate.cpp b/src/validate.cpp index 7fa4ba1a..32c95b29 100644 --- a/src/validate.cpp +++ b/src/validate.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/AtomicFileTest.cpp b/test/AtomicFileTest.cpp index 22da9ea9..1c101d55 100644 --- a/test/AtomicFileTest.cpp +++ b/test/AtomicFileTest.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Shaun Ruffell, Thomas Lauf. +// Copyright 2021, Shaun Ruffell, Thomas Lauf. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/Datafile.t.cpp b/test/Datafile.t.cpp index d15871cf..9e9a062e 100644 --- a/test/Datafile.t.cpp +++ b/test/Datafile.t.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Shaun Ruffell, Thomas Lauf. +// Copyright 2021, Shaun Ruffell, Thomas Lauf. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/DatetimeParser.t.cpp b/test/DatetimeParser.t.cpp index e113e5dc..ea791cc6 100644 --- a/test/DatetimeParser.t.cpp +++ b/test/DatetimeParser.t.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/TagInfoDatabase.t.cpp b/test/TagInfoDatabase.t.cpp index bcf2795d..ac083912 100644 --- a/test/TagInfoDatabase.t.cpp +++ b/test/TagInfoDatabase.t.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/TempDir.h b/test/TempDir.h index 0bacc9a0..1d6b39a4 100644 --- a/test/TempDir.h +++ b/test/TempDir.h @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2020, Shaun Ruffell, Thomas Lauf. +// Copyright 2021, Shaun Ruffell, Thomas Lauf. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/annotate.t b/test/annotate.t index 9831d76e..1cd91ecb 100755 --- a/test/annotate.t +++ b/test/annotate.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/dom.t b/test/dom.t index e9f8ad7a..86250fc4 100755 --- a/test/dom.t +++ b/test/dom.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/export.t b/test/export.t index 832d588e..56ddf572 100755 --- a/test/export.t +++ b/test/export.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/help.t b/test/help.t index 73a1242d..9882f93e 100755 --- a/test/help.t +++ b/test/help.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2019 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2019 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/interval.t.cpp b/test/interval.t.cpp index a2140338..c57ed8ff 100644 --- a/test/interval.t.cpp +++ b/test/interval.t.cpp @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////////////////////// // -// Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +// Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/test/modify.t b/test/modify.t index 0fc62d33..e5eb8c0c 100755 --- a/test/modify.t +++ b/test/modify.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2018 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2018 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/move.t b/test/move.t index cf69cb2a..2d7fdd93 100755 --- a/test/move.t +++ b/test/move.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/simpletap/__init__.py b/test/simpletap/__init__.py index 3215f7ef..e6e72a73 100644 --- a/test/simpletap/__init__.py +++ b/test/simpletap/__init__.py @@ -1,7 +1,7 @@ ############################################################################### # timewarrior - a command line time tracker. # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/start.t b/test/start.t index 74cfd61a..8dec86ca 100755 --- a/test/start.t +++ b/test/start.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/stop.t b/test/stop.t index c68217a4..e83d480d 100755 --- a/test/stop.t +++ b/test/stop.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/summary.t b/test/summary.t index eed8a2a4..14ed9c6c 100755 --- a/test/summary.t +++ b/test/summary.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2017 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2017 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/test/track.t b/test/track.t index 5af22f09..4a57cf4f 100755 --- a/test/track.t +++ b/test/track.t @@ -2,7 +2,7 @@ ############################################################################### # -# Copyright 2016 - 2020, Thomas Lauf, Paul Beckingham, Federico Hernandez. +# Copyright 2016 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From b7882fd71f80428ae046f3b0a68674912d3a0afc Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Fri, 22 Jan 2021 17:50:11 +0100 Subject: [PATCH 021/400] Move license URL up, so Github detects the license type correctly Signed-off-by: Thomas Lauf --- LICENSE | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index e4152d34..4a80e197 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,6 @@ -Timewarrior - a command line time tracker +MIT license + +https://opensource.org/licenses/mit-license.php Copyright 2015 - 2021, Thomas Lauf, Paul Beckingham, Federico Hernandez. @@ -20,4 +22,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -https://www.opensource.org/licenses/mit-license.php From 1a6c30b93ae04406be6be4cb4f619b30f221fd7b Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Mon, 25 Jan 2021 13:47:08 +0100 Subject: [PATCH 022/400] Fix test `summary.t` for single-digit weeks If summary is called during a single digit week, the respective column is only 2 characters wide Signed-off-by: Thomas Lauf --- ChangeLog | 1 + test/summary.t | 39 +++++++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ed0b13f..2eb9ee39 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ (thanks to pweaver2019) - Width determination of Unicode characters now works for up to Unicode 11 (from Unicode 5). Emojis are correctly displayed. +- Fix test `summary.t` for single-digit weeks ------ current release --------------------------- diff --git a/test/summary.t b/test/summary.t index 14ed9c6c..d9cd9411 100755 --- a/test/summary.t +++ b/test/summary.t @@ -204,16 +204,23 @@ W10 2017-03-09 Thu @4 Tag1 8:43:08 9:38:15 0:55:07 code, out, err = self.t("summary :ids :all") + week_yesterday = yesterday.isocalendar()[1] + week_now = now.isocalendar()[1] + week_tomorrow = tomorrow.isocalendar()[1] + + two_digit_week = (week_yesterday > 9 | week_now > 9 | week_tomorrow > 9) + self.assertIn(""" -Wk Date Day ID Tags Start End Time Total ---- ---------- --- -- ---- -------- -------- ------- ------- +Wk{6} Date Day ID Tags Start End Time Total +--{7} ---------- --- -- ---- -------- -------- ------- ------- W{3} {0:%Y-%m-%d} {0:%a} @3 FOO 10:00:00 11:00:00 1:00:00 1:00:00 W{4} {1:%Y-%m-%d} {1:%a} @2 BAR 10:00:00 11:00:00 1:00:00 1:00:00 W{5} {2:%Y-%m-%d} {2:%a} @1 BAZ 10:00:00 11:00:00 1:00:00 1:00:00 - 3:00:00 +{6} 3:00:00 """.format(yesterday, now, tomorrow, - yesterday.isocalendar()[1], now.isocalendar()[1], tomorrow.isocalendar()[1]), out) + week_yesterday, week_now, week_tomorrow, + " " if two_digit_week is True else "", "-" if two_digit_week is True else ""), out) def test_with_all_hint_and_first_interval_later_in_day(self): """Summary should handle :all hint with first interval that starts later in day than latest interval""" @@ -241,13 +248,17 @@ W{5} {2:%Y-%m-%d} {2:%a} @1 BAZ 10:00:00 11:00:00 1:00:00 1:00:00 code, out, err = self.t("summary :ids yesterday") + week_yesterday = yesterday.isocalendar()[1] + + two_digit_week = (week_yesterday > 9) + self.assertIn(""" -Wk Date Day ID Tags Start End Time Total ---- ---------- --- -- ---- -------- -------- ------- ------- +Wk{2} Date Day ID Tags Start End Time Total +--{3} ---------- --- -- ---- -------- -------- ------- ------- W{1} {0:%Y-%m-%d} {0:%a} @3 FOO 10:00:00 11:00:00 1:00:00 1:00:00 - 1:00:00 -""".format(yesterday, yesterday.isocalendar()[1]), out) +{2} 1:00:00 +""".format(yesterday, week_yesterday, " " if two_digit_week is True else "", "-" if two_digit_week is True else ""), out) def test_with_named_date_today(self): """Summary should work with 'today'""" @@ -261,13 +272,17 @@ W{1} {0:%Y-%m-%d} {0:%a} @3 FOO 10:00:00 11:00:00 1:00:00 1:00:00 code, out, err = self.t("summary :ids today") + week_now = now.isocalendar()[1] + + two_digit_week = (week_now > 9) + self.assertIn(""" -Wk Date Day ID Tags Start End Time Total ---- ---------- --- -- ---- -------- -------- ------- ------- +Wk{2} Date Day ID Tags Start End Time Total +--{3} ---------- --- -- ---- -------- -------- ------- ------- W{1} {0:%Y-%m-%d} {0:%a} @2 BAR 10:00:00 11:00:00 1:00:00 1:00:00 - 1:00:00 -""".format(now, now.isocalendar()[1]), out) +{2} 1:00:00 +""".format(now, week_now, " " if two_digit_week is True else "", "-" if two_digit_week is True else ""), out) def test_with_day_gap(self): """Summary should skip days with no data""" From 2cfeef1aa2dc56605bee80c148af251093295c8f Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Mon, 25 Jan 2021 14:31:00 +0100 Subject: [PATCH 023/400] Update libshared to c1760be8686ce0b2f778832aaa1e2f98eed2ffc1 Signed-off-by: Thomas Lauf --- src/libshared | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libshared b/src/libshared index 4ff753b3..c1760be8 160000 --- a/src/libshared +++ b/src/libshared @@ -1 +1 @@ -Subproject commit 4ff753b3889b0287322df5f92e4d71d5f2b7190e +Subproject commit c1760be8686ce0b2f778832aaa1e2f98eed2ffc1 From ab240419df45d9207a4001ada72d7525090b1045 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Tue, 26 Jan 2021 13:36:03 +0100 Subject: [PATCH 024/400] Ensure CentOS 7 docker image compiles Timewarrior with gcc >6 - libshared now requires C++14 Signed-off-by: Thomas Lauf --- test/docker/centos7 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/docker/centos7 b/test/docker/centos7 index 9ace135f..858d8265 100644 --- a/test/docker/centos7 +++ b/test/docker/centos7 @@ -13,10 +13,10 @@ RUN yum install -y \ python36-dateutil # Setup environment -RUN echo "#!/bin/bash" >> /etc/profile.d/enable_env.sh ; \ - echo "source scl_source enable devtoolset-7" >> /etc/profile.d/enable_env.sh ; - -RUN ln -s /usr/bin/cmake3 /usr/bin/cmake +RUN ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/c++ +RUN ln -sf /opt/rh/devtoolset-7/root/usr/bin/gcc /usr/bin/gcc +RUN ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/g++ +RUN ln -sf /usr/bin/cmake3 /usr/bin/cmake RUN ln -sf /usr/bin/python3 /usr/bin/python ENV LC_ALL en_US.UTF-8 From 0fb7a88159f13df99bddf04d2d65151838190f32 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Tue, 26 Jan 2021 13:36:54 +0100 Subject: [PATCH 025/400] Ensure Ubuntu 16.04 docker image compiles Timewarrior with gcc >6 - libshared now requires C++14 Signed-off-by: Thomas Lauf --- test/docker/ubuntu1604 | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604 index 1103ceca..bf1ee81c 100644 --- a/test/docker/ubuntu1604 +++ b/test/docker/ubuntu1604 @@ -2,10 +2,14 @@ FROM ubuntu:16.04 ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -RUN apt-get install -y \ +RUN apt-get update && \ + apt-get install -y build-essential software-properties-common && \ + add-apt-repository -y ppa:ubuntu-toolchain-r/test +RUN apt-get update && \ + apt-get install -y \ cmake \ - g++ \ + gcc-snapshot \ + g++-6 \ git \ locales \ man \ @@ -14,7 +18,10 @@ RUN apt-get install -y \ tzdata # Setup environment -RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10 +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 60 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-6 && \ + update-alternatives --config gcc && \ + update-alternatives --install /usr/bin/python python /usr/bin/python3 10 RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime RUN dpkg-reconfigure -f noninteractive tzdata From 813754144c45d9b539875fb6f3097b1a1cf503db Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Sun, 7 Feb 2021 17:16:26 +0100 Subject: [PATCH 026/400] Remove Gentoo from test zoo See #380. We will include the test suite in the release tarball so the Gentoo maintainers can run it and report back. Signed-off-by: Thomas Lauf --- docker-compose.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fa453434..f7678d49 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,15 +72,6 @@ services: security_opt: - label=type:container_runtime_t tty: true -# Deactivated, see https://github.com/GothenburgBitFactory/timewarrior/issues/380 -# test-gentoo: -# build: -# context: . -# dockerfile: test/docker/gentoo -# network_mode: "host" -# security_opt: -# - label=type:container_runtime_t -# tty: true test-opensuse1500: build: context: . From b0e5ad6bc5b011e312349b79df83a6ab52f53415 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Mon, 8 Feb 2021 21:14:18 +0100 Subject: [PATCH 027/400] Replace Travis CI with Github Workflow Closes #411 Signed-off-by: Thomas Lauf --- .github/workflows/tests.yaml | 61 ++++++++++++++++++++++++++++++++ .travis.yml | 67 ------------------------------------ 2 files changed, 61 insertions(+), 67 deletions(-) create mode 100644 .github/workflows/tests.yaml delete mode 100644 .travis.yml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml new file mode 100644 index 00000000..d5b82341 --- /dev/null +++ b/.github/workflows/tests.yaml @@ -0,0 +1,61 @@ +name: tests +on: [push, pull_request] +jobs: + tests: + strategy: + fail-fast: false + matrix: + include: + #- name: "Archlinux Base" + # runner: ubuntu-latest + # container: archlinux + - name: "Centos 7" + runner: ubuntu-latest + container: centos7 + - name: "Centos 8" + runner: ubuntu-latest + container: centos8 + - name: "Debian Stable" + runner: ubuntu-latest + container: debianstable + - name: "Debian Testing" + runner: ubuntu-latest + container: debiantesting + - name: "Fedora 31" + runner: ubuntu-latest + container: fedora31 + - name: "Fedora 32" + runner: ubuntu-latest + container: fedora32 + - name: "OpenSUSE 15.0" + runner: ubuntu-latest + container: opensuse1500 + - name: "Ubuntu 16.04" + runner: ubuntu-latest + container: ubuntu1604 + - name: "Ubuntu 18.04" + runner: ubuntu-latest + container: ubuntu1804 + - name: "Ubuntu 20.04" + runner: ubuntu-latest + container: ubuntu2004 + - name: "Mac OS X 10.15" + runner: macos-10.15 + container: osx + runs-on: ${{ matrix.runner }} + continue-on-error: ${{ matrix.continue-on-error == true }} + steps: + - uses: actions/checkout@v2 + - name: Build ${{ matrix.name }} + env: + DOCKER_REGISTRY: docker.pkg.github.com + DOCKER_CACHE_IMAGE: docker.pkg.github.com/${{ github.repository }}/timewarrior_cache + GITHUB_USER: ${{ github.actor }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CONTAINER: ${{ matrix.container }} + run: if [[ ${CONTAINER} != "osx" ]]; then docker-compose build test-${CONTAINER} ; fi + - name: Test ${{ matrix.name }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CONTAINER: ${{ matrix.container }} + run: if [[ ${CONTAINER} != "osx" ]]; then docker-compose run test-${CONTAINER}; else bash test/scripts/test_osx.sh ; fi diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 33115d5f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,67 +0,0 @@ -sudo: required -language: generic -matrix: - include: -# Deactivated, see https://github.com/GothenburgBitFactory/timewarrior/issues/380 -# - name: "Gentoo (latest)" -# os: linux -# env: CONTAINER=gentoo -# services: docker - - name: "Centos 7" - os: linux - env: CONTAINER=centos7 - services: docker - - name: "Centos 8" - os: linux - env: CONTAINER=centos8 - services: docker - - name: "Fedora 31" - os: linux - env: CONTAINER=fedora31 - services: docker - - name: "Fedora 32" - os: linux - env: CONTAINER=fedora32 - services: docker - - name: "Debian Stable" - os: linux - env: CONTAINER=debianstable - services: docker - - name: "Debian Testing" - os: linux - env: CONTAINER=debiantesting - services: docker - - name: "Ubuntu 16.04" - os: linux - env: CONTAINER=ubuntu1604 - services: docker - - name: "Ubuntu 18.04" - os: linux - env: CONTAINER=ubuntu1804 - services: docker - - name: "Ubuntu 20.04" - os: linux - env: CONTAINER=ubuntu2004 - services: docker - - name: "OpenSUSE 15.0" - os: linux - env: CONTAINER=opensuse1500 - services: docker - - name: "Archlinux" - os: linux - env: CONTAINER=archlinux - services: docker - - name: "macOS 10.13" - os: osx - osx_image: xcode9.4 - env: CONTAINER=osx - - name: "macOS 10.14" - os: osx - osx_image: xcode10.3 - env: CONTAINER=osx -install: - # Build the docker container - - pushd $TRAVIS_BUILD_DIR - - if [[ $CONTAINER != "osx" ]]; then docker-compose build test-$CONTAINER ; fi -script: - - if [[ $CONTAINER != "osx" ]]; then docker-compose run test-$CONTAINER; else bash test/scripts/test_osx.sh ; fi From 65ef38658b7db44a97d1e3eb01c43d9ad2f0aee1 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Fri, 12 Feb 2021 10:44:33 +0100 Subject: [PATCH 028/400] Increase minimal CMake version Compatibility with CMake < 2.8.12 will be removed from a future version of CMake. According to our test images all supported distributions have CMake > 3 Signed-off-by: Thomas Lauf --- CMakeLists.txt | 2 +- doc/CMakeLists.txt | 2 +- doc/holidays/CMakeLists.txt | 2 +- doc/themes/CMakeLists.txt | 2 +- ext/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +- src/commands/CMakeLists.txt | 2 +- test/CMakeLists.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6468f121..be3ad9d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) set (CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") set (HAVE_CMAKE true) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 51f9a43a..39af667c 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) message ("-- Configuring documentation") diff --git a/doc/holidays/CMakeLists.txt b/doc/holidays/CMakeLists.txt index 44e0f4cb..85f284ac 100644 --- a/doc/holidays/CMakeLists.txt +++ b/doc/holidays/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) message ("-- Configuring holiday documentation") diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt index 1f4e0091..37f27eae 100644 --- a/doc/themes/CMakeLists.txt +++ b/doc/themes/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) message ("-- Configuring theme documentation") diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index 46dcef9b..3faa00b4 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) message ("-- Configuring extensions") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2178a554..1fd95269 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/commands diff --git a/src/commands/CMakeLists.txt b/src/commands/CMakeLists.txt index c390938a..073f4a4e 100644 --- a/src/commands/CMakeLists.txt +++ b/src/commands/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/commands diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 5339eada..e258ec92 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12) # This is a work-around for the following CMake issue: # https://gitlab.kitware.com/cmake/cmake/issues/16062 From b189ccb020f1e496c766677bf0d1bd82eab69105 Mon Sep 17 00:00:00 2001 From: Thomas Lauf Date: Tue, 26 Jan 2021 20:36:49 +0100 Subject: [PATCH 029/400] Replace roff man pages with asciidoctor This replaces the generation of man pages on project setup by a on-demand generation via asciidoctor. An exception are the man pages for the commands `day`, `month`, and `week` which are simply redirects to the man page `timew-chart.1`. Those are now static files in the Timewarrior repository. A CMake find module to detect asciidoctor was added. If asciidoctor is found, the targets `doc`, `man1`, and `man7` are created. Those targets are also added to the default build target. If asciidoctor is not available, the target `doc` is available, but it only emits a message to install asciidoctor first. Signed-off-by: Thomas Lauf --- CMakeLists.txt | 3 + cmake/FindAsciidoctor.cmake | 16 ++ doc/CMakeLists.txt | 53 +--- doc/man1/.gitignore | 3 + doc/man1/CMakeLists.txt | 21 ++ ...ew-annotate.1.in => timew-annotate.1.adoc} | 72 +++--- doc/man1/timew-cancel.1.adoc | 37 +++ doc/man1/timew-cancel.1.in | 45 ---- .../{timew-chart.1.in => timew-chart.1.adoc} | 212 +++++----------- ...{timew-config.1.in => timew-config.1.adoc} | 70 +++-- doc/man1/timew-continue.1.adoc | 82 ++++++ doc/man1/timew-continue.1.in | 122 --------- doc/man1/timew-day.1 | 1 + doc/man1/timew-delete.1.adoc | 26 ++ doc/man1/timew-delete.1.in | 27 -- ...gnostics.1.in => timew-diagnostics.1.adoc} | 26 +- doc/man1/timew-export.1.adoc | 17 ++ doc/man1/timew-export.1.in | 22 -- doc/man1/timew-extensions.1.adoc | 14 + doc/man1/timew-extensions.1.in | 13 - .../{timew-fill.1.in => timew-fill.1.adoc} | 49 ++-- .../{timew-gaps.1.in => timew-gaps.1.adoc} | 47 ++-- doc/man1/timew-get.1.adoc | 22 ++ doc/man1/timew-get.1.in | 23 -- doc/man1/timew-help.1.adoc | 22 ++ doc/man1/timew-help.1.in | 39 --- .../{timew-join.1.in => timew-join.1.adoc} | 47 ++-- doc/man1/timew-lengthen.1.adoc | 34 +++ doc/man1/timew-lengthen.1.in | 37 --- doc/man1/timew-modify.1.adoc | 30 +++ doc/man1/timew-modify.1.in | 36 --- doc/man1/timew-month.1 | 1 + doc/man1/timew-move.1.adoc | 31 +++ doc/man1/timew-move.1.in | 32 --- doc/man1/timew-report.1.adoc | 17 ++ doc/man1/timew-report.1.in | 27 -- doc/man1/timew-resize.1.adoc | 34 +++ doc/man1/timew-resize.1.in | 37 --- doc/man1/timew-shorten.1.adoc | 34 +++ doc/man1/timew-shorten.1.in | 38 --- doc/man1/timew-show.1.adoc | 14 + doc/man1/timew-show.1.in | 13 - doc/man1/timew-split.1.adoc | 27 ++ doc/man1/timew-split.1.in | 29 --- .../{timew-start.1.in => timew-start.1.adoc} | 55 ++-- doc/man1/timew-stop.1.adoc | 32 +++ doc/man1/timew-stop.1.in | 39 --- doc/man1/timew-summary.1.adoc | 33 +++ doc/man1/timew-summary.1.in | 44 ---- doc/man1/{timew-tag.1.in => timew-tag.1.adoc} | 68 +++-- doc/man1/timew-tags.1.adoc | 12 + doc/man1/timew-tags.1.in | 14 - doc/man1/timew-track.1.adoc | 27 ++ doc/man1/timew-track.1.in | 32 --- .../{timew-undo.1.in => timew-undo.1.adoc} | 31 ++- .../{timew-untag.1.in => timew-untag.1.adoc} | 68 +++-- doc/man1/timew-week.1 | 1 + doc/man1/timew.1.adoc | 164 ++++++++++++ doc/man1/timew.1.in | 239 ------------------ doc/man7/CMakeLists.txt | 21 ++ ...{timew-config.7.in => timew-config.7.adoc} | 79 +++--- .../{timew-dates.7.in => timew-dates.7.adoc} | 58 +++-- doc/man7/{timew-dom.7.in => timew-dom.7.adoc} | 26 +- ...-durations.7.in => timew-durations.7.adoc} | 35 +-- .../{timew-hints.7.in => timew-hints.7.adoc} | 38 +-- ...{timew-ranges.7.in => timew-ranges.7.adoc} | 26 +- src/commands/generate-additional-help.sh | 4 +- test/docker/archlinux | 1 + test/docker/centos7 | 1 + test/docker/centos8 | 10 +- test/docker/debianstable | 1 + test/docker/debiantesting | 1 + test/docker/fedora31 | 2 + test/docker/fedora32 | 2 + test/docker/opensuse1500 | 5 +- test/docker/ubuntu1604 | 1 + test/docker/ubuntu1804 | 1 + test/docker/ubuntu2004 | 1 + test/help.t | 6 +- test/scripts/test_osx.sh | 3 +- 80 files changed, 1256 insertions(+), 1527 deletions(-) create mode 100644 cmake/FindAsciidoctor.cmake create mode 100644 doc/man1/CMakeLists.txt rename doc/man1/{timew-annotate.1.in => timew-annotate.1.adoc} (59%) create mode 100644 doc/man1/timew-cancel.1.adoc delete mode 100644 doc/man1/timew-cancel.1.in rename doc/man1/{timew-chart.1.in => timew-chart.1.adoc} (60%) rename doc/man1/{timew-config.1.in => timew-config.1.adoc} (54%) create mode 100644 doc/man1/timew-continue.1.adoc delete mode 100644 doc/man1/timew-continue.1.in create mode 100644 doc/man1/timew-day.1 create mode 100644 doc/man1/timew-delete.1.adoc delete mode 100644 doc/man1/timew-delete.1.in rename doc/man1/{timew-diagnostics.1.in => timew-diagnostics.1.adoc} (56%) create mode 100644 doc/man1/timew-export.1.adoc delete mode 100644 doc/man1/timew-export.1.in create mode 100644 doc/man1/timew-extensions.1.adoc delete mode 100644 doc/man1/timew-extensions.1.in rename doc/man1/{timew-fill.1.in => timew-fill.1.adoc} (50%) rename doc/man1/{timew-gaps.1.in => timew-gaps.1.adoc} (55%) create mode 100644 doc/man1/timew-get.1.adoc delete mode 100644 doc/man1/timew-get.1.in create mode 100644 doc/man1/timew-help.1.adoc delete mode 100644 doc/man1/timew-help.1.in rename doc/man1/{timew-join.1.in => timew-join.1.adoc} (51%) create mode 100644 doc/man1/timew-lengthen.1.adoc delete mode 100644 doc/man1/timew-lengthen.1.in create mode 100644 doc/man1/timew-modify.1.adoc delete mode 100644 doc/man1/timew-modify.1.in create mode 100644 doc/man1/timew-month.1 create mode 100644 doc/man1/timew-move.1.adoc delete mode 100644 doc/man1/timew-move.1.in create mode 100644 doc/man1/timew-report.1.adoc delete mode 100644 doc/man1/timew-report.1.in create mode 100644 doc/man1/timew-resize.1.adoc delete mode 100644 doc/man1/timew-resize.1.in create mode 100644 doc/man1/timew-shorten.1.adoc delete mode 100644 doc/man1/timew-shorten.1.in create mode 100644 doc/man1/timew-show.1.adoc delete mode 100644 doc/man1/timew-show.1.in create mode 100644 doc/man1/timew-split.1.adoc delete mode 100644 doc/man1/timew-split.1.in rename doc/man1/{timew-start.1.in => timew-start.1.adoc} (54%) create mode 100644 doc/man1/timew-stop.1.adoc delete mode 100644 doc/man1/timew-stop.1.in create mode 100644 doc/man1/timew-summary.1.adoc delete mode 100644 doc/man1/timew-summary.1.in rename doc/man1/{timew-tag.1.in => timew-tag.1.adoc} (51%) create mode 100644 doc/man1/timew-tags.1.adoc delete mode 100644 doc/man1/timew-tags.1.in create mode 100644 doc/man1/timew-track.1.adoc delete mode 100644 doc/man1/timew-track.1.in rename doc/man1/{timew-undo.1.in => timew-undo.1.adoc} (64%) rename doc/man1/{timew-untag.1.in => timew-untag.1.adoc} (51%) create mode 100644 doc/man1/timew-week.1 create mode 100644 doc/man1/timew.1.adoc delete mode 100644 doc/man1/timew.1.in create mode 100644 doc/man7/CMakeLists.txt rename doc/man7/{timew-config.7.in => timew-config.7.adoc} (63%) rename doc/man7/{timew-dates.7.in => timew-dates.7.adoc} (92%) rename doc/man7/{timew-dom.7.in => timew-dom.7.adoc} (80%) rename doc/man7/{timew-durations.7.in => timew-durations.7.adoc} (83%) rename doc/man7/{timew-hints.7.in => timew-hints.7.adoc} (88%) rename doc/man7/{timew-ranges.7.in => timew-ranges.7.adoc} (67%) diff --git a/CMakeLists.txt b/CMakeLists.txt index be3ad9d1..0d2bac5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ set (HAVE_CMAKE true) project (timew) include (CXXSniffer) +include (FindAsciidoctor) set (PROJECT_VERSION "1.4.2") @@ -31,10 +32,12 @@ set (PACKAGE_STRING "${PACKAGE} ${VERSION}") string (TIMESTAMP PACKAGE_DATE "%Y-%m-%d") if (FREEBSD OR DRAGONFLY) +SET (TIMEW_MANDIR man CACHE STRING "Installation directory for man pages") SET (TIMEW_MAN1DIR man/man1 CACHE STRING "Installation directory for man pages, section 1") SET (TIMEW_MAN5DIR man/man5 CACHE STRING "Installation directory for man pages, section 5") SET (TIMEW_MAN7DIR man/man7 CACHE STRING "Installation directory for man pages, section 7") else (FREEBSD OR DRAGONFLY) +SET (TIMEW_MANDIR share/man CACHE STRING "Installation directory for man pages") SET (TIMEW_MAN1DIR share/man/man1 CACHE STRING "Installation directory for man pages, section 1") SET (TIMEW_MAN5DIR share/man/man5 CACHE STRING "Installation directory for man pages, section 5") SET (TIMEW_MAN7DIR share/man/man7 CACHE STRING "Installation directory for man pages, section 7") diff --git a/cmake/FindAsciidoctor.cmake b/cmake/FindAsciidoctor.cmake new file mode 100644 index 00000000..893541e7 --- /dev/null +++ b/cmake/FindAsciidoctor.cmake @@ -0,0 +1,16 @@ +message (CHECK_START "Detecting Asciidoctor") + +FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE asciidoctor + PATHS "/usr/bin" "/usr/sbin") + +MARK_AS_ADVANCED(ASCIIDOCTOR_EXECUTABLE) + +if (ASCIIDOCTOR_EXECUTABLE) + message(CHECK_PASS "found") + message(DEBUG "Found executable ${ASCIIDOCTOR_EXECUTABLE}") + set(ASCIIDOCTOR_FOUND "YES") +else (ASCIIDOCTOR_EXECUTABLE) + message(CHECK_FAIL "not found") + message(NOTICE " Could not find Asciidoctor!") + set(ASCIIDOCTOR_FOUND "NO") +endif (ASCIIDOCTOR_EXECUTABLE) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 39af667c..f19fde1d 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -5,47 +5,16 @@ message ("-- Configuring documentation") add_subdirectory (holidays) add_subdirectory (themes) -configure_file (man1/timew.1.in man1/timew.1) -configure_file (man1/timew-annotate.1.in man1/timew-annotate.1) -configure_file (man1/timew-cancel.1.in man1/timew-cancel.1) -configure_file (man1/timew-chart.1.in man1/timew-chart.1) -configure_file (man1/timew-config.1.in man1/timew-config.1) -configure_file (man1/timew-continue.1.in man1/timew-continue.1) -configure_file (man1/timew-day.1.in man1/timew-day.1) -configure_file (man1/timew-delete.1.in man1/timew-delete.1) -configure_file (man1/timew-diagnostics.1.in man1/timew-diagnostics.1) -configure_file (man1/timew-export.1.in man1/timew-export.1) -configure_file (man1/timew-extensions.1.in man1/timew-extensions.1) -configure_file (man1/timew-fill.1.in man1/timew-fill.1) -configure_file (man1/timew-gaps.1.in man1/timew-gaps.1) -configure_file (man1/timew-get.1.in man1/timew-get.1) -configure_file (man1/timew-help.1.in man1/timew-help.1) -configure_file (man1/timew-join.1.in man1/timew-join.1) -configure_file (man1/timew-lengthen.1.in man1/timew-lengthen.1) -configure_file (man1/timew-modify.1.in man1/timew-modify.1) -configure_file (man1/timew-month.1.in man1/timew-month.1) -configure_file (man1/timew-move.1.in man1/timew-move.1) -configure_file (man1/timew-report.1.in man1/timew-report.1) -configure_file (man1/timew-resize.1.in man1/timew-resize.1) -configure_file (man1/timew-shorten.1.in man1/timew-shorten.1) -configure_file (man1/timew-show.1.in man1/timew-show.1) -configure_file (man1/timew-split.1.in man1/timew-split.1) -configure_file (man1/timew-start.1.in man1/timew-start.1) -configure_file (man1/timew-stop.1.in man1/timew-stop.1) -configure_file (man1/timew-summary.1.in man1/timew-summary.1) -configure_file (man1/timew-tag.1.in man1/timew-tag.1) -configure_file (man1/timew-tags.1.in man1/timew-tags.1) -configure_file (man1/timew-track.1.in man1/timew-track.1) -configure_file (man1/timew-undo.1.in man1/timew-undo.1) -configure_file (man1/timew-untag.1.in man1/timew-untag.1) -configure_file (man1/timew-week.1.in man1/timew-week.1) +if (ASCIIDOCTOR_FOUND) + set (ASCIIDOCTOR_OPTIONS "--attribute=manmanual=User Manuals" + "--attribute=mansource=timew ${PROJECT_VERSION}" + "--attribute=man-linkstyle='pass:[blue R < >]'") -configure_file (man7/timew-config.7.in man7/timew-config.7) -configure_file (man7/timew-dates.7.in man7/timew-dates.7) -configure_file (man7/timew-dom.7.in man7/timew-dom.7) -configure_file (man7/timew-durations.7.in man7/timew-durations.7) -configure_file (man7/timew-hints.7.in man7/timew-hints.7) -configure_file (man7/timew-ranges.7.in man7/timew-ranges.7) + add_subdirectory (man1) + add_subdirectory (man7) -install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man1/ DESTINATION ${TIMEW_MAN1DIR} FILES_MATCHING PATTERN "*.1") -install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man7/ DESTINATION ${TIMEW_MAN7DIR} FILES_MATCHING PATTERN "*.7") + add_custom_target (doc ALL DEPENDS man1 man7) +else (ASCIIDOCTOR_FOUND) + add_custom_target (doc ALL + COMMAND echo "Tool 'asciidoctor' is required to generate man pages! Please install it first.") +endif (ASCIIDOCTOR_FOUND) diff --git a/doc/man1/.gitignore b/doc/man1/.gitignore index 181f3143..90a6b24c 100644 --- a/doc/man1/.gitignore +++ b/doc/man1/.gitignore @@ -1 +1,4 @@ *.[0-9] +!timew-day.1 +!timew-month.1 +!timew-week.1 diff --git a/doc/man1/CMakeLists.txt b/doc/man1/CMakeLists.txt new file mode 100644 index 00000000..7c54fd9f --- /dev/null +++ b/doc/man1/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required (VERSION 2.8.12) + +file (GLOB DOC_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/*.1.adoc") +set (DOC_FILES) + +foreach (SRC ${DOC_SOURCES}) + string (REPLACE ".adoc" "" OUTPUT_FILE_NAME "${SRC}") + + add_custom_command ( + OUTPUT "${OUTPUT_FILE_NAME}" + COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage ${ASCIIDOCTOR_OPTIONS} ${SRC} -o ${OUTPUT_FILE_NAME} + DEPENDS "${SRC}") + + set (DOC_FILES ${DOC_FILES} "${OUTPUT_FILE_NAME}") +endforeach (SRC) + +add_custom_target (man1 DEPENDS ${DOC_FILES}) + +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DESTINATION ${TIMEW_MANDIR} + FILES_MATCHING PATTERN "*.1") diff --git a/doc/man1/timew-annotate.1.in b/doc/man1/timew-annotate.1.adoc similarity index 59% rename from doc/man1/timew-annotate.1.in rename to doc/man1/timew-annotate.1.adoc index 540d5faf..c725f8b7 100644 --- a/doc/man1/timew-annotate.1.in +++ b/doc/man1/timew-annotate.1.adoc @@ -1,50 +1,44 @@ -.TH timew-annotate 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-annotate \- add an annotation to intervals -. -.SH SYNOPSIS -.B timew annotate -[ -.I -.B ... -] -.I -.B ... -. -.SH DESCRIPTION += timew-annotate(1) + +== NAME +timew-annotate - add an annotation to intervals + +== SYNOPSIS +[verse] +*timew annotate* [__**...**] __**...** + +== DESCRIPTION The 'annotate' command is used to add an annotation to an interval. Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. Using the right ID, you can identify an interval to annotate. -. -.SH EXAMPLES + +== EXAMPLES For example, show the IDs: -.RS -$ timew summary :week :ids -.RE + + $ timew summary :week :ids + Then having selected '@2' as the interval you wish to annotate: -.RS -$ timew annotate @2 'Lorem ipsum...' -.RE + + $ timew annotate @2 'Lorem ipsum...' + Note that you can annotate multiple intervals with the same annotation: -.RS -$ timew annotate @2 @10 @23 'Lorem ipsum dolor sit amet...' -.RE + + $ timew annotate @2 @10 @23 'Lorem ipsum dolor sit amet...' + If there is active time tracking, you can omit the ID when you want to add annotations to the current open interval: -.RS -$ timew start foo -.br -$ timew annotate bar -.RE + + $ timew start foo + $ timew annotate bar + This results in the current interval having annotations 'foo' and 'bar'. -. -.SH BUGS + +== BUGS Currently the annotation command picks the last token from the command line and uses it as annotation. I.e. using no quotes in an annotation command like -.RS -$ timew annotate @1 lorem ipsum dolor -.RE + + $ timew annotate @1 lorem ipsum dolor + will result in interval @1 having only 'dolor' as its annotation. -. -.SH "SEE ALSO" -.BR timew-tag (1) \ No newline at end of file + +== SEE ALSO +**timew-tag**(1) diff --git a/doc/man1/timew-cancel.1.adoc b/doc/man1/timew-cancel.1.adoc new file mode 100644 index 00000000..5af5f813 --- /dev/null +++ b/doc/man1/timew-cancel.1.adoc @@ -0,0 +1,37 @@ += timew-cancel(1) + +== NAME +timew-cancel - cancel time tracking + +== SYNOPSIS +[verse] +*timew cancel* + +== DESCRIPTION +If there is an open interval, it is abandoned. + +== EXAMPLES + +*Cancel with active time tracking*:: ++ + $ timew start + ... + $ timew cancel + Canceled active time tracking. + +This deletes the open interval. + +*Cancel with no active time tracking*:: ++ + ... + $ timew stop + $ timew cancel + There is no active time tracking. + +Cancel has no effect, only a warning is printed. + +== SEE ALSO +**timew-continue**(1), +**timew-start**(1), +**timew-stop**(1), +**timew-track**(1) diff --git a/doc/man1/timew-cancel.1.in b/doc/man1/timew-cancel.1.in deleted file mode 100644 index a5204674..00000000 --- a/doc/man1/timew-cancel.1.in +++ /dev/null @@ -1,45 +0,0 @@ -.TH timew-cancel 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-cancel \- cancel time tracking -. -.SH SYNOPSIS -.B timew cancel -. -.SH DESCRIPTION -If there is an open interval, it is abandoned. -. -.SH EXAMPLES -.TP -.B Cancel with active time tracking -.RS -.br -$ timew start -.br -... -.br -$ timew cancel -.br -Canceled active time tracking. -.RE -. -This deletes the open interval. -.TP -.B Cancel with no active time tracking -.RS -.br -... -.br -$ timew stop -.br -$ timew cancel -.br -There is no active time tracking. -.RE -Cancel has no effect, only a warning is printed. -. -.SH "SEE ALSO" -.BR timew-continue (1), -.BR timew-start (1), -.BR timew-stop (1), -.BR timew-track (1) \ No newline at end of file diff --git a/doc/man1/timew-chart.1.in b/doc/man1/timew-chart.1.adoc similarity index 60% rename from doc/man1/timew-chart.1.in rename to doc/man1/timew-chart.1.adoc index 48675716..fc623bec 100644 --- a/doc/man1/timew-chart.1.in +++ b/doc/man1/timew-chart.1.adoc @@ -1,183 +1,111 @@ -.TH timew-chart 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-chart \- display chart report -. -.SH SYNOPSIS -.B timew day -[ -.I -] [ -.I -.B ... -] -.br -.B timew month -[ -.I -] [ -.I -.B ... -] -.br -.B timew week -[ -.I -] [ -.I -.B ... -] -. -.SH DESCRIPTION += timew-chart(1) + +== NAME +timew-chart - display chart report + +== SYNOPSIS +[verse] +*timew day* [__] [__**...**] +*timew month* [__] [__**...**] +*timew week* [__] [__**...**] + +== DESCRIPTION A chart summarizes the tracked and untracked time with colored blocks drawn on a timeline. It accepts date ranges and tags for filtering. -There are three types: -.BR day ", " week ", and " month -with their respective commands. -The -.BI reports. .range -configuration setting overrides the default date range. +There are three types: *day*, *week*, and *month* with their respective commands. +The **reports.**____**.range** configuration setting overrides the default date range. For more details, and precise times, use the 'summary' report. -.TP -.B month +*month*:: The month command shows a chart depicting a single month (current month by default). -The default date range shown is -.BR :month . -. -.TP -.B week +The default date range shown is *:month*. + +*week*:: The week command shows a chart depicting a single week (current week by default). -The default date range shown is -.BR :week . -. -.TP -.B day +The default date range shown is *:week*. + +*day*:: The day command shows a chart depicting a single day (today by default). -The default date range shown is -.BR :day . -. -.SH CONFIGURATION -.IR " is one of" -.BR month ", " week ", " day "." -.TP -.BI reports. .cell -.RS +The default date range shown is *:day*. + +== CONFIGURATION +__ is one of **month**, **week**, **day**. + +**reports.**____**.cell**:: Determines how many minutes are represented by a single character cell, for the charts. The value must be greater than '0'. A value of '15' means that an hour is represented by 60/15, or 4 character cells. Suitable values are the divisors of 60 (30, 20, 15, 12, ...). -.br Default value is '15'. -.RE -.TP -.BI reports. .day -.RS + +**reports.**____**.day**:: Determines whether the current day of the month is shown at left margin. -.br Default value is 'yes'. -.RE -.TP -.BI reports. .holidays -.RS + +**reports.**____**.holidays**:: Determines whether relevant holidays are shown beneath the report. -.br Default value is 'yes'. -.RE -.TP -.BI reports. .hours -.RS + +**reports.**____**.hours**:: Determines how the report shows all the hours in a day ('all'), or is limited to only hours where data is tracked ('auto'). -.br Default value is 'all'. -.RE -.TP -.BI reports. .lines -.RS + +**reports.**____**.lines**:: Determines how many lines are used to render each day on the report. -.br Default value is '1'. -.RE -.TP -.BI reports. .month -.RS + +**reports.**____**.month**:: Determines whether the current month is shown at left margin. -.br Default value is 'yes'. -.RE -.TP -.BI reports. .range -.RS + +**reports.**____**.range**:: For reports that show a range of data, this setting will override the default value. The value should be a range hint, see -.BR timew-hints (7). -.RE -.TP -.BI reports. .spacing -.RS +**timew-hints**(7). + +**reports.**____**.spacing**:: Specifies how many spaces are inserted between the hours in the report exclusions. A value of '0' yields a more compact report. -.br Default value is '1'. -.RE -.TP -.BI reports. .axis -.RS + +**reports.**____**.axis**:: The value 'internal' puts the hour markers (time line at the top) inside the exclusion blocks, 'external' puts the hour markers in a separate line; additional values might be defined in the future. -.br Default is 'internal' for the day report and 'external' for other reports. -.br -.RE -.TP -.BI reports. .summary -.RS + +**reports.**____**.summary**:: Determines whether the hours summary is shown. -.br Default value is 'on'. -.RE -.TP -.BI reports. .totals -.RS + +**reports.**____**.totals**:: Determines whether the time totals are shown for each day on the report. -.br Default value is 'on'. -.RE -.TP -.BI reports. .week -.RS + +**reports.**____**.week**:: Determines whether the current week number is shown at left margin. -.br Default value is 'yes'. -.RE -.TP -.BI reports. .weekday -.RS + +**reports.**____**.weekday**:: Determines whether the current weekday is shown at left margin. -.br Default value is 'yes'. -.RE -. -.SH HINTS -.TP -.B :blank + +== HINTS + +*:blank*:: The ':blank' hint causes only the excluded time to be shown, with no tracked time. This can be used to see the exclusions. -.TP -.B :ids + +*:ids*:: The ':ids' hint causes the intervals to be displayed with their ids -. -.SH EXAMPLES + +== EXAMPLES Charts accept date ranges and tags for filtering, or shortcut hints: -.RS -$ timew month 1st - today -.br -$ timew week FOO BAR -.br -$ timew day :week -.RE -. -.SH "SEE ALSO" -.BR timew-day (1), -.BR timew-month (1), -.BR timew-summary (1), -.BR timew-week (1) \ No newline at end of file + + $ timew month 1st - today + $ timew week FOO BAR + $ timew day :week + +== SEE ALSO +**timew-day**(1), +**timew-month**(1), +**timew-summary**(1), +**timew-week**(1) diff --git a/doc/man1/timew-config.1.in b/doc/man1/timew-config.1.adoc similarity index 54% rename from doc/man1/timew-config.1.in rename to doc/man1/timew-config.1.adoc index d95256f2..ef6556d7 100644 --- a/doc/man1/timew-config.1.in +++ b/doc/man1/timew-config.1.adoc @@ -1,49 +1,37 @@ -.TH timew-config 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-config \- get and set Timewarrior configuration -. -.SH SYNOPSIS -.B timew config -[ -.I -{ -.I -| -.B '' -} -] -. -.SH DESCRIPTION += timew-config(1) + +== NAME +timew-config - get and set Timewarrior configuration + +== SYNOPSIS +[verse] +*timew config* [__ {__|*''*}] + +== DESCRIPTION Allows setting and removing configuration values, as an alternative to directly editing your ~/.timewarrior/timewarrior.cfg file. -. -.SH EXAMPLES + +== EXAMPLES For example: -.RS -$ timew config verbose yes -.br -$ timew config verbose '' -.br -$ timew config verbose -.RE + + $ timew config verbose yes + $ timew config verbose '' + $ timew config verbose + The first command sets 'verbose' to 'yes'. The second sets it to a blank value which overrides the default value. The third example deletes the 'verbose' setting. -. + When modifying configuration in this way, interactive confirmation will be sought. To override this confirmation, use the ':yes' hint, which means you intend to answer 'yes' to the confirmation questions: -.RS -$ timew config verbose '' :yes -.RE + + $ timew config verbose '' :yes + If no arguments are provided, all configuration settings are shown: -.RS -$ timew config -.br -verbose = yes -.br -... -.RE -. -.SH "SEE ALSO" -.BR timew-hints (1), -.BR timew-show (1) \ No newline at end of file + + $ timew config + verbose = yes + ... + +== SEE ALSO +**timew-hints**(1), +**timew-show**(1) \ No newline at end of file diff --git a/doc/man1/timew-continue.1.adoc b/doc/man1/timew-continue.1.adoc new file mode 100644 index 00000000..79fe7538 --- /dev/null +++ b/doc/man1/timew-continue.1.adoc @@ -0,0 +1,82 @@ += timew-continue(1) + +== NAME +timew-continue - resume tracking of existing interval + +== SYNOPSIS +[verse] +*timew continue* [__|__**...**] [__|__] + +== DESCRIPTION +The 'continue' command is used to resume tracking specified by a closed interval. +This command is a convenient way to resume work without re-entering the tags. + +The interval to be resumed can be specified either by its id or by a set of tags. +Specifying multiple ids or both ids and tags will result in an error. + +When given a set of tags, the first interval matching it will be taken as a blueprint for the new interval. +When given neither id nor tags, the first interval in the database is taken. + +When no datetime or range given, the new interval is started at the current time. + +== EXAMPLES +Using the 'summary' command and specifying the ':ids' hint shows interval IDs. +Consider the following intervals: + + $ src/timew summary :ids + + Wk Date Day ID Tags Start End Time Total + W23 2020-06-04 Thu @4 BAR 13:00:00 14:00:00 1:00:00 + @3 BAR, FOO 14:00:00 15:00:00 1:00:00 + @2 BAR, BAZ, FOO 15:00:00 16:00:00 1:00:00 + @1 FOO 16:00:00 17:00:00 1:00:00 4:00:00 + + 4:00:00 + +Simple continue:: ++ + $ timew continue + +The 'continue' command creates a new open interval, starting now, with tag 'FOO' + +Continue an interval via id:: ++ + $ timew continue @3 + +The 'continue' command creates a new open interval, starting now, with tags 'BAR' and 'FOO'. + +Continue an interval via tag set:: ++ + $ timew continue FOO BAR + +The 'continue' command creates a new open interval, starting now, with tags 'FOO', 'BAR', and 'BAZ'. + +Note that the first matching interval (here '@2') is taken as a blueprint for the new interval, although '@3' would have been a perfect match for the given tag set. +The command 'timew continue BAR' would have the same effect. +This means that there is no way to continue '@4' via a tag set. + +Continue an interval at a specific date & time:: ++ + $ timew continue @4 19:00 (1) + $ timew continue FOO 19:00 (2) + +The 'continue' command creates a new open interval + +1. with tag 'BAR' (as specified by '@4') and start time '19:00'. +2. with tag 'FOO' (as specified by '@1') and start time '19:00'. + +Continue an interval with a specific range:: ++ + $ timew continue @4 19:00 - 20:00 (1) + $ timew continue FOO 19:00 - 20:00 (2) + +The 'continue' command creates a new closed interval + +1. with tag 'BAR' (as specified by '@4'), start time '19:00', and end time '20:00'. +2. with tag 'FOO' (as specified by '@1') and start time '19:00', and end time '20:00'. + +== SEE ALSO +**timew-cancel**(1), +**timew-start**(1), +**timew-stop**(1), +**timew-track**(1) diff --git a/doc/man1/timew-continue.1.in b/doc/man1/timew-continue.1.in deleted file mode 100644 index 1884092a..00000000 --- a/doc/man1/timew-continue.1.in +++ /dev/null @@ -1,122 +0,0 @@ -.TH timew-continue 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-continue \- resume tracking of existing interval -. -.SH SYNOPSIS -.B timew continue -[ -.I -| -.I -.B ... -] [ -.I -| -.I -] -. -.SH DESCRIPTION -The 'continue' command is used to resume tracking specified by a closed interval. -This command is a convenient way to resume work without re-entering the tags. -.PP -The interval to be resumed can be specified either by its id or by a set of tags. -Specifying multiple ids or both ids and tags will result in an error. -.PP -When given a set of tags, the first interval matching it will be taken as a blueprint for the new interval. -When given neither id nor tags, the first interval in the database is taken. -.PP -When no datetime or range given, the new interval is started at the current time. -. -.SH EXAMPLES -Using the 'summary' command and specifying the ':ids' hint shows interval IDs. -Consider the following intervals: -.RS -.sp -$ src/timew summary :ids - -Wk Date Day ID Tags Start End Time Total -.br -W23 2020-06-04 Thu @4 BAR 13:00:00 14:00:00 1:00:00 -.br - @3 BAR, FOO 14:00:00 15:00:00 1:00:00 -.br - @2 BAR, BAZ, FOO 15:00:00 16:00:00 1:00:00 -.br - @1 FOO 16:00:00 17:00:00 1:00:00 4:00:00 -.br - -.br - 4:00:00 -.br -.RE -.sp -.TP -Simple continue -.RS -.sp -$ timew continue -.RE -.sp -The 'continue' command creates a new open interval, starting now, with tag 'FOO' -.TP -Continue an interval via id: -.RS -.sp -$ timew continue @3 -.RE -.sp -The 'continue' command creates a new open interval, starting now, with tags 'BAR' and 'FOO'. -.TP -Continue an interval via tag set: -.RS -.sp -$ timew continue FOO BAR -.RE -.sp -The 'continue' command creates a new open interval, starting now, with tags 'FOO', 'BAR', and 'BAZ'. -.PP -Note that the first matching interval (here '@2') is taken as a blueprint for the new interval, although '@3' would have been a perfect match for the given tag set. -The command 'timew continue BAR' would have the same effect. -This means that there is no way to continue '@4' via a tag set. -.TP -Continue an interval at a specific date & time: -.RS -.sp -$ timew continue @4 19:00 -.B " (1)" -.br -$ timew continue FOO 19:00 -.B (2) -.RE -.sp -The 'continue' command creates a new open interval -.br -.IP 1. -with tag 'BAR' (as specified by '@4') and start time '19:00'. -.br -.IP 2. -with tag 'FOO' (as specified by '@1') and start time '19:00'. -.TP -Continue an interval with a specific range: -.RS -.sp -$ timew continue @4 19:00 - 20:00 -.B " (1)" -.br -$ timew continue FOO 19:00 - 20:00 -.B (2) -.RE -.sp -The 'continue' command creates a new closed interval -.IP 1. -with tag 'BAR' (as specified by '@4'), start time '19:00', and end time '20:00'. -.br -.IP 2. -with tag 'FOO' (as specified by '@1') and start time '19:00', and end time '20:00'. -. -.SH "SEE ALSO" -.BR timew-cancel (1), -.BR timew-start (1), -.BR timew-stop (1), -.BR timew-track (1) \ No newline at end of file diff --git a/doc/man1/timew-day.1 b/doc/man1/timew-day.1 new file mode 100644 index 00000000..1782cd78 --- /dev/null +++ b/doc/man1/timew-day.1 @@ -0,0 +1 @@ +.so man1/timew-chart.1 diff --git a/doc/man1/timew-delete.1.adoc b/doc/man1/timew-delete.1.adoc new file mode 100644 index 00000000..072f98b5 --- /dev/null +++ b/doc/man1/timew-delete.1.adoc @@ -0,0 +1,26 @@ += timew-delete(1) + +== NAME +timew-delete - delete intervals + +== SYNOPSIS +[verse] +*timew delete* __**...** + +== DESCRIPTION +Deletes an interval. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to delete. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@2' as the interval you wish to delete: + + $ timew delete @2 + + +== SEE ALSO +*timew-cancel*(1) diff --git a/doc/man1/timew-delete.1.in b/doc/man1/timew-delete.1.in deleted file mode 100644 index 03746b4f..00000000 --- a/doc/man1/timew-delete.1.in +++ /dev/null @@ -1,27 +0,0 @@ -.TH timew-delete 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-delete \- delete intervals -. -.SH SYNOPSIS -.B timew delete -.I -.B ... -. -.SH DESCRIPTION -Deletes an interval. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to delete. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -Then having selected '@2' as the interval you wish to delete: -.RS -$ timew delete @2 -.RE -. -.SH "SEE ALSO" -.BR timew-cancel \ No newline at end of file diff --git a/doc/man1/timew-diagnostics.1.in b/doc/man1/timew-diagnostics.1.adoc similarity index 56% rename from doc/man1/timew-diagnostics.1.in rename to doc/man1/timew-diagnostics.1.adoc index cb93b215..e51f6ea1 100644 --- a/doc/man1/timew-diagnostics.1.in +++ b/doc/man1/timew-diagnostics.1.adoc @@ -1,14 +1,16 @@ -.TH timew-diagnostics 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-diagnostics \- show diagnostic information -. -.SH SYNOPSIS -.B timew diagnostics -. -.SH DESCRIPTION += timew-diagnostics(1) + +== NAME +timew-diagnostics - show diagnostic information + +== SYNOPSIS +[verse] +*timew diagnostics* + +== DESCRIPTION This command shows details about your version of Timewarrior, your platform, how it was built, compiler features, configuration, file access, extensions and more. + The purpose of this command is to help diagnose configuration problems and provide supplemental information when reporting a problem. -. -.SH "SEE ALSO" -.BR timew-extensions (1) \ No newline at end of file + +== SEE ALSO +**timew-extensions**(1) diff --git a/doc/man1/timew-export.1.adoc b/doc/man1/timew-export.1.adoc new file mode 100644 index 00000000..fe38ec3a --- /dev/null +++ b/doc/man1/timew-export.1.adoc @@ -0,0 +1,17 @@ += timew-export(1) + +== NAME +timew-export - export tracked time in JSON + +== SYNOPSIS +[verse] +*timew export* [__] [__**...**] + +== DESCRIPTION +Exports all the tracked time in JSON format. +Supports filtering. + +== EXAMPLES +For example: + + $ timew export from 2016-01-01 for 3wks tag1 diff --git a/doc/man1/timew-export.1.in b/doc/man1/timew-export.1.in deleted file mode 100644 index afd3fc52..00000000 --- a/doc/man1/timew-export.1.in +++ /dev/null @@ -1,22 +0,0 @@ -.TH timew-export 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-export \- export tracked time in JSON -. -.SH SYNOPSIS -.B timew export -[ -.I -] [ -.I ... -] -. -.SH DESCRIPTION -Exports all the tracked time in JSON format. -Supports filtering. -. -.SH EXAMPLES -For example: -.RS -$ timew export from 2016-01-01 for 3wks tag1 -.RE \ No newline at end of file diff --git a/doc/man1/timew-extensions.1.adoc b/doc/man1/timew-extensions.1.adoc new file mode 100644 index 00000000..e8063a27 --- /dev/null +++ b/doc/man1/timew-extensions.1.adoc @@ -0,0 +1,14 @@ += timew-extensions(1) + +== NAME +timew-extensions - list available extensions + +== SYNOPSIS +[verse] +*timew extensions* + +== DESCRIPTION +Displays the directory containing the extension programs and a table showing each extension and its status. + +== SEE ALSO +**timew-diagnostics**(1) \ No newline at end of file diff --git a/doc/man1/timew-extensions.1.in b/doc/man1/timew-extensions.1.in deleted file mode 100644 index 5738368d..00000000 --- a/doc/man1/timew-extensions.1.in +++ /dev/null @@ -1,13 +0,0 @@ -.TH timew-extensions 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-extensions \- list available extensions -. -.SH SYNOPSIS -.B timew extensions -. -.SH DESCRIPTION -Displays the directory containing the extension programs and a table showing each extension and its status. -. -.SH "SEE ALSO" -.BR timew-diagnostics (1) \ No newline at end of file diff --git a/doc/man1/timew-fill.1.in b/doc/man1/timew-fill.1.adoc similarity index 50% rename from doc/man1/timew-fill.1.in rename to doc/man1/timew-fill.1.adoc index 02ceea55..3fe89fbd 100644 --- a/doc/man1/timew-fill.1.in +++ b/doc/man1/timew-fill.1.adoc @@ -1,31 +1,30 @@ -.TH timew-fill 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-fill \- adjust intervals to fill in surrounding gaps -. -.SH SYNOPSIS -.B timew fill -.I -.B ... -. -.SH DESCRIPTION += timew-fill(1) + +== NAME +timew-fill - adjust intervals to fill in surrounding gaps + +== SYNOPSIS +[verse] +*timew fill* __**...** + +== DESCRIPTION The 'fill' command is used to adjust any interval to fill in surrounding gaps. Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. Using the right ID, you can identify an interval to fill. -. -.SH EXAMPLES + +== EXAMPLES For example, show the IDs: -.RS -$ timew summary :week :ids -.RE + + $ timew summary :week :ids + Then having selected '@2' as the interval you wish to fill: -.RS -$ timew fill @2 -.RE + + $ timew fill @2 + Note that you can fill multiple intervals: -.RS -$ timew fill @2 @10 @23 -.RE -. -.SH "SEE ALSO" -.BR timew-hints (1) \ No newline at end of file + + $ timew fill @2 @10 @23 + + +== SEE ALSO +**timew-hints**(1) diff --git a/doc/man1/timew-gaps.1.in b/doc/man1/timew-gaps.1.adoc similarity index 55% rename from doc/man1/timew-gaps.1.in rename to doc/man1/timew-gaps.1.adoc index 18d3f0ef..2ace1975 100644 --- a/doc/man1/timew-gaps.1.in +++ b/doc/man1/timew-gaps.1.adoc @@ -1,34 +1,25 @@ -.TH timew-gaps 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-gaps \- display time tracking gaps -. -.SH SYNOPSIS -.B timew gaps -[ -.I -] [ -.I -.B ... -] -. -.SH DESCRIPTION += timew-gaps(1) + +== NAME +timew-gaps - display time tracking gaps + +== SYNOPSIS +[verse] +*timew gaps* [__] [__**...**] + +== DESCRIPTION Displays a summary of time that is neither tracked nor excluded from tracking. -. + The 'reports.gaps.range' configuration setting overrides the default date range. The ':blank' hint causes only the excluded time to be shown, with no tracked time. The default date range shown is ':day'. -. + The ':blank' hint causes only the excluded time to be shown, with no tracked time. -. -.SH CONFIGURATION -.TP -.B reports.gaps.range -.RS + +== CONFIGURATION +**reports.gaps.range**:: For reports that show a range of data, this setting will override the default value. -The value should be a range hint, see -.BR timew-hints (7). -.RE -. -.SH "SEE ALSO" -.BR timew-summary (1) \ No newline at end of file +The value should be a range hint, see **timew-hints**(7). + +== SEE ALSO +**timew-summary**(1) diff --git a/doc/man1/timew-get.1.adoc b/doc/man1/timew-get.1.adoc new file mode 100644 index 00000000..e958cb4e --- /dev/null +++ b/doc/man1/timew-get.1.adoc @@ -0,0 +1,22 @@ += timew-get(1) + +== NAME +timew-get - display DOM values + +== SYNOPSIS +[verse] +*timew get* __**...** + +== DESCRIPTION +Validates the DOM reference, then obtains the value and displays it. + +== EXAMPLES +For example: + + $ timew get dom.active + 1 + +It is an error to reference an interval or tag that does not exist. + +== SEE ALSO +*timew-DOM* \ No newline at end of file diff --git a/doc/man1/timew-get.1.in b/doc/man1/timew-get.1.in deleted file mode 100644 index 1eb56209..00000000 --- a/doc/man1/timew-get.1.in +++ /dev/null @@ -1,23 +0,0 @@ -.TH timew-get 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-get \- display DOM values -. -.SH SYNOPSIS -.B timew get -.I -.B ... -. -.SH DESCRIPTION -Validates the DOM reference, then obtains the value and displays it. -. -.SH EXAMPLES -For example: -.RS -$ timew get dom.active -1 -.RE -It is an error to reference an interval or tag that does not exist. -. -.SH "SEE ALSO" -.BR timew-DOM \ No newline at end of file diff --git a/doc/man1/timew-help.1.adoc b/doc/man1/timew-help.1.adoc new file mode 100644 index 00000000..980296fb --- /dev/null +++ b/doc/man1/timew-help.1.adoc @@ -0,0 +1,22 @@ += timew-help(1) + +== NAME +timew-help - display help + +== SYNOPSIS +[verse] +*timew help* {__|*interval*|*hints*|*date*|*duration*} + +== DESCRIPTION +The help command shows detailed descriptions and examples of commands, interval syntax, supported hints, date and duration formats and DOM references. + +== EXAMPLES +For example: + + $ timew help + $ timew help start + $ timew help hints + $ timew help interval + $ timew help date + $ timew help duration + $ timew help dom diff --git a/doc/man1/timew-help.1.in b/doc/man1/timew-help.1.in deleted file mode 100644 index 0f16858c..00000000 --- a/doc/man1/timew-help.1.in +++ /dev/null @@ -1,39 +0,0 @@ -.TH timew-help 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-help \- display help -. -.SH SYNOPSIS -.B timew help -{ -.I -| -.B interval -| -.B hints -| -.B date -| -.B duration -} -. -.SH DESCRIPTION -The help command shows detailed descriptions and examples of commands, interval syntax, supported hints, date and duration formats and DOM references. -. -.SH EXAMPLES -For example: -.RS -$ timew help -.br -$ timew help start -.br -$ timew help hints -.br -$ timew help interval -.br -$ timew help date -.br -$ timew help duration -.br -$ timew help dom -.RE \ No newline at end of file diff --git a/doc/man1/timew-join.1.in b/doc/man1/timew-join.1.adoc similarity index 51% rename from doc/man1/timew-join.1.in rename to doc/man1/timew-join.1.adoc index 3a056085..b06e5cdf 100644 --- a/doc/man1/timew-join.1.in +++ b/doc/man1/timew-join.1.adoc @@ -1,29 +1,28 @@ -.TH timew-join 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-join \- join intervals -. -.SH SYNOPSIS -.B timew join -.I -. -.SH DESCRIPTION += timew-join(1) + +== NAME +timew-join - join intervals + +== SYNOPSIS +[verse] +*timew join* _ _ + +== DESCRIPTION Joins two intervals, by using the earlier of the two start times, and the later of the two end times, and the combined set of tags. Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. Using the correct IDs, you can identify an intervals to join. -. -.SH EXAMPLES + +== EXAMPLES For example, show the IDs: -.RS -$ timew summary :week :ids -.RE + + $ timew summary :week :ids + Then having selected '@1' and '@2' as the intervals you wish to join: -.RS -$ timew join @1 @2 -.RE -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-resize (1), -.BR timew-shorten (1), -.BR timew-split (1) \ No newline at end of file + + $ timew join @1 @2 + +== SEE ALSO +**timew-lengthen**(1), +**timew-resize**(1), +**timew-shorten**(1), +**timew-split**(1) diff --git a/doc/man1/timew-lengthen.1.adoc b/doc/man1/timew-lengthen.1.adoc new file mode 100644 index 00000000..39db2afb --- /dev/null +++ b/doc/man1/timew-lengthen.1.adoc @@ -0,0 +1,34 @@ += timew-lengthen(1) + +== NAME +timew-lengthen - lengthen intervals + +== SYNOPSIS +[verse] +*timew lengthen* __**...** __ + +== DESCRIPTION +The 'lengthen' command is used to defer the end date of a closed interval. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to lengthen. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@2' as the interval you wish to lengthen: + + $ timew lengthen @2 10mins + +Note that you can lengthen multiple intervals,: + + $ timew lengthen @2 @10 @23 1hour + +== SEE ALSO +**timew-modify**(1), +**timew-resize**(1), +**timew-shorten**(1), +**timew-summary**(1), +**timew-tag**(1), +**timew-untag**(1) diff --git a/doc/man1/timew-lengthen.1.in b/doc/man1/timew-lengthen.1.in deleted file mode 100644 index 8e8d339c..00000000 --- a/doc/man1/timew-lengthen.1.in +++ /dev/null @@ -1,37 +0,0 @@ -.TH timew-lengthen 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-lengthen \- lengthen intervals -. -.SH SYNOPSIS -.B timew lengthen -.I -.B ... -.I -. -.SH DESCRIPTION -The 'lengthen' command is used to defer the end date of a closed interval. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to lengthen. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -Then having selected '@2' as the interval you wish to lengthen: -.RS -$ timew lengthen @2 10mins -.RE -Note that you can lengthen multiple intervals,: -.RS -$ timew lengthen @2 @10 @23 1hour -.RE -. -.SH "SEE ALSO" -.BR timew-modify (1), -.BR timew-resize (1), -.BR timew-shorten (1), -.BR timew-summary (1), -.BR timew-tag (1), -.BR timew-untag (1) \ No newline at end of file diff --git a/doc/man1/timew-modify.1.adoc b/doc/man1/timew-modify.1.adoc new file mode 100644 index 00000000..29093c74 --- /dev/null +++ b/doc/man1/timew-modify.1.adoc @@ -0,0 +1,30 @@ += timew-modify(1) + +== NAME +timew-modify - change start or end date of an interval + +== SYNOPSIS +[verse] +*timew modify* (*start*|*end*) __ __ + +== DESCRIPTION +The 'modify' command is used to change the start or end date of an interval. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to modify. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@3' as the interval you wish to modify: + + $ timew modify end @3 2020-12-28T17:00:00 + + +== SEE ALSO +**timew-lengthen**(1), +**timew-move**(1), +**timew-resize**(1) +**timew-shorten**(1), +**timew-summary**(1) \ No newline at end of file diff --git a/doc/man1/timew-modify.1.in b/doc/man1/timew-modify.1.in deleted file mode 100644 index 37db9cd2..00000000 --- a/doc/man1/timew-modify.1.in +++ /dev/null @@ -1,36 +0,0 @@ -.TH timew-modify 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-modify \- change start or end date of an interval -. -.SH SYNOPSIS -.B timew modify ( -.I start -| -.I end -) -.I -.I -. -.SH DESCRIPTION -The 'modify' command is used to change the start or end date of an interval. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to modify. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -.PP -Then having selected '@3' as the interval you wish to modify: -.RS -$ timew modify end @3 "${PACKAGE_DATE}"T17:00:00 -.RE -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-move (1), -.BR timew-resize (1) -.BR timew-shorten (1), -.BR timew-summary (1) \ No newline at end of file diff --git a/doc/man1/timew-month.1 b/doc/man1/timew-month.1 new file mode 100644 index 00000000..1782cd78 --- /dev/null +++ b/doc/man1/timew-month.1 @@ -0,0 +1 @@ +.so man1/timew-chart.1 diff --git a/doc/man1/timew-move.1.adoc b/doc/man1/timew-move.1.adoc new file mode 100644 index 00000000..4b994650 --- /dev/null +++ b/doc/man1/timew-move.1.adoc @@ -0,0 +1,31 @@ += timew-move(1) + +== NAME +timew-move - change interval start-time + +== SYNOPSIS +[verse] +*timew move* __ __ + +== DESCRIPTION +The 'move' command is used to reposition an interval at a new start time. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to move. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@2' as the interval you wish to move: + + $ timew move @2 9am + +== SEE ALSO +**timew-lengthen**(1), +**timew-modify**(1), +**timew-resize**(1), +**timew-shorten**(1), +**timew-summary**(1), +**timew-tag**(1), +**timew-untag**(1) diff --git a/doc/man1/timew-move.1.in b/doc/man1/timew-move.1.in deleted file mode 100644 index 64dede12..00000000 --- a/doc/man1/timew-move.1.in +++ /dev/null @@ -1,32 +0,0 @@ -.TH timew-move 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-move \- change interval start-time -. -.SH SYNOPSIS -.B timew move -.I -. -.SH DESCRIPTION -The 'move' command is used to reposition an interval at a new start time. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to move. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -Then having selected '@2' as the interval you wish to move: -.RS -$ timew move @2 9am -.RE -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-modify (1), -.BR timew-resize (1), -.BR timew-shorten (1), -.BR timew-summary (1), -.BR timew-tag (1), -.BR timew-untag (1) \ No newline at end of file diff --git a/doc/man1/timew-report.1.adoc b/doc/man1/timew-report.1.adoc new file mode 100644 index 00000000..6c000933 --- /dev/null +++ b/doc/man1/timew-report.1.adoc @@ -0,0 +1,17 @@ += timew-report(1) + +== NAME +timew-report - run an extension report + +== SYNOPSIS +[verse] +*timew* [*report*] __ [__] [__**...**] + +== DESCRIPTION +Runs an extension report, and supports filtering data. +The 'report' command itself is optional, which means that these two commands are equivalent: + + $ timew report foo :week + $ timew foo :week + +This does however assume there is a 'foo' extension installed. diff --git a/doc/man1/timew-report.1.in b/doc/man1/timew-report.1.in deleted file mode 100644 index d2e8333d..00000000 --- a/doc/man1/timew-report.1.in +++ /dev/null @@ -1,27 +0,0 @@ -.TH timew-report 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-report \- run an extension report -. -.SH SYNOPSIS -.B timew -[ -.B report -] -.I -[ -.I -] [ -.I -.B ... -] -. -.SH DESCRIPTION -Runs an extension report, and supports filtering data. -The 'report' command itself is optional, which means that these two commands are equivalent: -.RS -$ timew report foo :week -.br -$ timew foo :week -.RE -This does however assume there is a 'foo' extension installed. \ No newline at end of file diff --git a/doc/man1/timew-resize.1.adoc b/doc/man1/timew-resize.1.adoc new file mode 100644 index 00000000..040ba529 --- /dev/null +++ b/doc/man1/timew-resize.1.adoc @@ -0,0 +1,34 @@ += timew-resize(1) + +== NAME +timew-resize - set interval duration + +== SYNOPSIS +[verse] +*timew resize* __**...** __ + +== DESCRIPTION +The 'resize' command is used to change the duration of a closed interval. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to resize. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@3' as the interval you wish to resize: + + $ timew resize @3 15mins + +Note that you can resize multiple intervals,: + + $ timew resize @3 @1 @13 1hour + +== SEE ALSO +**timew-lengthen**(1), +**timew-modify**(1), +**timew-shorten**(1), +**timew-summary**(1), +**timew-tag**(1), +**timew-untag**(1) diff --git a/doc/man1/timew-resize.1.in b/doc/man1/timew-resize.1.in deleted file mode 100644 index f666bd30..00000000 --- a/doc/man1/timew-resize.1.in +++ /dev/null @@ -1,37 +0,0 @@ -.TH timew-resize 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-resize \- set interval duration -. -.SH SYNOPSIS -.B timew resize -.I -.B ... -.I -. -.SH DESCRIPTION -The 'resize' command is used to change the duration of a closed interval. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to resize. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -Then having selected '@3' as the interval you wish to resize: -.RS -$ timew resize @3 15mins -.RE -Note that you can resize multiple intervals,: -.RS -$ timew resize @3 @1 @13 1hour -.RE -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-modify (1), -.BR timew-shorten (1), -.BR timew-summary (1), -.BR timew-tag (1), -.BR timew-untag (1) \ No newline at end of file diff --git a/doc/man1/timew-shorten.1.adoc b/doc/man1/timew-shorten.1.adoc new file mode 100644 index 00000000..c83b3650 --- /dev/null +++ b/doc/man1/timew-shorten.1.adoc @@ -0,0 +1,34 @@ += timew-shorten(1) + +== NAME +timew-shorten - shorten intervals + +== SYNOPSIS +[verse] +*timew shorten* __**...** __ + +== DESCRIPTION +The 'shorten' command is used to advance the end date of a closed interval. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to shorten. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@2' as the interval you wish to shorten: + + $ timew shorten @2 10mins + +Note that you can shorten multiple intervals,: + + $ timew shorten @2 @10 @23 1hour + +== SEE ALSO +**timew-lengthen**(1), +**timew-modify**(1), +**timew-resize**(1), +**timew-summary**(1), +**timew-tag**(1), +**timew-untag**(1) diff --git a/doc/man1/timew-shorten.1.in b/doc/man1/timew-shorten.1.in deleted file mode 100644 index 1b2757dc..00000000 --- a/doc/man1/timew-shorten.1.in +++ /dev/null @@ -1,38 +0,0 @@ -.TH timew-shorten 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-shorten \- shorten intervals -. -.SH SYNOPSIS -.B timew shorten -.I -.B ... -.I -. -.SH DESCRIPTION -The 'shorten' command is used to advance the end date of a closed interval. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to shorten. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -.br -Then having selected '@2' as the interval you wish to shorten: -.RS -$ timew shorten @2 10mins -.RE -Note that you can shorten multiple intervals,: -.RS -$ timew shorten @2 @10 @23 1hour -.RE -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-modify (1), -.BR timew-resize (1), -.BR timew-summary (1), -.BR timew-tag (1), -.BR timew-untag (1) \ No newline at end of file diff --git a/doc/man1/timew-show.1.adoc b/doc/man1/timew-show.1.adoc new file mode 100644 index 00000000..ec9f9079 --- /dev/null +++ b/doc/man1/timew-show.1.adoc @@ -0,0 +1,14 @@ += timew-show(1) + +== NAME +timew-show - display configuration + +== SYNOPSIS +[verse] +*timew show* + +== DESCRIPTION +Displays the effective configuration in hierarchical form. + +== SEE ALSO +**timew-config**(1) diff --git a/doc/man1/timew-show.1.in b/doc/man1/timew-show.1.in deleted file mode 100644 index cf83a30a..00000000 --- a/doc/man1/timew-show.1.in +++ /dev/null @@ -1,13 +0,0 @@ -.TH timew-show 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-show \- display configuration -. -.SH SYNOPSIS -.B timew show -. -.SH DESCRIPTION -Displays the effective configuration in hierarchical form. -. -.SH "SEE ALSO" -.BR timew-config (1) \ No newline at end of file diff --git a/doc/man1/timew-split.1.adoc b/doc/man1/timew-split.1.adoc new file mode 100644 index 00000000..dee76e37 --- /dev/null +++ b/doc/man1/timew-split.1.adoc @@ -0,0 +1,27 @@ += timew-split(1) + +== NAME +timew-split - split intervals + +== SYNOPSIS +[verse] +*timew split* __**...** + +== DESCRIPTION +Ѕplits an interval into two equally sized adjacent intervals, having the same tags. +Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. +Using the right ID, you can identify an interval to split. + +== EXAMPLES +For example, show the IDs: + + $ timew summary :week :ids + +Then having selected '@2' as the interval you wish to split: + + $ timew split @2 + +== SEE ALSO +**timew-join**(1), +**timew-lengthen**(1), +**timew-shorten**(1) diff --git a/doc/man1/timew-split.1.in b/doc/man1/timew-split.1.in deleted file mode 100644 index e8cac1aa..00000000 --- a/doc/man1/timew-split.1.in +++ /dev/null @@ -1,29 +0,0 @@ -.TH timew-split 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-split \- split intervals -. -.SH SYNOPSIS -.B timew split -.I -.B ... -. -.SH DESCRIPTION -Ѕplits an interval into two equally sized adjacent intervals, having the same tags. -Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. -Using the right ID, you can identify an interval to split. -. -.SH EXAMPLES -For example, show the IDs: -.RS -$ timew summary :week :ids -.RE -Then having selected '@2' as the interval you wish to split: -.RS -$ timew split @2 -.RE -. -.SH "SEE ALSO" -.BR timew-join (1), -.BR timew-lengthen (1), -.BR timew-shorten (1) \ No newline at end of file diff --git a/doc/man1/timew-start.1.in b/doc/man1/timew-start.1.adoc similarity index 54% rename from doc/man1/timew-start.1.in rename to doc/man1/timew-start.1.adoc index 91996b35..3ec98585 100644 --- a/doc/man1/timew-start.1.in +++ b/doc/man1/timew-start.1.adoc @@ -1,36 +1,31 @@ -.TH timew-start 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-start \- start time tracking -. -.SH SYNOPSIS -.B timew start -[ -.I -] [ -.I -.B ... -] -. -.SH DESCRIPTION += timew-start(1) + +== NAME +timew-start - start time tracking + +== SYNOPSIS +[verse] +*timew start* [__] [__**...**] + +== DESCRIPTION Begins tracking using the current time with any specified set of tags. If a tag contains multiple words, therefore containing spaces, use quotes to surround the whole tag. -. -.SH EXAMPLES + +== EXAMPLES For example, this command specifies two tags ('weekend' and 'Home & Garden'), the second of which requires quotes. -.RS -$ timew start weekend 'Home & Garden' -.RE + + $ timew start weekend 'Home & Garden' + An optional date may be specified to indicate the intended start of the tracked time: -.RS -$ timew start 8am weekend 'Home & Garden' -.RE + + $ timew start 8am weekend 'Home & Garden' + If there is a previous open interval, it will be closed at the given start time. -. + Quotes are harmless if used unnecessarily. -. -.SH "SEE ALSO" -.BR timew-cancel (1), -.BR timew-continue (1), -.BR timew-stop (1), -.BR timew-track (1) \ No newline at end of file + +== SEE ALSO +**timew-cancel**(1), +**timew-continue**(1), +**timew-stop**(1), +**timew-track**(1) diff --git a/doc/man1/timew-stop.1.adoc b/doc/man1/timew-stop.1.adoc new file mode 100644 index 00000000..492fecc3 --- /dev/null +++ b/doc/man1/timew-stop.1.adoc @@ -0,0 +1,32 @@ += timew-stop(1) + +== NAME +timew-stop - stop time tracking + +== SYNOPSIS +[verse] +*timew stop* [__] [__**...**] + +== DESCRIPTION +Stops tracking time. +If tags are specified, then they are no longer tracked. +If no tags are specified, all tracking stops. + +== EXAMPLES +For example: + + $ timew start tag1 tag2 + ... + $ timew stop tag1 + +Initially time is tracked for both 'tag1' and 'tag2', then 'tag1' tracking is stopped, leaving tag2 active. +To stop all tracking: + + $ timew stop + + +== SEE ALSO +**timew-cancel**(1), +**timew-continue**(1), +**timew-start**(1), +**timew-track**(1) diff --git a/doc/man1/timew-stop.1.in b/doc/man1/timew-stop.1.in deleted file mode 100644 index 58d05296..00000000 --- a/doc/man1/timew-stop.1.in +++ /dev/null @@ -1,39 +0,0 @@ -.TH timew-stop 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-stop \- stop time tracking -. -.SH SYNOPSIS -.B timew stop -[ -.I -] [ -.I -.B ... -] -. -.SH DESCRIPTION -Stops tracking time. -If tags are specified, then they are no longer tracked. -If no tags are specified, all tracking stops. -. -.SH EXAMPLES -For example: -.RS -$ timew start tag1 tag2 -.br -... -.br -$ timew stop tag1 -.RE -Initially time is tracked for both 'tag1' and 'tag2', then 'tag1' tracking is stopped, leaving tag2 active. -To stop all tracking: -.RS -$ timew stop -.RE -. -.SH "SEE ALSO" -.BR timew-cancel (1), -.BR timew-continue (1), -.BR timew-start (1), -.BR timew-track (1) \ No newline at end of file diff --git a/doc/man1/timew-summary.1.adoc b/doc/man1/timew-summary.1.adoc new file mode 100644 index 00000000..b610cc77 --- /dev/null +++ b/doc/man1/timew-summary.1.adoc @@ -0,0 +1,33 @@ += timew-summary(1) + +== NAME +timew-summary - display a time-tracking summary + +== SYNOPSIS +[verse] +*timew summary* [__] [__**...**] + +== DESCRIPTION +Displays a report summarizing tracked and untracked time for the current day by default. +Accepts date ranges and tags for filtering, or shortcut hints: + + $ timew summary monday - today + $ timew summary :week + $ timew summary :month + +The ':ids' hint adds an 'ID' column to the summary report output for interval modification. + +== CONFIGURATION +**reports.summary.holidays**:: +Determines whether relevant holidays are shown beneath the report. +Default value is 'yes'. + +== SEE ALSO +**timew-day**(1), +**timew-lengthen**(1), +**timew-modify**(1), +**timew-month**(1), +**timew-shorten**(1), +**timew-tag**(1), +**timew-untag**(1), +**timew-week**(1) diff --git a/doc/man1/timew-summary.1.in b/doc/man1/timew-summary.1.in deleted file mode 100644 index 3369684a..00000000 --- a/doc/man1/timew-summary.1.in +++ /dev/null @@ -1,44 +0,0 @@ -.TH timew-summary 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-summary \- display a time-tracking summary -. -.SH SYNOPSIS -.B timew summary -[ -.I -] [ -.I -.B ... -] -. -.SH DESCRIPTION -Displays a report summarizing tracked and untracked time for the current day by default. -Accepts date ranges and tags for filtering, or shortcut hints: -.RS -$ timew summary monday - today -.br -$ timew summary :week -.br -$ timew summary :month -.RE -The ':ids' hint adds an 'ID' column to the summary report output for interval modification. -. -.SH CONFIGURATION -.TP -.B reports.summary.holidays -.RS -Determines whether relevant holidays are shown beneath the report. -.br -Default value is 'yes'. -.RE -. -.SH "SEE ALSO" -.BR timew-day (1), -.BR timew-lengthen (1), -.BR timew-modify (1), -.BR timew-month (1), -.BR timew-shorten (1), -.BR timew-tag (1), -.BR timew-untag (1), -.BR timew-week (1) \ No newline at end of file diff --git a/doc/man1/timew-tag.1.in b/doc/man1/timew-tag.1.adoc similarity index 51% rename from doc/man1/timew-tag.1.in rename to doc/man1/timew-tag.1.adoc index 3840e49b..031e07c5 100644 --- a/doc/man1/timew-tag.1.in +++ b/doc/man1/timew-tag.1.adoc @@ -1,45 +1,39 @@ -.TH timew-tag 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-tag \- add tags to intervals -. -.SH SYNOPSIS -.B timew tag -[ -.I -.B ... -] -.I -.B ... -. -.SH DESCRIPTION += timew-tag(1) + +== NAME +timew-tag - add tags to intervals + +== SYNOPSIS +[verse] +*timew tag* [__**...**] __**...** + +== DESCRIPTION The 'tag' command is used to add a tag to an interval. Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. Using the right ID, you can identify an interval to tag. -. -.SH EXAMPLES + +== EXAMPLES For example, show the IDs: -.RS -$ timew summary :week :ids -.RE + + $ timew summary :week :ids + Then having selected '@2' as the interval you wish to tag: -.RS -$ timew tag @2 'New Tag' -.RE + + $ timew tag @2 'New Tag' + Note that you can tag multiple intervals, with multiple tags: -.RS -$ timew tag @2 @10 @23 'Tag One' tag2 tag3 -.RE + + $ timew tag @2 @10 @23 'Tag One' tag2 tag3 + If there is active time tracking, you can omit the ID when you want to add tags to the current open interval: -.RS -$ timew start foo -.br -$ timew tag bar -.RE + + $ timew start foo + $ timew tag bar + This results in the current interval having tags 'foo' and 'bar'. -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-shorten (1), -.BR timew-summary (1), -.BR timew-untag (1) \ No newline at end of file + +== SEE ALSO +**timew-lengthen**(1), +**timew-shorten**(1), +**timew-summary**(1), +**timew-untag**(1) diff --git a/doc/man1/timew-tags.1.adoc b/doc/man1/timew-tags.1.adoc new file mode 100644 index 00000000..7c1aade3 --- /dev/null +++ b/doc/man1/timew-tags.1.adoc @@ -0,0 +1,12 @@ += timew-tags(1) + +== NAME +timew-tags - display a list of tags + +== SYNOPSIS +[verse] +*timew tags* [__] + +== DESCRIPTION +Displays all the tags that have been used by default. +When a filter is specified, shows only the tags that were used during that time. diff --git a/doc/man1/timew-tags.1.in b/doc/man1/timew-tags.1.in deleted file mode 100644 index 85ab0aa8..00000000 --- a/doc/man1/timew-tags.1.in +++ /dev/null @@ -1,14 +0,0 @@ -.TH timew-tags 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-tags \- display a list of tags -. -.SH SYNOPSIS -.B timew tags -[ -.I -] -. -.SH DESCRIPTION -Displays all the tags that have been used by default. -When a filter is specified, shows only the tags that were used during that time. \ No newline at end of file diff --git a/doc/man1/timew-track.1.adoc b/doc/man1/timew-track.1.adoc new file mode 100644 index 00000000..9eacc4b5 --- /dev/null +++ b/doc/man1/timew-track.1.adoc @@ -0,0 +1,27 @@ += timew-track(1) + +== NAME +timew-track - add intervals to the database + +== SYNOPSIS +[verse] +*timew track* __ [__**...**] + +== DESCRIPTION +The track command is used to add tracked time in the past. +Perhaps you forgot to record time, or are just filling in old entries. + +== EXAMPLES +For example: + + $ timew track :yesterday 'Training Course' + $ timew track 9am - 11am 'Staff Meeting' + +Note that the track command expects a closed interval (start and end time), when recording. +If a closed interval is not provided, the 'track' command behaves the same as the 'start' command. + +== SEE ALSO +**timew-cancel**(1), +**timew-continue**(1), +**timew-start**(1), +**timew-stop**(1) diff --git a/doc/man1/timew-track.1.in b/doc/man1/timew-track.1.in deleted file mode 100644 index f88ed065..00000000 --- a/doc/man1/timew-track.1.in +++ /dev/null @@ -1,32 +0,0 @@ -.TH timew-track 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-track \- add intervals to the database -. -.SH SYNOPSIS -.B timew track -.I -[ -.I -.B ... -] -. -.SH DESCRIPTION -The track command is used to add tracked time in the past. -Perhaps you forgot to record time, or are just filling in old entries. -. -.SH EXAMPLES -For example: -.RS -$ timew track :yesterday 'Training Course' -.br -$ timew track 9am - 11am 'Staff Meeting' -.RE -Note that the track command expects a closed interval (start and end time), when recording. -If a closed interval is not provided, the 'track' command behaves the same as the 'start' command. -. -.SH "SEE ALSO" -.BR timew-cancel (1), -.BR timew-continue (1), -.BR timew-start (1), -.BR timew-stop (1) \ No newline at end of file diff --git a/doc/man1/timew-undo.1.in b/doc/man1/timew-undo.1.adoc similarity index 64% rename from doc/man1/timew-undo.1.in rename to doc/man1/timew-undo.1.adoc index a1b7920f..ab863462 100644 --- a/doc/man1/timew-undo.1.in +++ b/doc/man1/timew-undo.1.adoc @@ -1,12 +1,13 @@ -.TH timew-undo 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-undo \- revert Timewarrior commands -. -.SH SYNOPSIS -.B timew undo -. -.SH DESCRIPTION += timew-undo(1) + +== NAME +timew-undo - revert Timewarrior commands + +== SYNOPSIS +[verse] +*timew undo* + +== DESCRIPTION The 'undo' command is used to revert the action of Timewarrior commands. Only commands affecting intervals or Timewarrior configuration can be reverted. Timewarrior keeps a journal of changes to the interval database and Timewarrior configuration. @@ -14,10 +15,8 @@ A call to 'undo' removes the last entry in the journal and restores the previous As long as there are entries in the journal, you can revert the respective action. The 'undo' command itself cannot be undone! -.SH EXAMPLES -Undo an interval modification: -.RS -$ timew split @1 -.br -$ timew undo -.RE \ No newline at end of file +== EXAMPLES +Undo an interval modification:: ++ + $ timew split @1 + $ timew undo diff --git a/doc/man1/timew-untag.1.in b/doc/man1/timew-untag.1.adoc similarity index 51% rename from doc/man1/timew-untag.1.in rename to doc/man1/timew-untag.1.adoc index e263c6a8..e15bffb7 100644 --- a/doc/man1/timew-untag.1.in +++ b/doc/man1/timew-untag.1.adoc @@ -1,45 +1,39 @@ -.TH timew-untag 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-untag \- remove tags from intervals -. -.SH SYNOPSIS -.B timew untag -[ -.I -.B ... -] -.I -.B ... -. -.SH DESCRIPTION += timew-untag(1) + +== NAME +timew-untag - remove tags from intervals + +== SYNOPSIS +[verse] +*timew untag* [__**...** ] __**...** + +== DESCRIPTION The 'untag' command is used to remove a tag from an interval. Using the 'summary' command, and specifying the ':ids' hint shows interval IDs. Using the right ID, you can identify an interval to untag. -. -.SH EXAMPLES + +== EXAMPLES For example, show the IDs: -.RS -$ timew summary :week :ids -.RE + + $ timew summary :week :ids + Then having selected '@2' as the interval you wish to untag: -.RS -$ timew untag @2 'Old Tag' -.RE + + $ timew untag @2 'Old Tag' + Note that you can untag multiple intervals, with multiple tags: -.RS -$ timew untag @2 @10 @23 'Old Tag' tag2 tag3 -.RE + + $ timew untag @2 @10 @23 'Old Tag' tag2 tag3 + If there is active time tracking, you can omit the ID when you want to remove tags from the current open interval: -.RS -$ timew start foo bar -.br -$ timew untag bar -.RE + + $ timew start foo bar + $ timew untag bar + This results in the current interval having tag 'foo' but not 'bar'. -. -.SH "SEE ALSO" -.BR timew-lengthen (1), -.BR timew-shorten (1), -.BR timew-summary (1), -.BR timew-tag (1) \ No newline at end of file + +== SEE ALSO +**timew-lengthen**(1), +**timew-shorten**(1), +**timew-summary**(1), +**timew-tag**(1) diff --git a/doc/man1/timew-week.1 b/doc/man1/timew-week.1 new file mode 100644 index 00000000..1782cd78 --- /dev/null +++ b/doc/man1/timew-week.1 @@ -0,0 +1 @@ +.so man1/timew-chart.1 diff --git a/doc/man1/timew.1.adoc b/doc/man1/timew.1.adoc new file mode 100644 index 00000000..b756eb34 --- /dev/null +++ b/doc/man1/timew.1.adoc @@ -0,0 +1,164 @@ += timew(1) + +== NAME +timew - a command line time tracker + +== SYNOPSIS +[verse] +*timew* [*--version*|*--help*] +*timew* [__ [__**...**]] + +== DESCRIPTION +Timewarrior is a command line time tracker. +It allows you to easily track your time and generate summary reports. + +This is a reference, not a tutorial. +If you are looking for a tutorial, check the online documentation here: + + https://timewarrior.net/docs/ + +When run without arguments or options, the default command is run, which indicates whether there is any active tracking, and if so, shows a summary, then exits with a code 0. +If there is no active time tracking, exit code is 1. + +== OPTIONS + +*--version*:: +Displays Timewarrior version information + +*--help*:: +Displays Timewarrior usage information + +== Timewarrior commands +Timewarrior supports many commands. +Alphabetically: + +*timew-annotate*(1):: + Add annotation to intervals + +*timew-cancel*(1):: + Cancel time tracking + +*timew-config*(1):: + Get and set Timewarrior configuration + +*timew-continue*(1):: + Resume tracking of existing interval + +*timew-day*(1):: + Display day chart + +*timew-delete*(1):: + Delete intervals + +*timew-diagnostics*(1):: + Show diagnostic information + +*timew-export*(1):: + Export tracked time in JSON + +*timew-extensions*(1):: + List available extensions + +*timew-get*(1):: + Display DOM values + +*timew-help*(1):: + Display help + +*timew-join*(1):: + Join intervals + +*timew-lengthen*(1):: + Lengthen intervals + +*timew-modify*(1):: + Change start or end time of an interval + +*timew-month*(1):: + Display month chart + +*timew-move*(1):: + Change interval start-time + +*timew-report*(1):: + Run an extension report + +*timew-resize*(1):: + Set interval duration + +*timew-shorten*(1):: + Shorten intervals + +*timew-show*(1):: + Display configuration + +*timew-split*(1):: + Split intervals + +*timew-start*(1):: + Start time tracking + +*timew-stop*(1):: + Stop time tracking + +*timew-summary*(1):: + Display a time-tracking summary + +*timew-tag*(1):: + Add tags to intervals + +*timew-tags*(1):: + Display a list of tags + +*timew-track*(1):: + Add intervals to the database + +*timew-undo*(1):: + Undo Timewarrior commands + +*timew-untag*(1):: + Remove tags from intervals + +*timew-week*(1):: + Display week chart + +== MORE EXAMPLES + +For examples please see the online documentation starting at: + + + +Note that the online documentation can be more detailed and more current than this man page + +== FILES + +~/.timewarrior/timewarrior.cfg:: + User configuration file. + +~/.timewarrior/data/YYYY-MM.data:: + Time tracking data files. + +== pass:[CREDITS & COPYRIGHT] +Copyright (C) 2015 - 2018 T. Lauf, P. Beckingham, F. Hernandez. + +Timewarrior is distributed under the MIT license. +See https://www.opensource.org/licenses/mit-license.php for more information. + +== FURTHER DOCUMENTATION +For more information regarding Timewarrior, see the following: + +The official site at + +The official code repository at + +You can contact the project by emailing + +== REPORTING BUGS +Bugs in Timewarrior may be reported to the issue-tracker at + +== SEE ALSO +**timew-config**(7), +**timew-dates**(7), +**timew-dom**(7), +**timew-durations**(7), +**timew-hints**(7), +**timew-range**(7) diff --git a/doc/man1/timew.1.in b/doc/man1/timew.1.in deleted file mode 100644 index 710b4116..00000000 --- a/doc/man1/timew.1.in +++ /dev/null @@ -1,239 +0,0 @@ -.TH timew 1 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew \- A command line time tracker. -. -.SH SYNOPSIS -.BR "timew " [ --version | --help ] -.br -.B timew -.RI [ " " [ "...]]" -. -.SH DESCRIPTION -Timewarrior is a command line time tracker. -It allows you to easily track your time and generate summary reports. -. -This is a reference, not a tutorial. -If you are looking for a tutorial, check the online documentation here: -.br - https://timewarrior.net/docs/ -.br -When run without arguments or options, the default command is run, which indicates whether there is any active tracking, and if so, shows a summary, then exits with a code 0. -If there is no active time tracking, exit code is 1. -. -.SH OPTIONS -.TP -.B \-\-version -.RS -Displays TimeWarrior version information -.RE -.TP -.B \-\-help -.RS -Display TimeWarrior usage information -.RE -. -.SH "TIMEWARRIOR COMMANDS" -Timewarrior supports many commands. -Alphabetically: -. -.TP -.BR timew-annotate (1) -.RS -Add annotation to intervals -.RE -.TP -.BR timew-cancel (1) -.RS -Cancel time tracking -.RE -.TP -.BR timew-config (1) -.RS -Get and set Timewarrior configuration -.RE -.TP -.BR timew-continue (1) -.RS -Resume tracking of existing interval -.RE -.TP -.BR timew-day (1) -.RS -Display day chart -.RE -.TP -.BR timew-delete (1) -.RS -Delete intervals -.RE -.TP -.BR timew-diagnostics (1) -.RS -Show diagnostic information -.RE -.TP -.BR timew-export (1) -.RS -Export tracked time in JSON -.RE -.TP -.BR timew-extensions (1) -.RS -List available extensions -.RE -.TP -.BR timew-get (1) -.RS -Display DOM values -.RE -.TP -.BR timew-help (1) -.RS -Display help -.RE -.TP -.BR timew-join (1) -.RS -Join intervals -.RE -.TP -.BR timew-lengthen (1) -.RS -Lengthen intervals -.RE -.TP -.BR timew-modify (1) -.RS -Change start or end time of an interval -.RE -.TP -.BR timew-month (1) -.RS -Display month chart -.RE -.TP -.BR timew-move (1) -.RS -Change interval start-time -.RE -.TP -.BR timew-report (1) -.RS -Run an extension report -.RE -.TP -.BR timew-resize (1) -.RS -Set interval duration -.RE -.TP -.BR timew-shorten (1) -.RS -Shorten intervals -.RE -.TP -.BR timew-show (1) -.RS -Display configuration -.RE -.TP -.BR timew-split (1) -.RS -Split intervals -.RE -.TP -.BR timew-start (1) -.RS -Start time tracking -.RE -.TP -.BR timew-stop (1) -.RS -Stop time tracking -.RE -.TP -.BR timew-summary (1) -.RS -Display a time-tracking summary -.RE -.TP -.BR timew-tag (1) -.RS -Add tags to intervals -.RE -.TP -.BR timew-tags (1) -.RS -Display a list of tags -.RE -.TP -.BR timew-track (1) -.RS -Add intervals to the database -.RE -.TP -.BR timew-undo (1) -.RS -Undo Timewarrior commands -.RE -.TP -.BR timew-untag (1) -.RS -Remove tags from intervals -.RE -.TP -.BR timew-week (1) -.RS -Display week chart -.RE -. -.SH "MORE EXAMPLES" -. -For examples please see the online documentation starting at: -. -.RS - -.RE -. -Note that the online documentation can be more detailed and more current than this man page. -. -.SH FILES -. -.TP -~/.timewarrior/timewarrior.cfg -User configuration file. -. -.TP -~/.timewarrior/data/YYYY-MM.data -Time tracking data files. -. -.SH "CREDITS & COPYRIGHTS" -Copyright (C) 2015 \- 2018 T. Lauf, P. Beckingham, F. Hernandez. -.br -Timewarrior is distributed under the MIT license. -See https://www.opensource.org/licenses/mit-license.php for more information. -. -.SH "FURTHER DOCUMENTATION" -For more information regarding Timewarrior, see the following: -. -.TP -The official site at -. -.TP -The official code repository at -. -.TP -You can contact the project by emailing -. -.SH "REPORTING BUGS" -.TP -Bugs in Timewarrior may be reported to the issue-tracker at -. -.SH "SEE ALSO" -.BR timew-config (7), -.BR timew-dates (7), -.BR timew-dom (7), -.BR timew-durations (7), -.BR timew-hints (7), -.BR timew-ranges (7) \ No newline at end of file diff --git a/doc/man7/CMakeLists.txt b/doc/man7/CMakeLists.txt new file mode 100644 index 00000000..6866b119 --- /dev/null +++ b/doc/man7/CMakeLists.txt @@ -0,0 +1,21 @@ +cmake_minimum_required (VERSION 2.8.12) + +file (GLOB DOC_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/*.7.adoc") +set (DOC_FILES) + +foreach (SRC ${DOC_SOURCES}) + string (REPLACE ".adoc" "" OUTPUT_FILE_NAME "${SRC}") + + add_custom_command ( + OUTPUT "${OUTPUT_FILE_NAME}" + COMMAND ${ASCIIDOCTOR_EXECUTABLE} -b manpage ${ASCIIDOCTOR_OPTIONS} ${SRC} -o ${OUTPUT_FILE_NAME} + DEPENDS "${SRC}") + + set (DOC_FILES ${DOC_FILES} "${OUTPUT_FILE_NAME}") +endforeach (SRC) + +add_custom_target (man7 DEPENDS ${DOC_FILES}) + +install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + DESTINATION ${TIMEW_MANDIR} + FILES_MATCHING PATTERN "*.7") diff --git a/doc/man7/timew-config.7.in b/doc/man7/timew-config.7.adoc similarity index 63% rename from doc/man7/timew-config.7.in rename to doc/man7/timew-config.7.adoc index c09b2893..d3ceedff 100644 --- a/doc/man7/timew-config.7.in +++ b/doc/man7/timew-config.7.adoc @@ -1,62 +1,51 @@ -.TH timew-config 7 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-config \- Timewarrior configuration file and override options -. -.SH SYNOPSIS -.BI "timew rc." = " " -. -.SH DESCRIPTION -Timewarrior stores its configuration in the user's home directory in -.I ~/.timewarrior/timewarrior.cfg. += timew-config(7) + +== NAME +timew-config - Timewarrior configuration file and override options + +== SYNOPSIS +**timew rc.**____**=**____ __ + +== DESCRIPTION +Timewarrior stores its configuration in the user's home directory in _~/.timewarrior/timewarrior.cfg_. This file contains a mix of rules and configuration settings. Note that the TIMEWARRIORDB environment variable can be set to override this location. -. + The values 'true', '1', 'y', 'yes' and 'on' are all equivalent and enable a setting. Any other value means disable the setting. -. -Default values may be overridden by timewarrior.cfg values, which may in turn be overridden on the command line using: -.BI rc. = -.PP + +Default values may be overridden by timewarrior.cfg values, which may in turn be overridden on the command line using: **rc.**____**=**____ + For example, to turn off verbose mode: -.RS -rc.verbose=0 -.RE -.PP + + rc.verbose=0 + Note that hints can also do this (:quiet). -. -.SH CONFIGURATION -.TP -.B confirmation -.RS + +== CONFIGURATION + +*confirmation*:: Determines whether harmful operations require interactive confirmation. -.br ++ May be overridden by the ':yes' hint. -.br ++ Default value is 'yes'. -.RE -.TP -.B verbose -.RS + +*verbose*:: Determines whether Timewarrior generates feedback. -.br ++ May be overridden by the ':quiet' hint. -.br ++ Default value is 'yes'. -.RE -.TP -.B debug -.RS + +*debug*:: Determines whether diagnostic debugging information is shown. -.br ++ Useful for troubleshooting, but not for general use. -.br ++ Default value is 'off'. -.RE -.TP -.B debug.indicator -.RS + +*debug.indicator*:: The debug output prefix string. -.br ++ Default value is '>>'. -.RE diff --git a/doc/man7/timew-dates.7.in b/doc/man7/timew-dates.7.adoc similarity index 92% rename from doc/man7/timew-dates.7.in rename to doc/man7/timew-dates.7.adoc index 9ab4e3a5..84657540 100644 --- a/doc/man7/timew-dates.7.in +++ b/doc/man7/timew-dates.7.adoc @@ -1,39 +1,44 @@ -.TH timew-dates 7 "${PACKAGE_DATE}" "${PACKAGE_STRING}" "User Manuals" -. -.SH NAME -timew-dates \- date formats supported by Timewarrior -. -.SH SYNOPSIS -. -.SH DESCRIPTION += timew-dates(7) + +== NAME +timew-dates - date formats supported by Timewarrior + +== SYNOPSIS + +== DESCRIPTION Timewarrior supports the following date formats based on ISO-8601: -. + [T ] Extended date, optional extended time [T