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

Feature #1423

Browse source 
- #1423 sync vs. push, pull, merge collision avoidance.
This commit is contained in:
Paul Beckingham 2013-11-03 12:04:21 -05:00
parent 56d8734e1a
commit 8c9bc99af6
7 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/commands/CmdShow.cpp
View file

@ -168,7 +168,7 @@ int CmdShow::execute (std::string& output)
" list.all.tags"
" locale"
" locking"
" merge.autopush"
" merge.autopush" // Deprecated 2.3.0
" merge.default.uri" // Deprecated 2.3.0
" monthsperline"
" nag"
@ -300,19 +300,7 @@ int CmdShow::execute (std::string& output)
color = warning;
}
// TODO Deprecated.
std::string value = i->second;
// hide sensible information
if ((i->first.substr (0, 5) == "push." ||
i->first.substr (0, 5) == "pull." ||
i->first.substr (0, 6) == "merge.") &&
(i->first.find (".uri") != std::string::npos))
{
Uri uri (value);
uri.parse ();
value = uri.ToString ();
}
int row = view.addRow ();
view.set (row, 0, i->first, color);
view.set (row, 1, value, color);

7
src/commands/CmdSync.cpp
View file

@ -78,6 +78,13 @@ int CmdSync::execute (std::string& output)
connection.rfind (':') == std::string::npos)
throw std::string (STRING_CMD_SYNC_NO_SERVER);
// If push/pull/merge is configured, quit.
if (context.config.get ("merge.autopush") != "" ||
context.config.get ("merge.default.uri") != "" ||
context.config.get ("push.default.uri") != "" ||
context.config.get ("pull.default.uri") != "")
throw std::string (STRING_CMD_SYNC_NOMERGE);
// Obtain credentials.
std::string credentials_string = context.config.get ("taskd.credentials");
if (credentials_string == "")