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

TW-1257

Browse source 
- TW-1257 The 'Syncing with <host>:<port>' message ignores verbosity tokens.
This commit is contained in:
Paul Beckingham 2014-04-12 14:01:48 -04:00
parent 501194abfa
commit 1922c4f6a4
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -23,6 +23,7 @@
Weber) Weber)
- TW-261 Easy to create "not deletable" task (thanks to Jan Kunder). - TW-261 Easy to create "not deletable" task (thanks to Jan Kunder).
- TW-1255 New testing framework (thanks to Renato Alves). - TW-1255 New testing framework (thanks to Renato Alves).
- TW-1257 The 'Syncing with <host>:<port>' message ignores verbosity tokens.
- TW-1258 Portuguese Localization (thanks to Renato Alves). - TW-1258 Portuguese Localization (thanks to Renato Alves).
- TW-1260 New virtual tags YESTERDAY, TOMORROW. - TW-1260 New virtual tags YESTERDAY, TOMORROW.
- TW-1261 Migrate test bug.360.t to new unit testing framework (thanks to - TW-1261 Migrate test bug.360.t to new unit testing framework (thanks to

2
doc/man/taskrc.5.in
View file

@ -253,7 +253,7 @@ control specific occasions when output is generated. This list may contain:
edit Used the verbose template for the 'edit' command edit Used the verbose template for the 'edit' command
special Feedback when applying special tags special Feedback when applying special tags
project Feedback about project status changes project Feedback about project status changes
sync Feedback about the need for sync sync Feedback about sync
Note that the "on" setting is equivalent to all the tokens being specified, Note that the "on" setting is equivalent to all the tokens being specified,
and the "nothing" setting is equivalent to none of the tokens being specified. and the "nothing" setting is equivalent to none of the tokens being specified.

34
src/commands/CmdSync.cpp
View file

@ -149,8 +149,9 @@ int CmdSync::execute (std::string& output)
request.setPayload (payload); request.setPayload (payload);
out << format (STRING_CMD_SYNC_PROGRESS, connection) if (context.verbose ("sync"))
<< "\n"; out << format (STRING_CMD_SYNC_PROGRESS, connection)
<< "\n";
// Ignore harmful signals. // Ignore harmful signals.
signal (SIGHUP, SIG_IGN); signal (SIGHUP, SIG_IGN);
@ -196,22 +197,24 @@ int CmdSync::execute (std::string& output)
Task dummy; Task dummy;
if (context.tdb2.get (uuid, dummy)) if (context.tdb2.get (uuid, dummy))
{ {
out << " " if (context.verbose ("sync"))
<< colorChanged.colorize ( out << " "
format (STRING_CMD_SYNC_MOD, << colorChanged.colorize (
uuid, format (STRING_CMD_SYNC_MOD,
from_server.get ("description"))) uuid,
<< "\n"; from_server.get ("description")))
<< "\n";
context.tdb2.modify (from_server, false); context.tdb2.modify (from_server, false);
} }
else else
{ {
out << " " if (context.verbose ("sync"))
<< colorAdded.colorize ( out << " "
format (STRING_CMD_SYNC_ADD, << colorAdded.colorize (
uuid, format (STRING_CMD_SYNC_ADD,
from_server.get ("description"))) uuid,
<< "\n"; from_server.get ("description")))
<< "\n";
context.tdb2.add (from_server, false); context.tdb2.add (from_server, false);
} }
} }
@ -297,7 +300,8 @@ int CmdSync::execute (std::string& output)
status = 1; status = 1;
} }
out << "\n"; if (context.verbose ("sync"))
out << "\n";
output = out.str (); output = out.str ();
// Restore signal handling. // Restore signal handling.