diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2018-03-12 11:17:21 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-03-12 11:17:21 +0200 |
commit | 5dcbecfd8b83f516c067780214f06321f03d1cce (patch) | |
tree | 20dcd6d7c602c4fcc7432f46336086156c929067 /bdep/init.cxx | |
parent | 4d181c3aad97f8ee224666ce5c757036c5f610d5 (diff) |
Initial sync implementation
Diffstat (limited to 'bdep/init.cxx')
-rw-r--r-- | bdep/init.cxx | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/bdep/init.cxx b/bdep/init.cxx index 1e864eb..a86079f 100644 --- a/bdep/init.cxx +++ b/bdep/init.cxx @@ -4,18 +4,20 @@ #include <bdep/init.hxx> -#include <bdep/config.hxx> #include <bdep/project.hxx> #include <bdep/project-odb.hxx> #include <bdep/database.hxx> #include <bdep/diagnostics.hxx> +#include <bdep/sync.hxx> +#include <bdep/config.hxx> + using namespace std; namespace bdep { int - cmd_init (const cmd_init_options& o, cli::scanner& args) + cmd_init (const cmd_init_options& o, cli::scanner&) { tracer trace ("init"); @@ -39,7 +41,7 @@ namespace bdep // Open the database creating it if necessary. // - database db (open (pp.project, trace, true /* create */)); + database db (open (prj, trace, true /* create */)); // --empty // @@ -117,6 +119,7 @@ namespace bdep // Initialize each package in each configuration skipping those that are // already initialized. Do each configuration in a separate transaction so // that our state reflects the bpkg configuration as closely as possible. + // Then synchronize each configuration. // for (const shared_ptr<configuration>& c: cfgs) { @@ -127,7 +130,7 @@ namespace bdep // run_bpkg (o, "add", - "-d", c->path, + "-d", c->path, "--type", "dir", prj); @@ -140,8 +143,10 @@ namespace bdep return p.name == s.name; }) != c->packages.end ()) { - info << "package " << p.name << " is already initialized " - << "in configuration " << *c; + if (verb) + info << "package " << p.name << " is already initialized " + << "in configuration " << *c; + continue; } @@ -150,6 +155,10 @@ namespace bdep db.update (c); t.commit (); + + //@@ --no-sync for some reason? + // + cmd_sync (o, prj, c); } //@@ TODO: print project/package(s) being initialized. |