opendev/gerrit
Code Issues Proposed changes

Use per-project label types in Prolog submit rules

Browse Source 
Change-Id: I89fcb0b94a4f1af61d4cff7dccb18cc3dac821cd
This commit is contained in:
Dave Borowitz
2013-02-15 17:34:31 -08:00
parent 443a3a1c8f
commit 03fbaf8655
7 changed files with 118 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/gerrit/PRED__load_commit_labels_1.java
View File

@@ -7,7 +7,6 @@ import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.rules.PrologEnvironment;
import com.google.gerrit.rules.StoredValues;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gwtorm.server.OrmException;
@@ -42,11 +41,11 @@ class PRED__load_commit_labels_1 extends Predicate.P1 {
Term listHead = Prolog.Nil;
try {
PrologEnvironment env = (PrologEnvironment) engine.control;
ReviewDb db = StoredValues.REVIEW_DB.get(engine);
PatchSet patchSet = StoredValues.PATCH_SET.get(engine);
ChangeData cd = StoredValues.CHANGE_DATA.getOrNull(engine);
LabelTypes types = env.getInjector().getInstance(LabelTypes.class);
LabelTypes types =
StoredValues.CHANGE_CONTROL.get(engine).getLabelTypes();
Iterable<PatchSetApproval> approvals;
if (cd != null) {