diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/changedetail/RebaseChange.java | 11 |
1 files changed, 3 insertions, 8 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 89c507bdee..d7bf5a36b5 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 @@ -16,7 +16,6 @@ package com.google.gerrit.server.changedetail; import com.google.common.collect.Sets; import com.google.gerrit.common.ChangeHookRunner; -import com.google.gerrit.common.data.LabelTypes; import com.google.gerrit.common.errors.EmailException; import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Branch; @@ -73,7 +72,6 @@ public class RebaseChange { private final GitReferenceUpdated gitRefUpdated; private final RebasedPatchSetSender.Factory rebasedPatchSetSenderFactory; private final ChangeHookRunner hooks; - private final ApprovalsUtil approvalsUtil; private final MergeUtil.Factory mergeUtilFactory; private final ProjectCache projectCache; @@ -84,7 +82,7 @@ public class RebaseChange { final GitRepositoryManager gitManager, final GitReferenceUpdated gitRefUpdated, final RebasedPatchSetSender.Factory rebasedPatchSetSenderFactory, - final ChangeHookRunner hooks, final ApprovalsUtil approvalsUtil, + final ChangeHookRunner hooks, final MergeUtil.Factory mergeUtilFactory, final ProjectCache projectCache) { this.changeControlFactory = changeControlFactory; @@ -95,7 +93,6 @@ public class RebaseChange { this.gitRefUpdated = gitRefUpdated; this.rebasedPatchSetSenderFactory = rebasedPatchSetSenderFactory; this.hooks = hooks; - this.approvalsUtil = approvalsUtil; this.mergeUtilFactory = mergeUtilFactory; this.projectCache = projectCache; } @@ -384,10 +381,8 @@ public class RebaseChange { "Change %s was modified", change.getId())); } - final LabelTypes labelTypes = - projectCache.get(change.getProject()).getLabelTypes(); - approvalsUtil.copyVetosToPatchSet(db, labelTypes, - change.currentPatchSetId()); + ApprovalsUtil.copyLabels(db, projectCache.get(change.getProject()) + .getLabelTypes(), patchSetId, change.currentPatchSetId()); final ChangeMessage cmsg = new ChangeMessage(new ChangeMessage.Key(change.getId(), |