mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
[BREAKING] Remove journal.info support
This support will require access to all of the operations ever performed on a task, which is not currently exposed by TaskChampion (but see #2928)
This commit is contained in:
Dustin J. Mitchell
Dustin J. Mitchell
parent
cf711f5eb1
commit
ddd367232e
6 changed files with 4 additions and 152 deletions
|
|
@ -156,7 +156,6 @@ protected:
|
|||
|
||||
friend class CmdSync; // CmdSync accesses the backlog directly
|
||||
TF2 backlog;
|
||||
friend class CmdInfo; // CmdInfo uses undo data to give history
|
||||
TF2 undo;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -77,11 +77,6 @@ int CmdInfo::execute (std::string& output)
|
|||
rc = 1;
|
||||
}
|
||||
|
||||
// Get the undo data.
|
||||
std::vector <std::string> undo;
|
||||
if (Context::getContext ().config.getBoolean ("journal.info"))
|
||||
undo = Context::getContext ().tdb2.undo.get_lines ();
|
||||
|
||||
// Determine the output date format, which uses a hierarchy of definitions.
|
||||
// rc.dateformat.info
|
||||
// rc.dateformat
|
||||
|
|
@ -530,54 +525,6 @@ int CmdInfo::execute (std::string& output)
|
|||
urgencyDetails.set (row, 5, rightJustify (format (task.urgency (), 4, 4), 6));
|
||||
}
|
||||
|
||||
// Create a third table, containing undo log change details.
|
||||
Table journal;
|
||||
setHeaderUnderline (journal);
|
||||
|
||||
if (Context::getContext ().config.getBoolean ("obfuscate"))
|
||||
journal.obfuscate ();
|
||||
if (Context::getContext ().config.getBoolean ("color"))
|
||||
journal.forceColor ();
|
||||
|
||||
journal.width (Context::getContext ().getWidth ());
|
||||
journal.add ("Date");
|
||||
journal.add ("Modification");
|
||||
|
||||
if (Context::getContext ().config.getBoolean ("journal.info") &&
|
||||
undo.size () > 3)
|
||||
{
|
||||
// Scan the undo data for entries matching this task, without making
|
||||
// copies.
|
||||
unsigned int i = 0;
|
||||
long last_timestamp = 0;
|
||||
while (i < undo.size ())
|
||||
{
|
||||
int when = i++;
|
||||
int previous = -1;
|
||||
|
||||
if (! undo[i].compare (0, 3, "old", 3))
|
||||
previous = i++;
|
||||
|
||||
int current = i++;
|
||||
i++; // Separator
|
||||
|
||||
if (undo[current].find ("uuid:\"" + uuid) != std::string::npos)
|
||||
{
|
||||
if (previous != -1)
|
||||
{
|
||||
int row = journal.addRow ();
|
||||
|
||||
Datetime timestamp (strtol (undo[when].substr (5).c_str (), nullptr, 10));
|
||||
journal.set (row, 0, timestamp.toString (dateformat));
|
||||
|
||||
Task before (undo[previous].substr (4));
|
||||
Task after (undo[current].substr (4));
|
||||
journal.set (row, 1, before.diffForInfo (after, dateformat, last_timestamp, Datetime(after.get("modified")).toEpoch()));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
out << optionalBlankLine ()
|
||||
<< view.render ()
|
||||
<< '\n';
|
||||
|
|
@ -585,10 +532,6 @@ int CmdInfo::execute (std::string& output)
|
|||
if (urgencyDetails.rows () > 0)
|
||||
out << urgencyDetails.render ()
|
||||
<< '\n';
|
||||
|
||||
if (journal.rows () > 0)
|
||||
out << journal.render ()
|
||||
<< '\n';
|
||||
}
|
||||
|
||||
output = out.str ();
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ class TestInfoCommand(TestCase):
|
|||
self.assertRegex(out, "Urgency\s+\d+(\.\d+)?")
|
||||
self.assertRegex(out, "Priority\s+H")
|
||||
|
||||
self.assertRegex(out, "Annotation of 'bar' added.")
|
||||
self.assertIn("project", out)
|
||||
self.assertIn("active", out)
|
||||
self.assertIn("annotations", out)
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ class TestBug880(TestCase):
|
|||
self.assertEqual("one\\\n", out)
|
||||
|
||||
self.t(r"1 annotate 'two\\'")
|
||||
code, out, err = self.t("long rc.verbose:nothing")
|
||||
code, out, err = self.t("info rc.verbose:nothing")
|
||||
self.assertIn("one\\\n", out)
|
||||
self.assertIn("two\\\n", out)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
###############################################################################
|
||||
#
|
||||
# Copyright 2006 - 2021, Tomas Babej, 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
|
||||
# in the Software without restriction, including without limitation the rights
|
||||
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
# copies of the Software, and to permit persons to whom the Software is
|
||||
# furnished to do so, subject to the following conditions:
|
||||
#
|
||||
# The above copyright notice and this permission notice shall be included
|
||||
# in all copies or substantial portions of the Software.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
# 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
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
import sys
|
||||
import os
|
||||
import unittest
|
||||
# Ensure python finds the local simpletap module
|
||||
sys.path.append(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
from basetest import Task, TestCase, Taskd, ServerTestCase
|
||||
|
||||
|
||||
class TestBug1999(TestCase):
|
||||
"""Bug 1999: Taskwarrior reports wrong active tim
|
||||
"""
|
||||
def setUp(self):
|
||||
self.t = Task()
|
||||
|
||||
def test_correct_active_time(self):
|
||||
"""Ensure correct active time locally
|
||||
"""
|
||||
desc = "Testing task"
|
||||
self.t(("add", desc))
|
||||
self.t(("start", "1"))
|
||||
self.t.faketime("+10m")
|
||||
self.t(("stop", "1"))
|
||||
|
||||
code, out, err = self.t(("info", "1"))
|
||||
self.assertRegex(out, "duration: 0:10:0[0-5]")
|
||||
|
||||
|
||||
class TestBug1999Server(ServerTestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.taskd = Taskd()
|
||||
# This takes a while...
|
||||
cls.taskd.start()
|
||||
|
||||
def setUp(self):
|
||||
self.t1 = Task(taskd=self.taskd)
|
||||
self.t2 = Task(taskd=self.taskd)
|
||||
|
||||
def test_correct_active_time(self):
|
||||
"""Ensure correct active time across different clients
|
||||
"""
|
||||
desc = "Testing task"
|
||||
self.t1(("add", desc))
|
||||
self.t1(("start", "1"))
|
||||
self.t1.faketime("+10m")
|
||||
self.t1(("stop", "1"))
|
||||
|
||||
self.t1("sync")
|
||||
|
||||
code, out, err = self.t1(("info", "1"))
|
||||
self.assertRegex(out, "duration: 0:10:0[0-5]")
|
||||
|
||||
self.t2("sync")
|
||||
|
||||
code2, out2, err2 = self.t2(("info", "1"))
|
||||
self.assertIn("duration: 0:10:00", out2)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
from simpletap import TAPTestRunner
|
||||
unittest.main(testRunner=TAPTestRunner())
|
||||
|
||||
# vim: ai sts=4 et sw=4 ft=python
|
||||
|
|
@ -6,6 +6,9 @@ task add Something I did yesterday
|
|||
task 1 mod start:yesterday+18h
|
||||
task 1 done end:yesterday+20h
|
||||
|
||||
# this does not work without journal.info
|
||||
export EXPFAIL=true
|
||||
|
||||
# Check that 2 hour interval is reported by task info
|
||||
task info | grep -F "Start deleted"
|
||||
[[ ! -z `task info | grep -F "Start deleted (duration: 2:00:00)."` ]]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue