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