c8f8d2ea83
Change Project to only expose the configured submit type for that project, and modify all callers to call the equivalent method on ProjectState which respects inheritance. In the extension/REST API, expose the inherited submit type analogously to the inherited boolean values, using an object containing configured and inherited values. For backwards compatibility, leave the old submit_type field as-is, but mark it deprecated, in the hopes that we can eventually replace it. Do not change the default of a project with no configured submit type, leaving the default as MERGE_IF_NECESSARY. This avoids, for now, the need for migrating existing projects that do not have a submit type set, including those that were created outside of Gerrit and don't have refs/meta/config at all. After this change, the global `repository.<name>.defaultSubmitType` configuration still takes effect when creating a new project. A later change may remove support for defaultSubmitType, but the migration to convert global config into appropriate inheritable config values is nontrivial, so we're punting on it. Change-Id: Ib5711baaa67b2c92239a1ff4564349a80d211c28
107 lines
3.6 KiB
Java
107 lines
3.6 KiB
Java
// Copyright (C) 2012 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.server.git.strategy;
|
|
|
|
import com.google.common.collect.ListMultimap;
|
|
import com.google.gerrit.extensions.api.changes.RecipientType;
|
|
import com.google.gerrit.extensions.api.changes.SubmitInput;
|
|
import com.google.gerrit.extensions.client.SubmitType;
|
|
import com.google.gerrit.reviewdb.client.Account;
|
|
import com.google.gerrit.reviewdb.client.Branch;
|
|
import com.google.gerrit.reviewdb.server.ReviewDb;
|
|
import com.google.gerrit.server.IdentifiedUser;
|
|
import com.google.gerrit.server.git.CodeReviewCommit;
|
|
import com.google.gerrit.server.git.CodeReviewCommit.CodeReviewRevWalk;
|
|
import com.google.gerrit.server.git.IntegrationException;
|
|
import com.google.gerrit.server.git.MergeOp.CommitStatus;
|
|
import com.google.gerrit.server.git.MergeTip;
|
|
import com.google.gerrit.server.git.SubmoduleOp;
|
|
import com.google.gerrit.server.util.RequestId;
|
|
import com.google.inject.Inject;
|
|
import com.google.inject.Singleton;
|
|
import java.util.Set;
|
|
import org.eclipse.jgit.revwalk.RevCommit;
|
|
import org.eclipse.jgit.revwalk.RevFlag;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
/** Factory to create a {@link SubmitStrategy} for a {@link SubmitType}. */
|
|
@Singleton
|
|
public class SubmitStrategyFactory {
|
|
private static final Logger log = LoggerFactory.getLogger(SubmitStrategyFactory.class);
|
|
|
|
private final SubmitStrategy.Arguments.Factory argsFactory;
|
|
|
|
@Inject
|
|
SubmitStrategyFactory(SubmitStrategy.Arguments.Factory argsFactory) {
|
|
this.argsFactory = argsFactory;
|
|
}
|
|
|
|
public SubmitStrategy create(
|
|
SubmitType submitType,
|
|
ReviewDb db,
|
|
CodeReviewRevWalk rw,
|
|
RevFlag canMergeFlag,
|
|
Set<RevCommit> alreadyAccepted,
|
|
Set<CodeReviewCommit> incoming,
|
|
Branch.NameKey destBranch,
|
|
IdentifiedUser caller,
|
|
MergeTip mergeTip,
|
|
CommitStatus commitStatus,
|
|
RequestId submissionId,
|
|
SubmitInput submitInput,
|
|
ListMultimap<RecipientType, Account.Id> accountsToNotify,
|
|
SubmoduleOp submoduleOp,
|
|
boolean dryrun)
|
|
throws IntegrationException {
|
|
SubmitStrategy.Arguments args =
|
|
argsFactory.create(
|
|
submitType,
|
|
destBranch,
|
|
commitStatus,
|
|
rw,
|
|
caller,
|
|
mergeTip,
|
|
canMergeFlag,
|
|
db,
|
|
alreadyAccepted,
|
|
incoming,
|
|
submissionId,
|
|
submitInput,
|
|
accountsToNotify,
|
|
submoduleOp,
|
|
dryrun);
|
|
switch (submitType) {
|
|
case CHERRY_PICK:
|
|
return new CherryPick(args);
|
|
case FAST_FORWARD_ONLY:
|
|
return new FastForwardOnly(args);
|
|
case MERGE_ALWAYS:
|
|
return new MergeAlways(args);
|
|
case MERGE_IF_NECESSARY:
|
|
return new MergeIfNecessary(args);
|
|
case REBASE_IF_NECESSARY:
|
|
return new RebaseIfNecessary(args);
|
|
case REBASE_ALWAYS:
|
|
return new RebaseAlways(args);
|
|
case INHERIT:
|
|
default:
|
|
String errorMsg = "No submit strategy for: " + submitType;
|
|
log.error(errorMsg);
|
|
throw new IntegrationException(errorMsg);
|
|
}
|
|
}
|
|
}
|