commit 0938df3d9b45c643684467ed7fa5fad540098f6b
author Nasser Grainawi <nasser.grainawi@linaro.org> Mon Jun 17 13:40:46 2024 -0600
committer Nasser Grainawi <nasser.grainawi@linaro.org> Thu Jun 20 23:25:51 2024 +0000
tree c9b31bc8578fce26174f05a8d9939f36e44edae0
parent bd06b1af28080535df39ca60d8c152f871f57a9c

OutputStreamQuery: Remove duplicate addPatchSets()

When including comments we again tried to add patch sets, but it was a
nearly identical duplicate of a call that already happens. The only
difference was likely a bug where copied approvals would not have been
included.

Release-Notes: skip
Change-Id: Ic4e06a3fd5479cb0c0ae3f175ef364ff715db32d
(cherry picked from commit 96d9efaa113a8e125234377ae208a05f0589c983)

java/com/google/gerrit/server/query/change/OutputStreamQuery.java

diff --git a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
index fdf9cd4..5008d1b 100644
--- a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
+++ b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
@@ -335,15 +335,6 @@
     if (includeComments) {
       eventFactory.addComments(c, d.messages(), accountLoader);
       if (includePatchSets) {
-        eventFactory.addPatchSets(
-            rw,
-            repo != null ? repo.getConfig() : repos.get(d.change().getProject()).getConfig(),
-            c,
-            includeApprovals ? d.approvals().asMap() : null,
-            includeFiles,
-            d,
-            labelTypes,
-            accountLoader);
         for (PatchSetAttribute attribute : c.patchSets) {
           eventFactory.addPatchSetComments(attribute, d.publishedComments(), accountLoader);
         }