#
#
# patch "cmd.hh"
#  from [359aed34af4f3472410fbce80f9637eb20efb551]
#    to [32ad2a9b93c474f4107bcbf1f0cedca2a4677edc]
# 
# patch "cmd_automate.cc"
#  from [7d41b05ca58eba4d17eee85c91106cec99a61407]
#    to [92da537e5989874f8efd54423dd81b4d46556a1c]
# 
# patch "cmd_db.cc"
#  from [ba66fcc874a0d6d53ec65f4ec2a1055e3ddc9f91]
#    to [c7b504ae0eb20d2600eb6f3fd45b0e1be2af0bd5]
# 
# patch "cmd_list.cc"
#  from [b65a77480398df56c35f64b4a01a386f1f3422d0]
#    to [a71212055c82c33b7f6c47117b449196f413e7ed]
# 
# patch "commands.cc"
#  from [526ef342799e488b6002c2c9ea8913828bf3e39a]
#    to [36e28627d32f6f08100c167b5b6052b49104eba8]
#
============================================================
--- cmd.hh	359aed34af4f3472410fbce80f9637eb20efb551
+++ cmd.hh	32ad2a9b93c474f4107bcbf1f0cedca2a4677edc
@@ -187,15 +187,14 @@ void commands::cmd_ ## C::exec(app_state
 #define CMD_HIDDEN(C, aliases, parent, params, abstract, desc, opts) \
   _CMD2(C, aliases, parent, true, params, abstract, desc, opts)
 
-// XXX Should the 'opts' parameter go away?
-#define CMD_GROUP(C, aliases, parent, abstract, desc, opts)          \
+#define CMD_GROUP(C, aliases, parent, abstract, desc)                \
 namespace commands {                                                 \
   class cmd_ ## C : public command                                   \
   {                                                                  \
   public:                                                            \
     cmd_ ## C() : command(#C, aliases, parent, false, "", abstract,  \
                           desc, true,                                \
-                          options::options_type() | opts)            \
+                          options::options_type())                   \
     {}                                                               \
     virtual void exec(app_state & app,                               \
                       command_id const & execid,                     \
============================================================
--- cmd_automate.cc	7d41b05ca58eba4d17eee85c91106cec99a61407
+++ cmd_automate.cc	92da537e5989874f8efd54423dd81b4d46556a1c
@@ -24,8 +24,7 @@ CMD_GROUP(automate, "", CMD_REF(automati
 
 CMD_GROUP(automate, "", CMD_REF(automation),
           N_("Interface for scripted execution"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 
 namespace commands {
   automate::automate(string const & name,
============================================================
--- cmd_db.cc	ba66fcc874a0d6d53ec65f4ec2a1055e3ddc9f91
+++ cmd_db.cc	c7b504ae0eb20d2600eb6f3fd45b0e1be2af0bd5
@@ -26,8 +26,7 @@ CMD_GROUP(db, "", CMD_REF(database),
 
 CMD_GROUP(db, "", CMD_REF(database),
           N_("Deals with the database"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 
 // Deletes a revision from the local database.  This can be used to
 // 'undo' a changed revision from a local database without leaving
============================================================
--- cmd_list.cc	b65a77480398df56c35f64b4a01a386f1f3422d0
+++ cmd_list.cc	a71212055c82c33b7f6c47117b449196f413e7ed
@@ -44,8 +44,7 @@ CMD_GROUP(list, "ls", CMD_REF(informativ
           N_("This command is used to query information from the database.  "
              "It shows database objects, or the current workspace manifest, "
              "or known, unknown, intentionally ignored, missing, or "
-             "changed-state files."),
-          options::opts::none);
+             "changed-state files."));
 
 CMD(certs, "", CMD_REF(list), "ID",
     N_("Lists certificates attached to an identifier"),
============================================================
--- commands.cc	526ef342799e488b6002c2c9ea8913828bf3e39a
+++ commands.cc	36e28627d32f6f08100c167b5b6052b49104eba8
@@ -39,7 +39,7 @@ using std::vector;
 using std::strlen;
 using std::vector;
 
-CMD_GROUP(__root__, "", NULL, N_(""), N_(""), options::opts::none);
+CMD_GROUP(__root__, "", NULL, N_(""), N_(""));
 
 //
 // Definition of top-level commands, used to classify the real commands
@@ -55,52 +55,40 @@ CMD_GROUP(automation, "", CMD_REF(__root
 //
 CMD_GROUP(automation, "", CMD_REF(__root__),
           N_("Commands that aid in scripted execution"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(database, "", CMD_REF(__root__),
           N_("Commands that manipulate the database"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(debug, "", CMD_REF(__root__),
           N_("Commands that aid in program debugging"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(informative, "", CMD_REF(__root__),
           N_("Commands for information retrieval"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(key_and_cert, "", CMD_REF(__root__),
           N_("Commands to manage keys and certificates"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(network, "", CMD_REF(__root__),
           N_("Commands that access the network"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(packet_io, "", CMD_REF(__root__),
           N_("Commands for packet reading and writing"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(rcs, "", CMD_REF(__root__),
           N_("Commands for interaction with RCS and CVS"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(review, "", CMD_REF(__root__),
           N_("Commands to review revisions"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(tree, "", CMD_REF(__root__),
           N_("Commands to manipulate the tree"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(variables, "", CMD_REF(__root__),
           N_("Commands to manage persistent variables"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 CMD_GROUP(workspace, "", CMD_REF(__root__),
           N_("Commands that deal with the workspace"),
-          N_(""),
-          options::opts::none);
+          N_(""));
 
 // this file defines the task-oriented "top level" commands which can be
 // issued as part of a monotone command line. the command line can only