opendev/gerrit
Code Issues Proposed changes

Revert "submitted_together: Add a dummy change for not visible changes"

Browse Source 
This reverts commit e73ebe2dc4.  It
broke anonymous access in projects with the CherryPick submit type.

Add a test to prevent the problem from happening again.

 Error in GET /changes/24150/revisions/f3d9f239bc26908994eebc8b4ba64e89c634f352/actions
 java.lang.IllegalStateException: user already specified: IdentifiedUser[account 5195]
	at com.google.gerrit.server.query.change.ChangeData.changeControl(ChangeData.java:691)
	at com.google.gerrit.server.git.ChangeSet.<init>(ChangeSet.java:66)
	at com.google.gerrit.server.git.MergeSuperSet.completeChangeSetWithoutTopic(MergeSuperSet.java:169)
	at com.google.gerrit.server.git.MergeSuperSet.completeChangeSet(MergeSuperSet.java:103)
	at com.google.gerrit.server.change.GetRevisionActions.getETag(GetRevisionActions.java:75)
	at com.google.gerrit.server.change.GetRevisionActions.getETag(GetRevisionActions.java:39)
	at com.google.gerrit.httpd.restapi.RestApiServlet.addResourceStateHeaders(RestApiServlet.java:496)
	at com.google.gerrit.httpd.restapi.RestApiServlet.configureCaching(RestApiServlet.java:476)
	at com.google.gerrit.httpd.restapi.RestApiServlet.service(RestApiServlet.java:347)
	at javax.servlet.http.HttpServlet.service(HttpServlet.java:717)

Change-Id: I143300e7b3a17046559d640bd589ba34aed662f0
This commit is contained in:
Jonathan Nieder
2016-06-15 15:03:29 -07:00
parent 35d7614770
commit 27d460cfa9
14 changed files with 142 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,7 +217,6 @@ public class RelatedChanges extends TabPanel {
// TODO(sbeller): show only on latest revision
ChangeApi.change(info.legacyId().get()).view("submitted_together")
.addParameter("o", "DUMMY")
.get(new TabChangeListCallback(Tab.SUBMITTED_TOGETHER,
info.project(), revision));

10
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java
View File

@@ -291,12 +291,10 @@ class RelatedChangesTab implements IsWidget {
sb.setAttribute("onclick", OPEN);
}
sb.setAttribute("title", info.commit().subject());
if (showProjects && info.project() != null
&& !info.project().isEmpty()) {
if (showProjects) {
sb.append(info.project()).append(": ");
}
if (showBranches && info.branch() != null
&& !info.branch().isEmpty()) {
if (showBranches) {
sb.append(info.branch()).append(": ");
}
sb.append(info.commit().subject());
@@ -333,10 +331,6 @@ class RelatedChangesTab implements IsWidget {
}
private String url() {
if (info.hasChangeNumber() && info._changeNumber() == 0) {
return null;
}
if (info.hasChangeNumber() && info.hasRevisionNumber()) {
return "#" + PageLinks.toChange(info.patchSetId());
}