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

Bug #901

Browse source 
- Fixed bug #901, which was preventing multiple IDs and UUIDs from being used
  as a filter (thanks to Bryce Harrington).
This commit is contained in:
Paul Beckingham 2012-01-30 01:00:45 -05:00
parent 36e5e650d4
commit bff868145d
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -238,6 +238,8 @@
(thanks to Eli Lev). (thanks to Eli Lev).
+ Fixed bug #899, which displayed incorrect project completion numbers (thanks + Fixed bug #899, which displayed incorrect project completion numbers (thanks
to Paul-Gheorghe Barbu). to Paul-Gheorghe Barbu).
+ Fixed bug #901, which was preventing multiple IDs and UUIDs from being used
as a filter (thanks to Bryce Harrington).
# Untracked Bugs, biggest first. # Untracked Bugs, biggest first.
+ Fixed bug that required the '%YAML' prologue in a YAML import. + Fixed bug that required the '%YAML' prologue in a YAML import.

29
src/A3.cpp
View file

@ -450,7 +450,8 @@ void A3::inject_defaults ()
if (arg->_category == Arg::cat_command) if (arg->_category == Arg::cat_command)
found_command = true; found_command = true;
/* TODO no "id" or "uuid" categories exist at this time. Hmm. /* TODO no "id" or "uuid" categories exist at this time.
This kills the auto-info feature.
else if (arg->_category == Arg::cat_id || else if (arg->_category == Arg::cat_id ||
arg->_category == Arg::cat_uuid) arg->_category == Arg::cat_uuid)
found_sequence = true; found_sequence = true;
@ -789,19 +790,6 @@ const A3 A3::tokenize (const A3& input) const
found_something_after_sequence = true; found_something_after_sequence = true;
} }
else if (is_id (n, s))
{
if (found_something_after_sequence)
{
output.push_back (Arg (s, Arg::type_number, Arg::cat_literal));
}
else
{
output.push_back (Arg (s, Arg::type_number, Arg::cat_id));
found_sequence = true;
}
}
else if (is_uuid (n, s)) else if (is_uuid (n, s))
{ {
if (found_something_after_sequence) if (found_something_after_sequence)
@ -815,6 +803,19 @@ const A3 A3::tokenize (const A3& input) const
} }
} }
else if (is_id (n, s))
{
if (found_something_after_sequence)
{
output.push_back (Arg (s, Arg::type_number, Arg::cat_literal));
}
else
{
output.push_back (Arg (s, Arg::type_number, Arg::cat_id));
found_sequence = true;
}
}
else if (is_number (n, s)) else if (is_number (n, s))
{ {
output.push_back (Arg (s, Arg::type_number, Arg::cat_literal)); output.push_back (Arg (s, Arg::type_number, Arg::cat_literal));