opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.12'

Browse Source 
* stable-2.12:
  Buck: Remove non working local_jar rule and documentation
  CurrentSchemaVersion: Allow to use it in plugins
  Use REST implementation to list members for label with group operator
  Fix wrong date/time for commits in refs/users/default branch
  InitAdminUser: Don't assume the group ID of the Administrators group
  Move sendemail.allowRegisterNewEmail to auth.allowRegisterNewEmail
  Update 2.12 release notes
  Update 2.12 release notes
  Fix query for changes using a label with a group operator.
  Add !important back to .cm-searching and .cm-trailingspace
  HttpPluginServlet: Fix "short read of block" IO error on plugin docs
  HttpPluginServlet: Use try-with-resource in readWholeEntry
  StaticModule: Remove unused import
  Brings Gerrit docs back to life
  Correct docs since --name is not a valid option for create-project
  Make InternalChangeQuery.query public so it can be used by plugins
  InitPlugins: Suggest to upgrade installed plugins per default

Change-Id: I2d2d6c5e695e2c331d71853f03a96b0203b9d04b
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2015-12-02 18:04:09 +01:00
parent 004bf2a928 455ed9cd27
commit 92e4eb9404
21 changed files with 334 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitAdminUser.java
View File

@@ -25,6 +25,7 @@ import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountExternalId;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.AccountGroupMember;
import com.google.gerrit.reviewdb.client.AccountGroupName;
import com.google.gerrit.reviewdb.client.AccountSshKey;
import com.google.gerrit.reviewdb.client.AuthType;
import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -101,9 +102,11 @@ public class InitAdminUser implements InitStep {
a.setPreferredEmail(email);
db.accounts().insert(Collections.singleton(a));
AccountGroupName adminGroup = db.accountGroupNames().get(
new AccountGroup.NameKey("Administrators"));
AccountGroupMember m =
new AccountGroupMember(new AccountGroupMember.Key(id,
new AccountGroup.Id(1)));
adminGroup.getId()));
db.accountGroupMembers().insert(Collections.singleton(m));
if (sshKey != null) {

9
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
View File

@@ -112,17 +112,18 @@ public class InitPlugins implements InitStep {
String pluginName = plugin.name;
try {
final Path tmpPlugin = plugin.pluginPath;
Path p = site.plugins_dir.resolve(plugin.name + ".jar");
boolean upgrade = Files.exists(p);
if (!(initFlags.installPlugins.contains(pluginName) || ui.yesno(false,
if (!(initFlags.installPlugins.contains(pluginName) || ui.yesno(upgrade,
"Install plugin %s version %s", pluginName, plugin.version))) {
Files.deleteIfExists(tmpPlugin);
continue;
}
final Path p = site.plugins_dir.resolve(plugin.name + ".jar");
if (Files.exists(p)) {
if (upgrade) {
final String installedPluginVersion = getVersion(p);
if (!ui.yesno(false,
if (!ui.yesno(upgrade,
"version %s is already installed, overwrite it",
installedPluginVersion)) {
Files.deleteIfExists(tmpPlugin);