From aa4e79f5486a1b7a8ac6976e78d3a9b77a5fd04c Mon Sep 17 00:00:00 2001
From: Shawn Pearce <sop@google.com>
Date: Sun, 1 Dec 2013 01:23:52 +0000
Subject: [PATCH] Revert "Add init step for installing the 'Verified' label"

This reverts commit 0a7f8e79eb9e8d54739d8d3c40dea93e789b5801.
New site initialization is broken with InitLabels in the environment.

Change-Id: Ied28bc2e990f21df20265675afadaef9dae0890d
---
 .../gerrit/pgm/init/AllProjectsConfig.java    | 11 +---
 .../google/gerrit/pgm/init/InitLabels.java    | 55 -------------------
 .../google/gerrit/pgm/init/InitModule.java    |  1 -
 3 files changed, 2 insertions(+), 65 deletions(-)
 delete mode 100644 gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java

diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsConfig.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsConfig.java
index e7f287d32e..45ca87bb0c 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsConfig.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/AllProjectsConfig.java
@@ -84,16 +84,7 @@ public class AllProjectsConfig extends VersionedMetaData {
     throw new UnsupportedOperationException();
   }
 
-  void save(String message) throws IOException {
-    save(new PersonIdent("Gerrit Initialization", "init@gerrit"), message);
-  }
-
   public void save(String pluginName, String message) throws IOException {
-    save(new PersonIdent(pluginName, pluginName + "@gerrit"),
-        "Update from plugin " + pluginName + ": " + message);
-  }
-
-  private void save(PersonIdent ident, String msg) throws IOException {
     Repository repo = new FileRepository(path);
     try {
       inserter = repo.newObjectInserter();
@@ -110,6 +101,8 @@ public class AllProjectsConfig extends VersionedMetaData {
             return;
           }
 
+          PersonIdent ident = new PersonIdent(pluginName, pluginName + "@gerrit");
+          String msg = "Update from plugin " + pluginName + ": " + message;
           CommitBuilder commit = new CommitBuilder();
           commit.setAuthor(ident);
           commit.setCommitter(ident);
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java
deleted file mode 100644
index 8a83c57586..0000000000
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitLabels.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.pgm.init;
-
-import com.google.gerrit.pgm.util.ConsoleUI;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import org.eclipse.jgit.lib.Config;
-
-import java.util.Arrays;
-
-@Singleton
-public class InitLabels implements InitStep {
-  private static final String KEY_LABEL = "label";
-  private static final String KEY_FUNCTION = "function";
-  private static final String KEY_VALUE = "value";
-  private static final String LABEL_VERIFIED = "Verified";
-
-  private final ConsoleUI ui;
-  private final AllProjectsConfig allProjectsConfig;
-
-  @Inject
-  InitLabels(ConsoleUI ui, AllProjectsConfig allProjectsConfig) {
-    this.ui = ui;
-    this.allProjectsConfig = allProjectsConfig;
-  }
-
-  @Override
-  public void run() throws Exception {
-    Config cfg = allProjectsConfig.load();
-    if (!cfg.getSubsections(KEY_LABEL).contains(LABEL_VERIFIED)) {
-      ui.header("Review Labels");
-      boolean enabled = ui.yesno(false, "Install Verified label");
-      if (enabled) {
-        cfg.setString(KEY_LABEL, LABEL_VERIFIED, KEY_FUNCTION, "MaxWithBlock");
-        cfg.setStringList(KEY_LABEL, LABEL_VERIFIED, KEY_VALUE,
-            Arrays.asList(new String[] {"-1 Fails", " 0 No score", "+1 Verified"}));
-        allProjectsConfig.save("Review Label Initialization");
-      }
-    }
-  }
-}
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitModule.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitModule.java
index 45cdeaaefb..7a64b8fb41 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitModule.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitModule.java
@@ -48,7 +48,6 @@ public class InitModule extends FactoryModule {
     }
     step().to(InitIndex.class);
     step().to(InitAuth.class);
-    step().to(InitLabels.class);
     step().to(InitSendEmail.class);
     if (standalone) {
       step().to(InitContainer.class);