task-monitor.html
HTML document, ASCII text
1{% extends "default.html" %} 2{% block title %} 3{% trans result_id=result.id %}Task monitor for {{ result_id }}{% endtrans %} 4{% endblock %} 5{% block breadcrumbs %} 6<li><a href="/task/{{ result.id }}">{% trans result_id=result.id %}Task {{ result_id }}{% endtrans %}</a></li> 7{% endblock %} 8{% block content %} 9{# Update every 5 seconds #} 10<x-frame style="--width: 896px;" class="flexible-space" {% if not result.ready() %}hx-swap="outerHTML" hx-get={{ modify_query(partial=1) }} hx-trigger="load delay:{{ delay }}ms"{% endif %}> 11<x-hbox class="box-center"> 12<h1>{% trans %}Task results{% endtrans %}</h1> 13<div class="flexible-space"></div> 14{% if result.ready() %} 15<iconify-icon icon="mdi:check" style="font-size: 2em; color: var(--color-success);"></iconify-icon> 16{% trans %}Done{% endtrans %} 17{% else %} 18<iconify-icon icon="material-symbols:autorenew" style="font-size: 2em; color: var(--color-info);"></iconify-icon> 19{% trans %}Running...{% endtrans %} 20{% endif %} 21</x-hbox> 22 23{% if result.ready() %} 24{% if result.get()[0] == "merge" %} 25{% if result.get()[1] %} 26<h2>{% trans %}Info{% endtrans %}</h2> 27<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre> 28{% endif %} 29{% if result.get()[2] %} 30<h2>{% trans %}Errors{% endtrans %}</h2> 31<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre> 32{% endif %} 33{% endif %} 34 35{% if result.get()[0] == "merge_simulator" %} 36{% if result.get()[1] %} 37<h2>{% trans %}Info{% endtrans %}</h2> 38<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre> 39{% endif %} 40{% if result.get()[2] %} 41<h2>{% trans %}Errors{% endtrans %}</h2> 42<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre> 43{% endif %} 44 45{% if result.get()[7] %} 46<h2>{% trans %}Cannot merge your branches{% endtrans %}</h2> 47<p> 48{% trans %}Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own computer.{% endtrans %} 49</p> 50<p> 51{% trans %}In a shell inside your repository execute:{% endtrans %} 52</p> 53{% if result.get()[3] != result.get()[5] %} 54<pre> 55<span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span> 56<span class="decorative-dollar">git remote update</span> 57<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span> 58<span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre> 59<p> 60{% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %} 61</p> 62<pre> 63<span class="decorative-dollar">git remote rm UPSTREAM</span></pre> 64<p> 65{% trans %}and push the changes.{% endtrans %} 66</p> 67{% else %} 68<pre> 69<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span> 70<span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre> 71<p> 72{% trans %}Resolve your conflicts and merge, then push.{% endtrans %} 73</p> 74{% endif %} 75{% else %} 76<h2>{% trans %}Merge simulation went well; continue?{% endtrans %}</h2> 77<a href="{{ result.get()[5] }}/prs/{{ request.args.get('pr-id') }}/merge" class="button">{% trans %}Merge{% endtrans %}</a> 78{% endif %} 79{% endif %} 80{% endif %} 81</x-frame> 82<style> 83@keyframes rotate { 840% { 85transform: rotate(0); 86} 87100% { 88transform: rotate(1turn); 89} 90} 91 92.decorative-dollar::before { 93content: "$ "; 94} 95</style> 96{% endblock %} 97