opendev/gerrit
Code Issues Proposed changes

Quote topic name in same topic query

Browse Source 
Topic names may contain whitespace. This is why
we need to quote the topic name in the query.

Change-Id: I0ce6a8ca57cec987ddeeaeed71cee757dcb9d17b
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
This commit is contained in:
Edwin Kempin
2013-11-22 20:40:07 +01:00
committed by Shawn Pearce
parent ed2331d0d2
commit 053853b6a3
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-common/src/main/java/com/google/gerrit/common/PageLinks.java
View File

@@ -127,6 +127,10 @@ public class PageLinks {
} }
} }
public static String op(String op, int value) {
return op + ":" + value;
}
public static String op(String op, String value) { public static String op(String op, String value) {
if (isSingleWord(value)) { if (isSingleWord(value)) {
return op + ":" + value; return op + ":" + value;

16
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java
View File

@@ -14,6 +14,8 @@
package com.google.gerrit.client.change; package com.google.gerrit.client.change;
import static com.google.gerrit.common.PageLinks.op;
import com.google.gerrit.client.Gerrit; import com.google.gerrit.client.Gerrit;
import com.google.gerrit.client.changes.ChangeApi; import com.google.gerrit.client.changes.ChangeApi;
import com.google.gerrit.client.changes.ChangeInfo; import com.google.gerrit.client.changes.ChangeInfo;
@@ -97,9 +99,9 @@ class RelatedChanges extends TabPanel {
} }
StringBuilder cherryPicksQuery = new StringBuilder(); StringBuilder cherryPicksQuery = new StringBuilder();
cherryPicksQuery.append(" project:").append(info.project()); cherryPicksQuery.append(op("project", info.project()));
cherryPicksQuery.append(" change:").append(info.change_id()); cherryPicksQuery.append(" ").append(op("change", info.change_id()));
cherryPicksQuery.append(" -change:").append(info.legacy_id().get()); cherryPicksQuery.append(" ").append(op("-change", info.legacy_id().get()));
ChangeList.query(cherryPicksQuery.toString(), ChangeList.query(cherryPicksQuery.toString(),
EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT), EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT),
new AsyncCallback<ChangeList>() { new AsyncCallback<ChangeList>() {
@@ -133,9 +135,9 @@ class RelatedChanges extends TabPanel {
if (info.topic() != null && !"".equals(info.topic())) { if (info.topic() != null && !"".equals(info.topic())) {
StringBuilder topicQuery = new StringBuilder(); StringBuilder topicQuery = new StringBuilder();
topicQuery.append("status:open"); topicQuery.append("status:open");
topicQuery.append(" project:").append(info.project()); topicQuery.append(" ").append(op("project", info.project()));
topicQuery.append(" branch:").append(info.branch()); topicQuery.append(" ").append(op("branch", info.branch()));
topicQuery.append(" topic:").append(info.topic()); topicQuery.append(" ").append(op("topic", info.topic()));
ChangeList.query(topicQuery.toString(), ChangeList.query(topicQuery.toString(),
EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT), EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT),
new AsyncCallback<ChangeList>() { new AsyncCallback<ChangeList>() {
@@ -189,7 +191,7 @@ class RelatedChanges extends TabPanel {
StringBuilder conflictsQuery = new StringBuilder(); StringBuilder conflictsQuery = new StringBuilder();
conflictsQuery.append("status:open"); conflictsQuery.append("status:open");
conflictsQuery.append(" conflicts:").append(info.legacy_id().get()); conflictsQuery.append(" ").append(op("conflicts", info.legacy_id().get()));
conflictsQuery.append(" -age:1month"); conflictsQuery.append(" -age:1month");
ChangeList.query(conflictsQuery.toString(), ChangeList.query(conflictsQuery.toString(),
EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT), EnumSet.of(ListChangesOption.CURRENT_REVISION, ListChangesOption.CURRENT_COMMIT),