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

Bug #1118

Browse source 
- Fixed bug #1118, which dropped changes after edits were rejected (thanks to
  Ben Boeckel).
This commit is contained in:
Paul Beckingham 2013-01-12 17:30:28 -05:00
parent dd1f154376
commit 8271e973d8
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -60,6 +60,8 @@ Bugs
+ Fixed bug #1091, allowing filters to use 'urgency.over:4.5'. + Fixed bug #1091, allowing filters to use 'urgency.over:4.5'.
+ Fixed bug #1110, which did not treat 'status:Completed' the same + Fixed bug #1110, which did not treat 'status:Completed' the same
as 'status:completed' (thanks to Aikido Guy). as 'status:completed' (thanks to Aikido Guy).
+ Fixed bug #1118, which dropped changes after edits were rejected (thanks to
Ben Boeckel).
+ Fixed bug #1123, which caused the undo of a 'log' command to corrupt the data + Fixed bug #1123, which caused the undo of a 'log' command to corrupt the data
file (thanks to Tim None). file (thanks to Tim None).
+ Fixed bug #1128, which caused 'age' columns to be right-justified instead of + Fixed bug #1128, which caused 'age' columns to be right-justified instead of

3
src/commands/CmdEdit.cpp
View file

@ -772,6 +772,7 @@ bool CmdEdit::editFile (Task& task)
// Format the contents, T -> text, write to a file. // Format the contents, T -> text, write to a file.
std::string before = formatTask (task, dateformat); std::string before = formatTask (task, dateformat);
std::string before_orig = before;
File::write (file.str (), before); File::write (file.str (), before);
// Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi // Determine correct editor: .taskrc:editor > $VISUAL > $EDITOR > vi
@ -802,7 +803,7 @@ ARE_THESE_REALLY_HARMFUL:
// Update task based on what can be parsed back out of the file, but only // Update task based on what can be parsed back out of the file, but only
// if changes were made. // if changes were made.
if (before != after) if (before_orig != after)
{ {
std::cout << STRING_EDIT_CHANGES << "\n"; std::cout << STRING_EDIT_CHANGES << "\n";
std::string problem = ""; std::string problem = "";