opendev/gerrit
Code Issues Proposed changes

Fix reference to default_submit rule

Browse Source 
When I renamed the rule package from 'com.google.gerrit.rules.common'
to 'gerrit' I failed to update this one reference, resulting in the
default submit rule being broken.

Change-Id: I7c15b15650fd61a61d87b06c40acd8b03287014c
This commit is contained in:
Shawn O. Pearce
2011-06-16 08:43:37 -07:00
parent b63750430a
commit 31b195ce19
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
View File

@@ -265,8 +265,9 @@ public class ChangeControl {
env.set(StoredValues.PATCH_SET_ID, patchSetId); env.set(StoredValues.PATCH_SET_ID, patchSetId);
env.set(StoredValues.CHANGE_CONTROL, this); env.set(StoredValues.CHANGE_CONTROL, this);
Term submitRule = env.once("com.google.gerrit.rules.common", "locate_submit_rule", Term submitRule = env.once(
new VariableTerm()); "gerrit", "locate_submit_rule",
new VariableTerm());
if (submitRule == null) { if (submitRule == null) {
log.error("Error in locate_submit_rule: no submit_rule found"); log.error("Error in locate_submit_rule: no submit_rule found");
return new CanSubmitResult("Error in finding submit rule"); return new CanSubmitResult("Error in finding submit rule");
@@ -275,7 +276,7 @@ public class ChangeControl {
List<Term> results = new ArrayList<Term>(); List<Term> results = new ArrayList<Term>();
try { try {
for (Term[] template : env.all( for (Term[] template : env.all(
"com.google.gerrit.rules.common", "can_submit", "gerrit", "can_submit",
submitRule, submitRule,
new VariableTerm())) { new VariableTerm())) {
results.add(template[1]); results.add(template[1]);

2
gerrit-server/src/main/prolog/gerrit_common.pl
View File

@@ -180,7 +180,7 @@ locate_submit_rule(RuleName) :-
RuleName = user:submit_rule RuleName = user:submit_rule
. .
locate_submit_rule(RuleName) :- locate_submit_rule(RuleName) :-
RuleName = 'com.google.gerrit.rules.common':default_submit. RuleName = gerrit:default_submit.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

4
gerrit-server/src/test/resources/com/google/gerrit/rules/gerrit_common_test.pl
View File

@@ -76,13 +76,13 @@ test(can_submit_ok) :-
commit_label( label('Code-Review', 2), test_user(alice) ), commit_label( label('Code-Review', 2), test_user(alice) ),
commit_label( label('Verified', 1), test_user(builder) ) commit_label( label('Verified', 1), test_user(builder) )
]), ]),
can_submit('com.google.gerrit.rules.common':default_submit, S), can_submit(gerrit:default_submit, S),
S = ok(submit(C, V)), S = ok(submit(C, V)),
C = label('Code-Review', ok(test_user(alice))), C = label('Code-Review', ok(test_user(alice))),
V = label('Verified', ok(test_user(builder))). V = label('Verified', ok(test_user(builder))).
test(can_submit_not_ready) :- test(can_submit_not_ready) :-
can_submit('com.google.gerrit.rules.common':default_submit, S), can_submit(gerrit:default_submit, S),
S = not_ready(submit(C, V)), S = not_ready(submit(C, V)),
C = label('Code-Review', ok(test_user(alice))), C = label('Code-Review', ok(test_user(alice))),
V = label('Verified', need(1)). V = label('Verified', need(1)).