Merge "Revert "Fix bug about persisting copied votes on submit""
diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
index aed1774..cfdb576 100644
--- a/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -104,7 +104,6 @@
private boolean allowClosed;
private boolean sendEmail = true;
private String topic;
- private boolean storeCopiedVotes = true;
// Fields set during some phase of BatchUpdate.Op.
private Change change;
@@ -204,17 +203,6 @@
return this;
}
- /**
- * We always want to store copied votes except when the change is getting submitted and a new
- * patch-set is created on submit (using submit strategies such as "REBASE_ALWAYS"). In such
- * cases, we already store the votes of the new patch-sets in SubmitStrategyOp#saveApprovals. We
- * should not also store the copied votes.
- */
- public PatchSetInserter setStoreCopiedVotes(boolean storeCopiedVotes) {
- this.storeCopiedVotes = storeCopiedVotes;
- return this;
- }
-
public Change getChange() {
checkState(change != null, "getChange() only valid after executing update");
return change;
@@ -298,10 +286,8 @@
}
}
- if (storeCopiedVotes) {
- approvalsUtil.persistCopiedApprovals(
- ctx.getNotes(), patchSet, ctx.getRevWalk(), ctx.getRepoView().getConfig(), update);
- }
+ approvalsUtil.persistCopiedApprovals(
+ ctx.getNotes(), patchSet, ctx.getRevWalk(), ctx.getRepoView().getConfig(), update);
return true;
}
diff --git a/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java
index 3e67cca..4952464 100644
--- a/java/com/google/gerrit/server/change/RebaseChangeOp.java
+++ b/java/com/google/gerrit/server/change/RebaseChangeOp.java
@@ -92,7 +92,6 @@
private boolean detailedCommitMessage;
private boolean postMessage = true;
private boolean sendEmail = true;
- private boolean storeCopiedVotes = true;
private boolean matchAuthorToCommitterDate = false;
private CodeReviewCommit rebasedCommit;
@@ -170,17 +169,6 @@
return this;
}
- /**
- * We always want to store copied votes except when the change is getting submitted and a new
- * patch-set is created on submit (using submit strategies such as "REBASE_ALWAYS"). In such
- * cases, we already store the votes of the new patch-sets in SubmitStrategyOp#saveApprovals. We
- * should not also store the copied votes.
- */
- public RebaseChangeOp setStoreCopiedVotes(boolean storeCopiedVotes) {
- this.storeCopiedVotes = storeCopiedVotes;
- return this;
- }
-
public RebaseChangeOp setSendEmail(boolean sendEmail) {
this.sendEmail = sendEmail;
return this;
@@ -231,10 +219,7 @@
.setFireRevisionCreated(fireRevisionCreated)
.setCheckAddPatchSetPermission(checkAddPatchSetPermission)
.setValidate(validate)
- .setSendEmail(sendEmail)
- // The votes are automatically copied and they don't count as copied votes. See
- // method's javadoc.
- .setStoreCopiedVotes(storeCopiedVotes);
+ .setSendEmail(sendEmail);
if (!rebasedCommit.getFilesWithGitConflicts().isEmpty()
&& !notes.getChange().isWorkInProgress()) {
diff --git a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java
index 355d25f..cc3b75d 100644
--- a/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java
+++ b/java/com/google/gerrit/server/submit/RebaseSubmitStrategy.java
@@ -211,10 +211,7 @@
.setPostMessage(false)
.setSendEmail(false)
.setMatchAuthorToCommitterDate(
- args.project.is(BooleanProjectConfig.MATCH_AUTHOR_TO_COMMITTER_DATE))
- // The votes are automatically copied and they don't count as copied votes. See
- // method's javadoc.
- .setStoreCopiedVotes(/* storeCopiedVotes = */ false);
+ args.project.is(BooleanProjectConfig.MATCH_AUTHOR_TO_COMMITTER_DATE));
try {
rebaseOp.updateRepo(ctx);
} catch (MergeConflictException | NoSuchChangeException e) {
