mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
Feature #934
- Feature #934, supports 'reserved.lines' to indicate a multi-line prompt for use in conjunction with 'limit:page' (thanks to Robert Gill). - Removed 'locale' from the taskrc.5 man page. - Added verbosity token 'sync'. - Fixed bug in size calculation for 'limit:page', but there is still one more. - Corrected unit test limit.t given the above fix.
This commit is contained in:
parent
9cbd729553
commit
c5ff24358c
11 changed files with 62 additions and 12 deletions
|
@ -145,9 +145,11 @@ int CmdCustom::execute (std::string& output)
|
|||
|
||||
// Adjust for fluff in the output.
|
||||
if (maxlines)
|
||||
maxlines -= (context.verbose ("blank") ? 1 : 0)
|
||||
+ table_header
|
||||
+ 1; // "X tasks shown ..."
|
||||
maxlines -= table_header
|
||||
+ (context.verbose ("blank") ? 1 : 0)
|
||||
+ (context.verbose ("footnote") ? context.footnotes.size () : 0)
|
||||
+ (context.verbose ("affected") ? 1 : 0)
|
||||
+ context.config.getInteger ("reserved.lines"); // For prompt, etc.
|
||||
|
||||
// Render.
|
||||
std::stringstream out;
|
||||
|
@ -183,6 +185,7 @@ int CmdCustom::execute (std::string& output)
|
|||
rc = 1;
|
||||
}
|
||||
|
||||
feedback_backlog ();
|
||||
context.tdb2.commit ();
|
||||
output = out.str ();
|
||||
return rc;
|
||||
|
|
|
@ -178,6 +178,7 @@ int CmdShow::execute (std::string& output)
|
|||
" recurrence.indicator"
|
||||
" recurrence.limit"
|
||||
" regex"
|
||||
" reserved.lines"
|
||||
" row.padding"
|
||||
" rule.precedence.color"
|
||||
" search.case.sensitive"
|
||||
|
|
|
@ -60,6 +60,9 @@ int CmdSync::execute (std::string& output)
|
|||
|
||||
// Obtain credentials.
|
||||
std::string credentials_string = context.config.get ("taskd.credentials");
|
||||
if (credentials_string == "")
|
||||
throw std::string (STRING_CMD_SYNC_BAD_CRED);
|
||||
|
||||
std::vector <std::string> credentials;
|
||||
split (credentials, credentials_string, "/");
|
||||
if (credentials.size () != 3)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue