diff options
| author | Edwin Kempin <edwin.kempin@sap.com> | 2013-05-03 06:00:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-03 06:00:03 +0000 |
| commit | 383041f948c19d23d15a2d4b959e99090ae8b1a4 (patch) | |
| tree | cbcb7733dc4c3998d6dba4e5db78d2d80b0579ba | |
| parent | ddf5dbb61747f7002ddf2634d3dec4114101defa (diff) | |
| parent | e5372016d50035235d8bde09a6ab280ae03c4f49 (diff) | |
Merge "Fix RebaseIfNecessary submit strategy" into stable-2.6
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java index 6ae8c9610f..9089710345 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java @@ -41,6 +41,7 @@ import com.google.gerrit.server.patch.PatchSetInfoFactory; import com.google.gerrit.server.project.ChangeControl; import com.google.gerrit.server.project.InvalidChangeOperationException; import com.google.gerrit.server.project.NoSuchChangeException; +import com.google.gerrit.server.project.ProjectCache; import com.google.gwtorm.server.AtomicUpdate; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; @@ -74,6 +75,7 @@ public class RebaseChange { private final ChangeHookRunner hooks; private final ApprovalsUtil approvalsUtil; private final MergeUtil.Factory mergeUtilFactory; + private final ProjectCache projectCache; @Inject RebaseChange(final ChangeControl.Factory changeControlFactory, @@ -83,7 +85,8 @@ public class RebaseChange { final GitReferenceUpdated gitRefUpdated, final RebasedPatchSetSender.Factory rebasedPatchSetSenderFactory, final ChangeHookRunner hooks, final ApprovalsUtil approvalsUtil, - final MergeUtil.Factory mergeUtilFactory) { + final MergeUtil.Factory mergeUtilFactory, + final ProjectCache projectCache) { this.changeControlFactory = changeControlFactory; this.patchSetInfoFactory = patchSetInfoFactory; this.db = db; @@ -94,6 +97,7 @@ public class RebaseChange { this.hooks = hooks; this.approvalsUtil = approvalsUtil; this.mergeUtilFactory = mergeUtilFactory; + this.projectCache = projectCache; } /** @@ -377,8 +381,8 @@ public class RebaseChange { "Change %s was modified", change.getId())); } - final LabelTypes labelTypes = changeControlFactory.controlFor(change) - .getLabelTypes(); + final LabelTypes labelTypes = + projectCache.get(change.getProject()).getLabelTypes(); approvalsUtil.copyVetosToPatchSet(db, labelTypes, change.currentPatchSetId()); |