diff options
Diffstat (limited to 'gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java')
-rw-r--r-- | gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java index 712702716d..f06946fd87 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java @@ -28,20 +28,18 @@ import com.google.gerrit.pgm.util.Die; import com.google.gerrit.pgm.util.ErrorLogFile; import com.google.gerrit.pgm.util.IoUtil; import com.google.gerrit.pgm.util.SiteProgram; -import com.google.gerrit.reviewdb.ReviewDb; +import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.server.config.SitePath; import com.google.gerrit.server.config.SitePaths; -import com.google.gerrit.server.git.GitProjectImporter; import com.google.gerrit.server.git.GitRepositoryManager; -import com.google.gerrit.server.git.LocalDiskRepositoryManager; import com.google.gerrit.server.schema.SchemaUpdater; import com.google.gerrit.server.schema.UpdateUI; import com.google.gerrit.server.util.HostPlatform; -import com.google.gwtorm.client.OrmException; -import com.google.gwtorm.client.SchemaFactory; -import com.google.gwtorm.client.StatementExecutor; import com.google.gwtorm.jdbc.JdbcExecutor; import com.google.gwtorm.jdbc.JdbcSchema; +import com.google.gwtorm.server.OrmException; +import com.google.gwtorm.server.SchemaFactory; +import com.google.gwtorm.server.StatementExecutor; import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -62,9 +60,6 @@ public class Init extends SiteProgram { @Option(name = "--batch", usage = "Batch mode; skip interactive prompting") private boolean batchMode; - @Option(name = "--import-projects", usage = "Import git repositories as projects") - private boolean importProjects; - @Option(name = "--no-auto-start", usage = "Don't automatically start daemon after init") private boolean noAutoStart; @@ -73,7 +68,6 @@ public class Init extends SiteProgram { ErrorLogFile.errorOnlyConsole(); final SiteInit init = createSiteInit(); - init.flags.importProjects = importProjects; init.flags.autoStart = !noAutoStart && init.site.isNew; final SiteRun run; @@ -83,7 +77,6 @@ public class Init extends SiteProgram { run = createSiteRun(init); run.upgradeSchema(); - run.importGit(); } catch (Exception failure) { if (init.flags.deleteOnFailure) { recursiveDelete(getSitePath()); @@ -166,7 +159,6 @@ public class Init extends SiteProgram { final SchemaUpdater schemaUpdater; final SchemaFactory<ReviewDb> schema; final GitRepositoryManager repositoryManager; - final GitProjectImporter gitProjectImporter; final Browser browser; @Inject @@ -174,14 +166,13 @@ public class Init extends SiteProgram { final SchemaUpdater schemaUpdater, final SchemaFactory<ReviewDb> schema, final GitRepositoryManager repositoryManager, - final GitProjectImporter gitProjectImporter, final Browser browser) { + final Browser browser) { this.ui = ui; this.site = site; this.flags = flags; this.schemaUpdater = schemaUpdater; this.schema = schema; this.repositoryManager = repositoryManager; - this.gitProjectImporter = gitProjectImporter; this.browser = browser; } @@ -241,23 +232,6 @@ public class Init extends SiteProgram { } } - void importGit() throws OrmException, IOException { - if (flags.importProjects) { - gitProjectImporter.run(new GitProjectImporter.Messages() { - @Override - public void info(String msg) { - System.err.println(msg); - System.err.flush(); - } - - @Override - public void warning(String msg) { - info(msg); - } - }); - } - } - void start() throws Exception { if (flags.autoStart) { if (HostPlatform.isWin32()) { @@ -317,9 +291,6 @@ public class Init extends SiteProgram { protected void configure() { bind(ConsoleUI.class).toInstance(init.ui); bind(InitFlags.class).toInstance(init.flags); - - bind(GitRepositoryManager.class).to(LocalDiskRepositoryManager.class); - bind(GitProjectImporter.class); } }); return createDbInjector(SINGLE_USER).createChildInjector(modules); |