gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Bug #1137

Browse Source 
- Fixed bug #1137, which caused file locks to be non-blocking (thanks to Steve
  Rader).
This commit is contained in:
Paul Beckingham
2013-02-10 23:25:27 -05:00
parent adacb96581
commit 2be52e1be2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -74,6 +74,8 @@ Bugs
left-justified (thanks to Steve Rader). left-justified (thanks to Steve Rader).
+ Fixed bug #1136, #1177, which incorrectly line-wrapped tasks with annotations + Fixed bug #1136, #1177, which incorrectly line-wrapped tasks with annotations
(thanks to Steve Rader, T. Charles Yun). (thanks to Steve Rader, T. Charles Yun).
+ Fixed bug #1137, which caused file locks to be non-blocking (thanks to Steve
Rader).
+ Fixed bug #1150, which referenced deprecated features in the tutorial man + Fixed bug #1150, which referenced deprecated features in the tutorial man
page (thanks to Benjamin Weber). page (thanks to Benjamin Weber).
+ Fixed bug #1154, which now allows priorities to be specified in any case. + Fixed bug #1154, which now allows priorities to be specified in any case.

1
src/Context.cpp
View File

@@ -538,6 +538,7 @@ void Context::shadow ()
" rc.detection:off" + // No need to determine terminal size " rc.detection:off" + // No need to determine terminal size
" rc.color:off" + // Color off by default " rc.color:off" + // Color off by default
" rc.gc:off " + // GC off, to reduce headaches " rc.gc:off " + // GC off, to reduce headaches
" rc.locking:off" + // No file locking
" rc:" + rcfile + " " + // Use specified rc file " rc:" + rcfile + " " + // Use specified rc file
command + // User specified command command + // User specified command
" >" + // Capture " >" + // Capture

4
src/TDB2.cpp
View File

@@ -210,7 +210,7 @@ void TF2::commit ()
if (_file.open ()) if (_file.open ())
{ {
if (context.config.getBoolean ("locking")) if (context.config.getBoolean ("locking"))
_file.lock (); _file.waitForLock ();
// Write out all the added tasks. // Write out all the added tasks.
std::vector <Task>::iterator task; std::vector <Task>::iterator task;
@@ -333,7 +333,7 @@ void TF2::load_lines ()
if (_file.open ()) if (_file.open ())
{ {
if (context.config.getBoolean ("locking")) if (context.config.getBoolean ("locking"))
_file.lock (); _file.waitForLock ();
_file.read (_lines); _file.read (_lines);
_loaded_lines = true; _loaded_lines = true;