| // Copyright (C) 2016 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.restapi.change; |
| |
| import com.google.common.base.MoreObjects; |
| import com.google.common.base.Strings; |
| import com.google.common.collect.Iterables; |
| import com.google.gerrit.extensions.client.ListChangesOption; |
| import com.google.gerrit.extensions.common.ChangeInfo; |
| import com.google.gerrit.extensions.common.MergeInput; |
| import com.google.gerrit.extensions.common.MergePatchSetInput; |
| import com.google.gerrit.extensions.restapi.AuthException; |
| import com.google.gerrit.extensions.restapi.BadRequestException; |
| import com.google.gerrit.extensions.restapi.MergeConflictException; |
| import com.google.gerrit.extensions.restapi.ResourceNotFoundException; |
| import com.google.gerrit.extensions.restapi.Response; |
| import com.google.gerrit.extensions.restapi.RestApiException; |
| import com.google.gerrit.extensions.restapi.UnprocessableEntityException; |
| import com.google.gerrit.reviewdb.client.Branch; |
| import com.google.gerrit.reviewdb.client.Change; |
| import com.google.gerrit.reviewdb.client.PatchSet; |
| import com.google.gerrit.reviewdb.client.Project; |
| import com.google.gerrit.server.ChangeUtil; |
| import com.google.gerrit.server.CurrentUser; |
| import com.google.gerrit.server.GerritPersonIdent; |
| import com.google.gerrit.server.IdentifiedUser; |
| import com.google.gerrit.server.PatchSetUtil; |
| import com.google.gerrit.server.change.ChangeFinder; |
| import com.google.gerrit.server.change.ChangeJson; |
| import com.google.gerrit.server.change.ChangeResource; |
| import com.google.gerrit.server.change.NotifyResolver; |
| import com.google.gerrit.server.change.PatchSetInserter; |
| import com.google.gerrit.server.git.GitRepositoryManager; |
| import com.google.gerrit.server.git.MergeUtil; |
| import com.google.gerrit.server.notedb.ChangeNotes; |
| import com.google.gerrit.server.permissions.ChangePermission; |
| import com.google.gerrit.server.permissions.PermissionBackend; |
| import com.google.gerrit.server.permissions.PermissionBackendException; |
| import com.google.gerrit.server.project.ProjectCache; |
| import com.google.gerrit.server.project.ProjectState; |
| import com.google.gerrit.server.restapi.project.CommitsCollection; |
| import com.google.gerrit.server.submit.MergeIdenticalTreeException; |
| import com.google.gerrit.server.update.BatchUpdate; |
| import com.google.gerrit.server.update.RetryHelper; |
| import com.google.gerrit.server.update.RetryingRestModifyView; |
| import com.google.gerrit.server.update.UpdateException; |
| import com.google.gerrit.server.util.time.TimeUtil; |
| import com.google.inject.Inject; |
| import com.google.inject.Provider; |
| import com.google.inject.Singleton; |
| import java.io.IOException; |
| import java.sql.Timestamp; |
| import java.util.List; |
| import java.util.TimeZone; |
| import org.eclipse.jgit.lib.ObjectId; |
| import org.eclipse.jgit.lib.ObjectInserter; |
| import org.eclipse.jgit.lib.ObjectReader; |
| import org.eclipse.jgit.lib.PersonIdent; |
| import org.eclipse.jgit.lib.Ref; |
| import org.eclipse.jgit.lib.Repository; |
| import org.eclipse.jgit.revwalk.RevCommit; |
| import org.eclipse.jgit.revwalk.RevWalk; |
| import org.eclipse.jgit.util.ChangeIdUtil; |
| |
| @Singleton |
| public class CreateMergePatchSet |
| extends RetryingRestModifyView<ChangeResource, MergePatchSetInput, Response<ChangeInfo>> { |
| private final GitRepositoryManager gitManager; |
| private final CommitsCollection commits; |
| private final TimeZone serverTimeZone; |
| private final Provider<CurrentUser> user; |
| private final ChangeJson.Factory jsonFactory; |
| private final PatchSetUtil psUtil; |
| private final MergeUtil.Factory mergeUtilFactory; |
| private final PatchSetInserter.Factory patchSetInserterFactory; |
| private final ProjectCache projectCache; |
| private final ChangeFinder changeFinder; |
| private final PermissionBackend permissionBackend; |
| |
| @Inject |
| CreateMergePatchSet( |
| GitRepositoryManager gitManager, |
| CommitsCollection commits, |
| @GerritPersonIdent PersonIdent myIdent, |
| Provider<CurrentUser> user, |
| ChangeJson.Factory json, |
| PatchSetUtil psUtil, |
| MergeUtil.Factory mergeUtilFactory, |
| RetryHelper retryHelper, |
| PatchSetInserter.Factory patchSetInserterFactory, |
| ProjectCache projectCache, |
| ChangeFinder changeFinder, |
| PermissionBackend permissionBackend) { |
| super(retryHelper); |
| this.gitManager = gitManager; |
| this.commits = commits; |
| this.serverTimeZone = myIdent.getTimeZone(); |
| this.user = user; |
| this.jsonFactory = json; |
| this.psUtil = psUtil; |
| this.mergeUtilFactory = mergeUtilFactory; |
| this.patchSetInserterFactory = patchSetInserterFactory; |
| this.projectCache = projectCache; |
| this.changeFinder = changeFinder; |
| this.permissionBackend = permissionBackend; |
| } |
| |
| @Override |
| protected Response<ChangeInfo> applyImpl( |
| BatchUpdate.Factory updateFactory, ChangeResource rsrc, MergePatchSetInput in) |
| throws IOException, RestApiException, UpdateException, PermissionBackendException { |
| // Not allowed to create a new patch set if the current patch set is locked. |
| psUtil.checkPatchSetNotLocked(rsrc.getNotes()); |
| |
| rsrc.permissions().check(ChangePermission.ADD_PATCH_SET); |
| |
| ProjectState projectState = projectCache.checkedGet(rsrc.getProject()); |
| projectState.checkStatePermitsWrite(); |
| |
| MergeInput merge = in.merge; |
| if (merge == null || Strings.isNullOrEmpty(merge.source)) { |
| throw new BadRequestException("merge.source must be non-empty"); |
| } |
| in.baseChange = Strings.nullToEmpty(in.baseChange).trim(); |
| |
| PatchSet ps = psUtil.current(rsrc.getNotes()); |
| Change change = rsrc.getChange(); |
| Project.NameKey project = change.getProject(); |
| Branch.NameKey dest = change.getDest(); |
| try (Repository git = gitManager.openRepository(project); |
| ObjectInserter oi = git.newObjectInserter(); |
| ObjectReader reader = oi.newReader(); |
| RevWalk rw = new RevWalk(reader)) { |
| |
| RevCommit sourceCommit = MergeUtil.resolveCommit(git, rw, merge.source); |
| if (!commits.canRead(projectState, git, sourceCommit)) { |
| throw new ResourceNotFoundException( |
| "cannot find source commit: " + merge.source + " to merge."); |
| } |
| |
| RevCommit currentPsCommit; |
| List<String> groups = null; |
| if (!in.inheritParent && !in.baseChange.isEmpty()) { |
| PatchSet basePS = findBasePatchSet(in.baseChange); |
| currentPsCommit = rw.parseCommit(ObjectId.fromString(basePS.getRevision().get())); |
| groups = basePS.getGroups(); |
| } else { |
| currentPsCommit = rw.parseCommit(ObjectId.fromString(ps.getRevision().get())); |
| } |
| |
| Timestamp now = TimeUtil.nowTs(); |
| IdentifiedUser me = user.get().asIdentifiedUser(); |
| PersonIdent author = me.newCommitterIdent(now, serverTimeZone); |
| RevCommit newCommit = |
| createMergeCommit( |
| in, |
| projectState, |
| dest, |
| git, |
| oi, |
| rw, |
| currentPsCommit, |
| sourceCommit, |
| author, |
| ObjectId.fromString(change.getKey().get().substring(1))); |
| |
| PatchSet.Id nextPsId = ChangeUtil.nextPatchSetId(ps.getId()); |
| PatchSetInserter psInserter = |
| patchSetInserterFactory.create(rsrc.getNotes(), nextPsId, newCommit); |
| try (BatchUpdate bu = updateFactory.create(project, me, now)) { |
| bu.setRepository(git, rw, oi); |
| bu.setNotify(NotifyResolver.Result.none()); |
| psInserter |
| .setMessage("Uploaded patch set " + nextPsId.get() + ".") |
| .setCheckAddPatchSetPermission(false); |
| if (groups != null) { |
| psInserter.setGroups(groups); |
| } |
| bu.addOp(rsrc.getId(), psInserter); |
| bu.execute(); |
| } |
| |
| ChangeJson json = jsonFactory.create(ListChangesOption.CURRENT_REVISION); |
| return Response.ok(json.format(psInserter.getChange())); |
| } |
| } |
| |
| private PatchSet findBasePatchSet(String baseChange) |
| throws PermissionBackendException, UnprocessableEntityException { |
| List<ChangeNotes> notes = changeFinder.find(baseChange); |
| if (notes.size() != 1) { |
| throw new UnprocessableEntityException("Base change not found: " + baseChange); |
| } |
| ChangeNotes change = Iterables.getOnlyElement(notes); |
| try { |
| permissionBackend.currentUser().change(change).check(ChangePermission.READ); |
| } catch (AuthException e) { |
| throw new UnprocessableEntityException("Read not permitted for " + baseChange, e); |
| } |
| return psUtil.current(change); |
| } |
| |
| private RevCommit createMergeCommit( |
| MergePatchSetInput in, |
| ProjectState projectState, |
| Branch.NameKey dest, |
| Repository git, |
| ObjectInserter oi, |
| RevWalk rw, |
| RevCommit currentPsCommit, |
| RevCommit sourceCommit, |
| PersonIdent author, |
| ObjectId changeId) |
| throws ResourceNotFoundException, MergeIdenticalTreeException, MergeConflictException, |
| IOException { |
| |
| ObjectId parentCommit; |
| if (in.inheritParent) { |
| // inherit first parent from previous patch set |
| parentCommit = currentPsCommit.getParent(0); |
| } else if (!in.baseChange.isEmpty()) { |
| parentCommit = currentPsCommit.getId(); |
| } else { |
| // get the current branch tip of destination branch |
| Ref destRef = git.getRefDatabase().exactRef(dest.get()); |
| if (destRef != null) { |
| parentCommit = destRef.getObjectId(); |
| } else { |
| throw new ResourceNotFoundException("cannot find destination branch"); |
| } |
| } |
| RevCommit mergeTip = rw.parseCommit(parentCommit); |
| |
| String commitMsg; |
| if (Strings.emptyToNull(in.subject) != null) { |
| commitMsg = ChangeIdUtil.insertId(in.subject, changeId); |
| } else { |
| // reuse previous patch set commit message |
| commitMsg = currentPsCommit.getFullMessage(); |
| } |
| |
| String mergeStrategy = |
| MoreObjects.firstNonNull( |
| Strings.emptyToNull(in.merge.strategy), |
| mergeUtilFactory.create(projectState).mergeStrategyName()); |
| |
| return MergeUtil.createMergeCommit( |
| oi, git.getConfig(), mergeTip, sourceCommit, mergeStrategy, author, commitMsg, rw); |
| } |
| } |