Merge "Ignore buck-out in IntelliJ's Bazel plugin"
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
index 62c14cb..fb66570 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
@@ -95,11 +95,13 @@
}
private static String queryIncoming(String who) {
- return "is:open reviewer:" + who + " -owner:" + who + " -star:ignore";
+ return "is:open ((reviewer:" + who + " -owner:" + who
+ + " -star:ignore) OR assignee:" + who + ")";
}
private static String queryClosed(String who) {
- return "is:closed (owner:" + who + " OR reviewer:" + who + ")";
+ return "is:closed (owner:" + who + " OR reviewer:" + who + " OR assignee:"
+ + who + ")";
}
@Override
diff --git a/gerrit-server/src/main/java/gerrit/PRED_uploader_1.java b/gerrit-server/src/main/java/gerrit/PRED_uploader_1.java
index bea7c8b..06977b3 100644
--- a/gerrit-server/src/main/java/gerrit/PRED_uploader_1.java
+++ b/gerrit-server/src/main/java/gerrit/PRED_uploader_1.java
@@ -15,6 +15,7 @@
package gerrit;
import com.google.gerrit.reviewdb.client.Account;
+import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.PrologException;
@@ -26,7 +27,13 @@
import com.googlecode.prolog_cafe.lang.SymbolTerm;
import com.googlecode.prolog_cafe.lang.Term;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class PRED_uploader_1 extends Predicate.P1 {
+ private static final Logger log =
+ LoggerFactory.getLogger(PRED_uploader_1.class);
+
private static final SymbolTerm user = SymbolTerm.intern("user", 1);
public PRED_uploader_1(Term a1, Operation n) {
@@ -39,7 +46,14 @@
engine.setB0();
Term a1 = arg1.dereference();
- Account.Id uploaderId = StoredValues.getPatchSet(engine).getUploader();
+ PatchSet patchSet = StoredValues.getPatchSet(engine);
+ if (patchSet == null) {
+ log.error("Failed to load current patch set of change "
+ + StoredValues.getChange(engine).getChangeId());
+ return engine.fail();
+ }
+
+ Account.Id uploaderId = patchSet.getUploader();
if (!a1.unify(new StructureTerm(user, new IntegerTerm(uploaderId.get())),
engine.trail)) {
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
index 8093bbb..99eb5bf 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
@@ -35,7 +35,6 @@
import com.google.gerrit.server.account.AccountCache;
import com.google.gerrit.server.account.AccountManager;
import com.google.gerrit.server.account.AuthRequest;
-import com.google.gerrit.server.query.change.InternalChangeQuery;
import com.google.gerrit.server.schema.SchemaCreator;
import com.google.gerrit.server.util.ManualRequestContext;
import com.google.gerrit.server.util.OneOffRequestContext;
@@ -92,9 +91,6 @@
protected InMemoryDatabase schemaFactory;
@Inject
- protected InternalChangeQuery internalChangeQuery;
-
- @Inject
protected SchemaCreator schemaCreator;
@Inject
diff --git a/plugins/download-commands b/plugins/download-commands
index 6326db6..d632d64 160000
--- a/plugins/download-commands
+++ b/plugins/download-commands
@@ -1 +1 @@
-Subproject commit 6326db67dfa45b13a0c427643bbfa617c18855d7
+Subproject commit d632d6471b42a47877664a5266ba509026538a32
diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
index 672afa8..d8af692 100644
--- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
+++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.js
@@ -372,8 +372,8 @@
O: options,
q: [
'is:open owner:self',
- 'is:open reviewer:self -owner:self',
- 'is:closed (owner:self OR reviewer:self) -age:4w limit:10',
+ 'is:open ((reviewer:self -owner:self -star:ignore) OR assignee:self)',
+ 'is:closed (owner:self OR reviewer:self OR assignee:self) -age:4w limit:10',
],
};
return this.fetchJSON('/changes/', null, null, params);
