GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-24 08:56:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge Errors

Browse source 
- Fixed errors from merge mistakes.
This commit is contained in:
Paul Beckingham 2014-01-07 19:23:54 -05:00
parent 98f740e9d1
commit 9c41610f56
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -28,7 +28,6 @@ set (task_SRCS A3.cpp A3.h
OldDuration.cpp OldDuration.h OldDuration.cpp OldDuration.h
Path.cpp Path.h Path.cpp Path.h
RX.cpp RX.h RX.cpp RX.h
Socket.cpp Socket.h
TDB2.cpp TDB2.h TDB2.cpp TDB2.h
Task.cpp Task.h Task.cpp Task.h
Taskmod.cpp Taskmod.h Taskmod.cpp Taskmod.h

6
src/Task.cpp
View file

@ -1880,7 +1880,7 @@ void Task::modify (
long l = (long) strtod (result.c_str (), NULL); long l = (long) strtod (result.c_str (), NULL);
if (labs (l) < 5 * 365 * 86400) if (labs (l) < 5 * 365 * 86400)
{ {
Duration dur (value); OldDuration dur (value);
Date now; Date now;
now += l; now += l;
(*this).set (name, now.toEpochString ()); (*this).set (name, now.toEpochString ());
@ -1892,7 +1892,7 @@ void Task::modify (
} }
} }
// Durations too. // OldDurations too.
else if (name == "recur" || else if (name == "recur" ||
column->type () == "duration") column->type () == "duration")
{ {
@ -1905,7 +1905,7 @@ void Task::modify (
std::string result = e.evalExpression ((*this)); std::string result = e.evalExpression ((*this));
context.debug (std::string ("Eval '") + value + "' --> '" + result + "'"); context.debug (std::string ("Eval '") + value + "' --> '" + result + "'");
Duration d (value); OldDuration d (value);
// Deliberately storing the 'raw' value, which is necessary for // Deliberately storing the 'raw' value, which is necessary for
// durations like 'weekday'.. // durations like 'weekday'..

4
src/columns/ColDate.cpp
View file

@ -125,7 +125,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
{ {
Date now; Date now;
if (date > now) if (date > now)
minimum = maximum = Duration (date - now).format ().length (); minimum = maximum = OldDuration (date - now).format ().length ();
} }
else else
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
@ -207,7 +207,7 @@ void ColumnDate::render (
lines.push_back ( lines.push_back (
color.colorize ( color.colorize (
rightJustify ( rightJustify (
Duration (date - now).format (), width))); OldDuration (date - now).format (), width)));
else else
lines.push_back (""); lines.push_back ("");
} }

13
test/roundtrip.t
View file

@ -61,14 +61,15 @@ unlink 'pending.data', 'completed.data', 'undo.data';
qx{../src/task rc:roundtrip.rc import ./roundtrip2.json 2>&1}; qx{../src/task rc:roundtrip.rc import ./roundtrip2.json 2>&1};
# Examine. # Examine.
#
# ID Created P Project Tags Description
# -- ---------- - ------- --------- -----------
# 1 1/7/2014 H A one/1
# 2 1/7/2014 tag1 tag2 two
# ID Project Pri Added Started Due Recur Countdown Age Deps Tags Description
# -- ------- --- -------- ------- --- ----- --------- --- ---- --------- ---------
# 1 A H 8/7/2010 - one/1
# 2 8/7/2010 - tag1 tag2 two
my $output = qx{../src/task rc:roundtrip.rc long 2>&1}; my $output = qx{../src/task rc:roundtrip.rc long 2>&1};
like ($output, qr/1.+A.+H.+\d+\/\d+\/\d+.+(?:-|\d+).+one\/1/, '2 round trips task 1 identical'); like ($output, qr/1\s+\d+\/\d+\/\d+\s+H\s+A\s+one\/1/, '2 round trips task 1 identical');
like ($output, qr/2.+\d+\/\d+\/\d+.+(?:-|\d+).+tag1\stag2\stwo/, '2 round trips task 2 identical'); like ($output, qr/2\s+\d+\/\d+\/\d+\s+tag1\s+tag2\s+two/, '2 round trips task 2 identical');
# Compare the actual JSON files. # Compare the actual JSON files.
$output = qx{diff ./roundtrip1.json ./roundtrip2.json 2>&1}; $output = qx{diff ./roundtrip1.json ./roundtrip2.json 2>&1};