From a7328a438ed26dc0d74238a575c118ca82892b5e Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 18 Jun 2016 21:28:19 +0200
Subject: Rename cfg-{add,fetch} to rep-{add,fetch} (aliases stay same)

The rationale: we now need the 'add' command for certificates (i.e., add a
trusted certificate to the configuration). In the old naming scheme we would
have to call it cfg-add which is already taken. In the new scheme we will call
it crt-add.
---
 bpkg/bpkg.cxx | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'bpkg/bpkg.cxx')

diff --git a/bpkg/bpkg.cxx b/bpkg/bpkg.cxx
index c94dde9..561e32e 100644
--- a/bpkg/bpkg.cxx
+++ b/bpkg/bpkg.cxx
@@ -16,6 +16,8 @@
 //
 #include <bpkg/help>
 
+#include <bpkg/cfg-create>
+
 #include <bpkg/pkg-build>
 #include <bpkg/pkg-clean>
 #include <bpkg/pkg-configure>
@@ -31,12 +33,10 @@
 #include <bpkg/pkg-update>
 #include <bpkg/pkg-verify>
 
-#include <bpkg/cfg-add>
-#include <bpkg/cfg-create>
-#include <bpkg/cfg-fetch>
-
-#include <bpkg/rep-info>
+#include <bpkg/rep-add>
 #include <bpkg/rep-create>
+#include <bpkg/rep-fetch>
+#include <bpkg/rep-info>
 
 using namespace std;
 using namespace bpkg;
@@ -205,6 +205,12 @@ try
       break;                                                            \
     }
 
+    // cfg-* commands
+    //
+#define CFG_COMMAND(CMD) COMMAND_IMPL(cfg_, "cfg-", CMD)
+
+    CFG_COMMAND (create);
+
     // pkg-* commands
     //
 #define PKG_COMMAND(CMD) COMMAND_IMPL(pkg_, "pkg-", CMD)
@@ -224,20 +230,14 @@ try
     PKG_COMMAND (update);
     PKG_COMMAND (verify);
 
-    // cfg-* commands
-    //
-#define CFG_COMMAND(CMD) COMMAND_IMPL(cfg_, "cfg-", CMD)
-
-    CFG_COMMAND (add);
-    CFG_COMMAND (create);
-    CFG_COMMAND (fetch);
-
     // rep-* commands
     //
 #define REP_COMMAND(CMD) COMMAND_IMPL(rep_, "rep-", CMD)
 
-    REP_COMMAND (info);
+    REP_COMMAND (add);
     REP_COMMAND (create);
+    REP_COMMAND (fetch);
+    REP_COMMAND (info);
 
     assert (false);
     fail << "unhandled command";
-- 
cgit v1.1