swarming: custom cipd package paths

appengine/swarming/templates/user_task.html

 {% extends "swarming/base.html" %}
 
 
 {% block headers %}
 <style>
   h1 {
     margin-top: 10px;
     margin-bottom: 10px;
   }
 
@@ skipping 51 matching lines @@
 
   .code {
     font-family: monospace;
     white-space: pre-wrap;
   }
 
   .spaced {
     margin-top: 10px;
     margin-bottom: 5px;
   }
+
+  .package-list {
+    margin-left: 1em;
+  }
 </style>
 {% endblock %}
 
 
 {% block body %}
 {% import 'swarming/bot_view.html' as bot_view %}
 
 
 {% macro summarize_array(values) %}
   {% if not values %}
@@ skipping 141 matching lines @@
           <tr title="CIPD server">
             <td>CIPD server</td>
             <td>{{request.properties.cipd_input.server}}</td>
           </tr>
           <tr title="CIPD client">
             <td>CIPD client</td>
             <td>{{request.properties.cipd_input.client_package}}</td>
           </tr>
           <tr title="CIPD pacakges">
             <td>CIPD packages</td>
-            <td>{{request.properties.cipd_input.packages|join('<br>'|safe)}}</td>
+            <td>
+              {% for path, packages in request.properties.cipd_input.packages_grouped_by_path() %}
+                <div>{{ path or '.'}}/</div>
+                <div class="package-list">
+                  {{packages|join('<br>'|safe)}}
+                </div>
+              {% endfor %}
+            </td>
           </tr>
         {% endif %}
         {% if request.properties.inputs_ref and request.properties.inputs_ref.isolated %}
           <tr title="Inputs files">
             <td>Isolated inputs</td>
             <td>
               <a
                 href="{{request.properties.inputs_ref.isolatedserver}}/browse?namespace={{request.properties.inputs_ref.namespace}}&hash={{request.properties.inputs_ref.isolated}}">
                 {{request.properties.inputs_ref.isolated}}
               </a>
@@ skipping 284 matching lines @@
 
 {% set output = task.get_output() %}
 {% if output is not none %}
 <h3>Output:</h3>
 <pre>
 {{task.get_output().decode('utf-8', 'replace')}}{% if is_running %}<p class="console"><span class="blink">|</span>{% endif %}
 </pre>
 {% endif %}
 
 {% endblock %}