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

Merge branch '2.0.0' of tasktools.org:task into 2.0.0

Browse source 
Conflicts:
	doc/ref/task-ref.pages
	doc/ref/task-ref.pdf
This commit is contained in:
Paul Beckingham 2011-10-06 22:58:10 -04:00
commit d0d2bba614
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -203,6 +203,7 @@
description. They are now stripped (thanks to Aikido Guy). description. They are now stripped (thanks to Aikido Guy).
+ Fixed bug #856, which prevented filters on missing project from working + Fixed bug #856, which prevented filters on missing project from working
(thanks to Michelle Crane). (thanks to Michelle Crane).
+ Fixed bug #862, which suppressed feedback from the 'denotate' command.
# 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.

12
doc/CMakeLists.txt
View file

@ -7,8 +7,10 @@ foreach (man_FILE ${man_FILES})
man/${man_FILE}) man/${man_FILE})
endforeach (man_FILE) endforeach (man_FILE)
install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN1DIR} install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN1DIR}
FILES_MATCHING PATTERN "*.1") FILES_MATCHING PATTERN "*.1")
install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN5DIR} install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/man/ DESTINATION ${TASK_MAN5DIR}
FILES_MATCHING PATTERN "*.5") FILES_MATCHING PATTERN "*.5")
install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc DESTINATION ${TASK_DOCDIR}) install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rc DESTINATION ${TASK_DOCDIR})
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/ref/task-ref.pdf DESTINATION ${TASK_DOCDIR})

2
src/commands/CmdDenotate.cpp
View file

@ -95,6 +95,7 @@ int CmdDenotate::execute (std::string& output)
if (i->second == pattern) if (i->second == pattern)
{ {
match = true; match = true;
anno = i->second;
annotations.erase (i); annotations.erase (i);
task->setAnnotations (annotations); task->setAnnotations (annotations);
break; break;
@ -107,6 +108,7 @@ int CmdDenotate::execute (std::string& output)
std::string::size_type loc = find (i->second, pattern, sensitive); std::string::size_type loc = find (i->second, pattern, sensitive);
if (loc != std::string::npos) if (loc != std::string::npos)
{ {
anno = i->second;
annotations.erase (i); annotations.erase (i);
task->setAnnotations (annotations); task->setAnnotations (annotations);
break; break;