GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug #458

Browse source 
- Fixed bug #458, removing the ambiguous 'm' as a duration, leaving 'mi[nutes]'
  and 'mo[nths]' requiring at least two characters for a match.
This commit is contained in:
Paul Beckingham 2011-08-23 22:46:32 -04:00
parent d15cccdb7d
commit 257f5ab3da
3 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -94,6 +94,8 @@
# Tracked Bugs, sorted by ID. # Tracked Bugs, sorted by ID.
+ Fixed bug #403, which disambiguates certain commands involving numbers. + Fixed bug #403, which disambiguates certain commands involving numbers.
+ Fixed bug #458, removing the ambiguous 'm' as a duration, leaving 'mi[nutes]'
and 'mo[nths]' requiring at least two characters for a match.
+ Fixed bug #475, which allowed a blank annotation command to be entered + Fixed bug #475, which allowed a blank annotation command to be entered
(thanks to Andreas Kalex). (thanks to Andreas Kalex).
+ Fixed bug #511, which caused display problem on Cygwin when colored output + Fixed bug #511, which caused display problem on Cygwin when colored output

1
src/Duration.cpp
View file

@ -67,7 +67,6 @@ static const char* durations[] =
"mth", "mth",
"mos", "mos",
"mo", "mo",
"m",
"quarterly", "quarterly",
"quarters", "quarters",
"qrtrs", "qrtrs",

10
test/duration.t.cpp
View file

@ -48,7 +48,7 @@ int convertDuration (const std::string& input)
int main (int argc, char** argv) int main (int argc, char** argv)
{ {
UnitTest t (651); UnitTest t (643);
Duration d; Duration d;
@ -584,10 +584,6 @@ int main (int argc, char** argv)
t.ok (d.valid ("-1mths"), "valid duration -1mths"); t.ok (d.valid ("-1mths"), "valid duration -1mths");
t.ok (d.valid ("-1mth"), "valid duration -1mth"); t.ok (d.valid ("-1mth"), "valid duration -1mth");
t.ok (d.valid ("-1mo"), "valid duration -1mo"); t.ok (d.valid ("-1mo"), "valid duration -1mo");
t.ok (d.valid ("0m"), "valid duration 0m");
t.ok (d.valid ("1m"), "valid duration 1m");
t.ok (d.valid ("10m"), "valid duration 10m");
t.ok (d.valid ("-1m"), "valid duration -1m");
t.ok (d.valid ("0wks"), "valid duration 0wks"); t.ok (d.valid ("0wks"), "valid duration 0wks");
t.ok (d.valid ("0wk"), "valid duration 0wk"); t.ok (d.valid ("0wk"), "valid duration 0wk");
@ -703,10 +699,6 @@ int main (int argc, char** argv)
t.is (convertDuration ("10mths"), 300, "valid duration 10mths"); t.is (convertDuration ("10mths"), 300, "valid duration 10mths");
t.is (convertDuration ("10mth"), 300, "valid duration 10mth"); t.is (convertDuration ("10mth"), 300, "valid duration 10mth");
t.is (convertDuration ("10mo"), 300, "valid duration 10mo"); t.is (convertDuration ("10mo"), 300, "valid duration 10mo");
t.is (convertDuration ("0m"), 0, "valid duration 0m");
t.is (convertDuration ("1m"), 30, "valid duration 1m");
t.is (convertDuration ("10m"), 300, "valid duration 10m");
t.is (convertDuration ("-1m"), 30, "valid duration -1m");
t.is (convertDuration ("0wks"), 0, "valid duration 0wks"); t.is (convertDuration ("0wks"), 0, "valid duration 0wks");
t.is (convertDuration ("0wk"), 0, "valid duration 0wk"); t.is (convertDuration ("0wk"), 0, "valid duration 0wk");