Deprecated Features

- Marked the push/pull/merge features as deprecated.

src/commands/CmdMerge.cpp

@@ -52,6 +52,8 @@ CmdMerge::CmdMerge ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdMerge::execute (std::string& output)
 {
+  context.footnote ("The 'merge' command is deprecated, and will be removed in a subsequent release.");
+
   // invoke gc and commit before merging in order to update data files
   context.tdb2.gc ();
   context.tdb2.commit ();

src/commands/CmdPull.cpp

@@ -50,6 +50,8 @@ CmdPull::CmdPull ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdPull::execute (std::string& output)
 {
+  context.footnote ("The 'pull' command is deprecated, and will be removed in a subsequent release.");
+
   std::vector <std::string> words = context.a3.extract_words ();
   std::string file;
   if (words.size ())

src/commands/CmdPush.cpp

@@ -52,6 +52,8 @@ CmdPush::CmdPush ()
 // Because this is potentially on another machine, no checking can be performed.
 int CmdPush::execute (std::string& output)
 {
+  context.footnote ("The 'push' command is deprecated, and will be removed in a subsequent release.");
+
   std::vector <std::string> words = context.a3.extract_words ();
   std::string file;
   if (words.size ())

src/commands/CmdShow.cpp

@@ -169,13 +169,13 @@ int CmdShow::execute (std::string& output)
     " locale"
     " locking"
     " merge.autopush"
-    " merge.default.uri"
+    " merge.default.uri"                 // Deprecated 2.3.0
     " monthsperline"
     " nag"
     " patterns"
     " print.empty.columns"
-    " pull.default.uri"
-    " push.default.uri"
+    " pull.default.uri"                  // Deprecated 2.3.0
+    " push.default.uri"                  // Deprecated 2.3.0
     " recurrence.indicator"
     " recurrence.limit"
     " regex"
@@ -297,6 +297,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."   ||

src/legacy.cpp

@@ -149,8 +149,14 @@ std::string legacyCheckForDeprecatedVariables ()
         it->first.substr (it->first.length () - 12) == ".annotations")
       deprecated.push_back (it->first);
 
-    if (it->first == "echo.command"      ||
-        it->first == "edit.verbose"      ||
+    // {push,pull,merge}.uri  Deprecated in 2.3.0
+    if ((it->first.substr (0, 5) == "push."   ||
+         it->first.substr (0, 5) == "pull."   ||
+         it->first.substr (0, 6) == "merge.") && (it->first.find (".uri") != std::string::npos))
+      deprecated.push_back (it->first);
+
+    if (it->first == "echo.command"      ||     // Deprecated in 2.0.0
+        it->first == "edit.verbose"      ||     // Deprecated in 2.0.0
         it->first == "next"              ||
         it->first == "annotations"       ||
         it->first == "export.ical.class")