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="/task/{{ result.id }}?partial=1" hx-trigger="load delay:1s"{% 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="animation: rotate 750ms linear infinite; font-size: 2em; color: var(--color-info);"></iconify-icon>
19
{% trans %}Running...{% endtrans %}
20
{% endif %}
21
</x-hbox>
22
{% if result.get()[0] == "merge_simulator" %}
24
{% if result.get()[1] %}
25
<h2>{% trans %}Info{% endtrans %}</h2>
26
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre>
27
{% endif %}
28
{% if result.get()[2] %}
29
<h2>{% trans %}Errors{% endtrans %}</h2>
30
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre>
31
{% endif %}
32
{% if result.get()[7] %}
34
<h2>{% trans %}Cannot merge your branches{% endtrans %}</h2>
35
<p>
36
{% trans %}Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own computer.{% endtrans %}
37
</p>
38
<p>
39
{% trans %}In a shell inside your repository execute:{% endtrans %}
40
</p>
41
{% if result.get()[3] != result.get()[5] %}
42
<pre>
43
<span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span>
44
<span class="decorative-dollar">git remote update</span>
45
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
46
<span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre>
47
<p>
48
{% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %}
49
</p>
50
<pre>
51
<span class="decorative-dollar">git remote rm UPSTREAM</span></pre>
52
<p>
53
{% trans %}and push the changes.{% endtrans %}
54
</p>
55
{% else %}
56
<pre>
57
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
58
<span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre>
59
<p>
60
{% trans %}Resolve your conflicts and merge, then push.{% endtrans %}
61
</p>
62
{% endif %}
63
{% else %}
64
<h2>{% trans %}Merge simulation went well; continue?{% endtrans %}</h2>
65
<a href="{{ result.get()[5] }}/prs/{{ request.args.get('pr-id') }}/merge" class="button">{% trans %}Merge{% endtrans %}</a>
66
{% endif %}
67
{% endif %}
68
</x-frame>
69
<style>
70
@keyframes rotate {
71
0% {
72
transform: rotate(0);
73
}
74
100% {
75
transform: rotate(1turn);
76
}
77
}
78
.decorative-dollar::before {
80
content: "$ ";
81
}
82
</style>
83
{% endblock %}
84