Code Cleanup

- Removed deprecated 'push', 'pull' and 'merge' commands.
2014-01-18 19:12:48 -05:00
parent 341c2fb474
commit 8b736934d7
47 changed files with 22 additions and 3941 deletions
--- a/src/commands/CmdSync.cpp
+++ b/src/commands/CmdSync.cpp
@@ -78,13 +78,6 @@ 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 == "")