excessive tooltip in queued builds

Author: mawinter69

core/src/main/java/hudson/model/Cause.java

@@ -37,7 +37,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import jenkins.model.Jenkins;
@@ -166,7 +168,8 @@ public static class UpstreamCause extends Cause {
          */
         @Deprecated
         private transient Cause upstreamCause;
-        private @NonNull List<Cause> upstreamCauses;
+        private transient @NonNull List<Cause> upstreamCauses;
+        private @NonNull Map<Cause, Integer> causeBag = new LinkedHashMap<>();
 
         /**
          * @deprecated since 2009-02-28
@@ -181,7 +184,6 @@ public UpstreamCause(Run<?, ?> up) {
             upstreamBuild = up.getNumber();
             upstreamProject = up.getParent().getFullName();
             upstreamUrl = up.getParent().getUrl();
-            upstreamCauses = new ArrayList<>();
             Set<String> traversed = new HashSet<>();
             for (Cause c : up.getCauses()) {
                 if (traversed.size() >= MAX_LEAF) {
@@ -192,11 +194,11 @@ public UpstreamCause(Run<?, ?> up) {
             }
         }
 
-        private UpstreamCause(String upstreamProject, int upstreamBuild, String upstreamUrl, @NonNull List<Cause> upstreamCauses) {
+        private UpstreamCause(String upstreamProject, int upstreamBuild, String upstreamUrl, @NonNull Map<Cause, Integer> causeBag) {
             this.upstreamProject = upstreamProject;
             this.upstreamBuild = upstreamBuild;
             this.upstreamUrl = upstreamUrl;
-            this.upstreamCauses = upstreamCauses;
+            this.causeBag = causeBag;
         }
 
         @Override
@@ -342,7 +344,10 @@ public static class ConverterImpl extends XStream2.PassthruConverter<UpstreamCau
 
             @Override protected void callback(UpstreamCause uc, UnmarshallingContext context) {
                 if (uc.upstreamCause != null) {
-                    uc.upstreamCauses.add(uc.upstreamCause);
+                    if (uc.causeBag == null) {
+                        uc.causeBag = new LinkedHashMap<>();
+                    }
+                    uc.causeBag.put(uc.upstreamCause, uc.causeBag.size());
                     uc.upstreamCause = null;
                     OldDataMonitor.report(context, "1.288");
                 }

core/src/main/java/hudson/model/Queue.java

@@ -2399,6 +2399,14 @@ public final List<Cause> getCauses() {
             return Collections.emptyList();
         }
 
+        @Restricted(DoNotUse.class) // used from Jelly
+        public final Map<Cause, Integer> getCauseCounts() {
+            CauseAction ca = getAction(CauseAction.class);
+            if (ca != null)
+                return ca.getCauseCounts();
+            return Collections.emptyMap();
+        }
+
         @Restricted(DoNotUse.class) // used from Jelly
         @Override
         public String getCausesDescription() {

core/src/main/resources/lib/hudson/queue.jelly

@@ -74,8 +74,13 @@ THE SOFTWARE.
               <j:set var="stuck" value="${item.isStuck()}"/>
               <j:choose>
                 <j:when test="${h.hasPermission(item.task,item.task.READ)}">
+                  <j:set var="causeDescription">
+                    <j:forEach var="entry" items="${item.causeCounts.entrySet()}">${entry.key.shortDescription}<j:if test="${entry.value > 1}"><st:nbsp/>${%Ntimes(entry.value)}</j:if><br/>
+                    </j:forEach>${item.why} ${item.params}
+                    ${%WaitingFor(item.inQueueForString)}
+                  </j:set>
                   <a href="${rootURL}/${item.task.url}" class="model-link inside tl-tr"
-                     tooltip="${item.causesDescription} ${item.why} ${item.params} \n ${%WaitingFor(item.inQueueForString)}"
+                     data-html-tooltip="${causeDescription}"
                      data-tooltip-append-to-parent="true">
                     <l:breakable value="${item.displayName}"/>
                   </a>

core/src/main/resources/lib/hudson/queue.properties

@@ -2,3 +2,4 @@ Build\ Queue=Build Queue{0,choice,0#|0< ({0,number})}
 Filtered\ Build\ Queue=Filtered Build Queue{0,choice,0#|0< ({0,number})}
 WaitingFor=Waiting for {0}
 confirm=Are you sure you want to cancel the queued run of {0}?
+Ntimes=({0} times)