Merge branch 'stable-3.8' into stable-3.9 * stable-3.8: Fix `Owned Files` status icon when some files are already approved Fix misleading log message when adding reviewers Add status icon to the `Owned Files` tab header Unify check if change contains owners submit requirements Show owners files statuses and `Owned Files` tab in replacment mode Remove `allFilesApproved` state from the `OwnersState` Show `Owned Files` even when all files were approved Don't display `Owned Files` when not current PS is viewed Ensure that `Owned Files` is not switchable when no files are owned Match Owned Files entries even when owners.expandGroups == false Change-Id: Ie2310548b34f2bc4332c0604c5e69d3b79c7b76d
diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java index d15da8e..b83d7a8 100644 --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnerPredicateProvider.java
@@ -18,7 +18,7 @@ import com.google.common.collect.ImmutableSet; import com.google.gerrit.extensions.annotations.Listen; -import com.google.gerrit.server.rules.PredicateProvider; +import com.google.gerrit.server.rules.prolog.PredicateProvider; import com.google.inject.Inject; import com.googlesource.gerrit.owners.common.Accounts; import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache;
diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java index be8a6ca..2d5a2b0 100644 --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersModule.java
@@ -17,7 +17,7 @@ import com.google.common.flogger.FluentLogger; import com.google.gerrit.extensions.registration.DynamicSet; -import com.google.gerrit.server.rules.PredicateProvider; +import com.google.gerrit.server.rules.prolog.PredicateProvider; import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.googlesource.gerrit.owners.common.PathOwnersEntriesCache;
diff --git a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java index ff8bc18..84cc6a2 100644 --- a/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java +++ b/owners/src/main/java/com/googlesource/gerrit/owners/OwnersStoredValues.java
@@ -21,8 +21,8 @@ import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.patch.filediff.FileDiffOutput; import com.google.gerrit.server.project.ProjectState; -import com.google.gerrit.server.rules.StoredValue; -import com.google.gerrit.server.rules.StoredValues; +import com.google.gerrit.server.rules.prolog.StoredValue; +import com.google.gerrit.server.rules.prolog.StoredValues; import com.googlecode.prolog_cafe.lang.Prolog; import com.googlesource.gerrit.owners.common.Accounts; import com.googlesource.gerrit.owners.common.InvalidOwnersFileException;
diff --git a/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java b/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java index a2dd06b..92df174 100644 --- a/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java +++ b/owners/src/main/java/gerrit_owners/PRED_code_review_user_1.java
@@ -20,7 +20,7 @@ import com.google.gerrit.entities.LabelType; import com.google.gerrit.entities.LabelValue; import com.google.gerrit.server.query.change.ChangeData; -import com.google.gerrit.server.rules.StoredValues; +import com.google.gerrit.server.rules.prolog.StoredValues; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.IntegerTerm; import com.googlecode.prolog_cafe.lang.JavaObjectTerm;
diff --git a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java index cbb23cf..11f1a74 100644 --- a/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java +++ b/owners/src/main/java/gerrit_owners/PRED_file_owners_2.java
@@ -18,8 +18,8 @@ import com.google.gerrit.entities.Account; import com.google.gerrit.server.IdentifiedUser; -import com.google.gerrit.server.rules.PrologEnvironment; -import com.google.gerrit.server.rules.StoredValues; +import com.google.gerrit.server.rules.prolog.PrologEnvironment; +import com.google.gerrit.server.rules.prolog.StoredValues; import com.googlecode.prolog_cafe.exceptions.PInstantiationException; import com.googlecode.prolog_cafe.exceptions.PrologException; import com.googlecode.prolog_cafe.lang.Operation;