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

Bug #704

Browse source 
- Polished journal messages
This commit is contained in:
Cory Donnelly 2011-03-14 21:35:51 -04:00
parent 18f82c1207
commit d3447165c8
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/util.cpp
View file

@ -471,20 +471,20 @@ std::string taskInfoDifferences (const Task& before, const Task& after)
std::string from; std::string from;
join (from, ",", deps_before); join (from, ",", deps_before);
out << "dependencies '" out << "Dependencies '"
<< from << from
<< "' deleted\n"; << "' deleted.\n";
} }
else if (name->substr (0, 11) == "annotation_") else if (name->substr (0, 11) == "annotation_")
{ {
out << "annotation '" out << "Annotation '"
<< before.get (*name) << before.get (*name)
<< "' deleted"; << "' deleted.\n";
} }
else else
{ {
out << *name out << ucFirst (*name)
<< " deleted\n"; << " deleted.\n";
} }
} }
@ -497,22 +497,22 @@ std::string taskInfoDifferences (const Task& before, const Task& after)
std::string to; std::string to;
join (to, ",", deps_after); join (to, ",", deps_after);
out << *name out << ucFirst(*name)
<< " set to '" << " set to '"
<< to << to
<< "'\n"; << "'.\n";
} }
else if (name->substr (0, 11) == "annotation_") else if (name->substr (0, 11) == "annotation_")
{ {
out << "annotation added '" out << "Annotation of '"
<< after.get (*name) << after.get (*name)
<< "'\n"; << "' added.\n";
} }
else else
out << *name out << ucFirst(*name)
<< " set to '" << " set to '"
<< renderAttribute (*name, after.get (*name)) << renderAttribute (*name, after.get (*name))
<< "'\n"; << "'.\n";
} }
foreach (name, beforeAtts) foreach (name, beforeAtts)
@ -531,26 +531,26 @@ std::string taskInfoDifferences (const Task& before, const Task& after)
std::string to; std::string to;
join (to, ",", deps_after); join (to, ",", deps_after);
out << *name out << ucFirst(*name)
<< " changed from '" << " changed from '"
<< from << from
<< "' to '" << "' to '"
<< to << to
<< "'\n"; << "'.\n";
} }
else if (name->substr (0, 11) == "annotation_") else if (name->substr (0, 11) == "annotation_")
{ {
out << "annotation '" out << "Annotation changed to '"
<< after.get (*name) << after.get (*name)
<< "'\n"; << "'.\n";
} }
else else
out << *name out << ucFirst(*name)
<< " changed from '" << " changed from '"
<< renderAttribute (*name, before.get (*name)) << renderAttribute (*name, before.get (*name))
<< "' to '" << "' to '"
<< renderAttribute (*name, after.get (*name)) << renderAttribute (*name, after.get (*name))
<< "'\n"; << "'.\n";
} }

2
test/feature.608.t
View file

@ -49,7 +49,7 @@ qx{../src/task rc:bug.rc done 1};
# Check to ensure task was stopped # Check to ensure task was stopped
my $output = qx{../src/task rc:bug.rc info 1}; my $output = qx{../src/task rc:bug.rc info 1};
like ($output, qr/end set to/ms, 'Done command also stops started task.'); like ($output, qr/End set to/ms, 'Done command also stops started task.');
# Cleanup. # Cleanup.
unlink 'pending.data'; unlink 'pending.data';

4
test/sequence.t
View file

@ -75,9 +75,9 @@ $output = qx{../src/task rc:seq.rc info 2};
like ($output, qr/Start/, 'sequence start 2'); like ($output, qr/Start/, 'sequence start 2');
qx{../src/task rc:seq.rc stop 1,2}; qx{../src/task rc:seq.rc stop 1,2};
$output = qx{../src/task rc:seq.rc info 1}; $output = qx{../src/task rc:seq.rc info 1};
unlike ($output, qr/Start/, 'sequence stop 1'); like ($output, qr/Start\sdeleted/, 'sequence stop 1');
$output = qx{../src/task rc:seq.rc info 2}; $output = qx{../src/task rc:seq.rc info 2};
unlike ($output, qr/Start/, 'sequence stop 2'); like ($output, qr/Start\sdeleted/, 'sequence stop 2');
# Test sequences in modify # Test sequences in modify
qx{../src/task rc:seq.rc 1,2 +tag}; qx{../src/task rc:seq.rc 1,2 +tag};