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" %}
23
{% if result.get()[1] %}
24
<h2>Info</h2>
25
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre>
26
{% endif %}
27
{% if result.get()[2] %}
28
<h2>Errors</h2>
29
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre>
30
{% endif %}
31
{% if result.get()[7] %}
33
<h2>Cannot merge your branches</h2>
34
<p>
35
Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own
36
computer.
37
</p>
38
<p>
39
In a shell inside your repository execute:
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
Then fix your conflicts, merge, and finally, run:
49
</p>
50
<pre>
51
<span class="decorative-dollar">git remote rm UPSTREAM</span></pre>
52
<p>
53
and push the changes.
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
Resolve your conflicts and merge, then push.
61
</p>
62
{% endif %}
63
{% else %}
64
<h2>Merge simulation went well; continue?</h2>
65
<a href="{{ result.get()[5] }}/prs/{{ request.args.get('pr-id') }}/merge" class="button">Merge</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 %}