opendev/gerrit
Code Issues Proposed changes

Merge changes Ib5711baa,I730e37bc

Browse Source 
* changes:
  Support inheriting project submit type
  Clarify behavior of "default" submit types
This commit is contained in:
David Pursehouse
2018-01-09 14:46:48 +00:00
committed by Gerrit Code Review
parent cfc035ee37 c8f8d2ea83
commit 075d316e03
27 changed files with 323 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/com/google/gerrit/server/git/ProjectConfig.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.server.git;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.gerrit.common.data.Permission.isPermission;
import static com.google.gerrit.reviewdb.client.Project.DEFAULT_SUBMIT_TYPE;
import com.google.common.base.CharMatcher;
import com.google.common.base.Joiner;
@@ -42,7 +43,6 @@ import com.google.gerrit.common.data.SubscribeSection;
import com.google.gerrit.common.errors.InvalidNameException;
import com.google.gerrit.extensions.client.InheritableBoolean;
import com.google.gerrit.extensions.client.ProjectState;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.BooleanProjectConfig;
import com.google.gerrit.reviewdb.client.Branch;
@@ -151,7 +151,6 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
private static final String PLUGIN = "plugin";
private static final SubmitType DEFAULT_SUBMIT_ACTION = SubmitType.MERGE_IF_NECESSARY;
private static final ProjectState DEFAULT_STATE_VALUE = ProjectState.ACTIVE;
private static final String EXTENSION_PANELS = "extension-panels";
@@ -519,7 +518,7 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
p.setMaxObjectSizeLimit(rc.getString(RECEIVE, null, KEY_MAX_OBJECT_SIZE_LIMIT));
p.setSubmitType(getEnum(rc, SUBMIT, null, KEY_ACTION, DEFAULT_SUBMIT_ACTION));
p.setSubmitType(getEnum(rc, SUBMIT, null, KEY_ACTION, DEFAULT_SUBMIT_TYPE));
p.setState(getEnum(rc, PROJECT, null, KEY_STATE, DEFAULT_STATE_VALUE));
p.setDefaultDashboard(rc.getString(DASHBOARD, null, KEY_DEFAULT));
@@ -1043,7 +1042,7 @@ public class ProjectConfig extends VersionedMetaData implements ValidationError.
KEY_MAX_OBJECT_SIZE_LIMIT,
validMaxObjectSizeLimit(p.getMaxObjectSizeLimit()));
set(rc, SUBMIT, null, KEY_ACTION, p.getSubmitType(), DEFAULT_SUBMIT_ACTION);
set(rc, SUBMIT, null, KEY_ACTION, p.getConfiguredSubmitType(), DEFAULT_SUBMIT_TYPE);
set(rc, PROJECT, null, KEY_STATE, p.getState(), DEFAULT_STATE_VALUE);

1
java/com/google/gerrit/server/git/strategy/SubmitDryRun.java
View File

@@ -133,6 +133,7 @@ public class SubmitDryRun {
return RebaseIfNecessary.dryRun(args, repo, tipCommit, toMergeCommit);
case REBASE_ALWAYS:
return RebaseAlways.dryRun(args, repo, tipCommit, toMergeCommit);
case INHERIT:
default:
String errorMsg = "No submit strategy for: " + submitType;
log.error(errorMsg);

1
java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java
View File

@@ -96,6 +96,7 @@ public class SubmitStrategyFactory {
return new RebaseIfNecessary(args);
case REBASE_ALWAYS:
return new RebaseAlways(args);
case INHERIT:
default:
String errorMsg = "No submit strategy for: " + submitType;
log.error(errorMsg);

1
java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
View File

@@ -465,6 +465,7 @@ abstract class SubmitStrategyOp implements BatchUpdateOp {
case REBASE_IF_NECESSARY:
case REBASE_ALWAYS:
return message(ctx, commit, CommitMergeStatus.CLEAN_REBASE);
case INHERIT:
default:
throw new IllegalStateException(
"unexpected submit type "