opendev/gerrit
Code Issues Proposed changes

Merge changes from topic 'no-changes-made'

Browse Source 
* changes:
  Remove "no changes made" error case
  ApprovalCopier: Respect ChangeKind.NO_CHANGE in more cases
This commit is contained in:
Edwin Kempin
2016-02-10 08:13:26 +00:00
committed by Gerrit Code Review
parent 03e8049e89 0b3a8796aa
commit 685b5b76cc
6 changed files with 63 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java
View File

@@ -16,10 +16,6 @@ package com.google.gerrit.server;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.gerrit.server.change.ChangeKind.MERGE_FIRST_PARENT_UPDATE;
import static com.google.gerrit.server.change.ChangeKind.NO_CHANGE;
import static com.google.gerrit.server.change.ChangeKind.NO_CODE_CHANGE;
import static com.google.gerrit.server.change.ChangeKind.TRIVIAL_REBASE;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.ListMultimap;
@@ -173,10 +169,22 @@ public class ApprovalCopier {
// may not be psId.get() - 1).
return true;
}
return (type.isCopyAllScoresOnMergeFirstParentUpdate() && kind == MERGE_FIRST_PARENT_UPDATE)
|| (type.isCopyAllScoresOnTrivialRebase() && kind == TRIVIAL_REBASE)
|| (type.isCopyAllScoresIfNoCodeChange() && kind == NO_CODE_CHANGE)
|| (type.isCopyAllScoresIfNoChange() && kind == NO_CHANGE);
switch (kind) {
case MERGE_FIRST_PARENT_UPDATE:
return type.isCopyAllScoresOnMergeFirstParentUpdate();
case NO_CODE_CHANGE:
return type.isCopyAllScoresIfNoCodeChange();
case TRIVIAL_REBASE:
return type.isCopyAllScoresOnTrivialRebase();
case NO_CHANGE:
return type.isCopyAllScoresIfNoChange()
|| type.isCopyAllScoresOnTrivialRebase()
|| type.isCopyAllScoresOnMergeFirstParentUpdate()
|| type.isCopyAllScoresIfNoCodeChange();
case REWORK:
default:
return false;
}
}
private static PatchSetApproval copy(PatchSetApproval src, PatchSet.Id psId) {

2
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -2073,8 +2073,6 @@ public class ReceiveCommits {
"(W) No changes between prior commit %s and new commit %s",
reader.abbreviate(priorCommit).name(),
reader.abbreviate(newCommit).name()));
reject(inputCommand, "no changes made");
return false;
} else {
StringBuilder msg = new StringBuilder();
msg.append("(W) ");