Merge branch 'cursor/ci-stage-hoogte-65da' into 'master'
CI-weergave: zwevende stages, afgebroken logs en een live wachtrij See merge request Timfa/bluegit!24
@@ -111,8 +111,9 @@ func serve(args []string) error {
111
111
if cfg.CI.Enabled {
112
112
rn = &runner.Runner{
113
113
Store: st, GitBin: cfg.Git.Binary, Docker: cfg.CI.Docker, Storage: dataPath,
114
BaseURL: cfg.BaseURL, Network: cfg.CI.Network, Timeout: time.Duration(cfg.CI.TimeoutSec) * time.Second,
115
Log: log, OnEvent: srv.Dispatch,
114
BaseURL: cfg.BaseURL, Network: cfg.CI.Network, Name: cfg.Runner.Name,
115
Timeout: time.Duration(cfg.CI.TimeoutSec) * time.Second,
116
Log: log, OnEvent: srv.Dispatch, Presets: cfg.CI.ImageOverrides(),
116
117
}
117
118
srv.Runner = rn
118
119
go rn.Loop(ctx, cfg.CI.Concurrency)
@@ -111,8 +111,9 @@ func serve(args []string) error {111
if cfg.CI.Enabled {111
if cfg.CI.Enabled {112
rn = &runner.Runner{112
rn = &runner.Runner{113
Store: st, GitBin: cfg.Git.Binary, Docker: cfg.CI.Docker, Storage: dataPath,113
Store: st, GitBin: cfg.Git.Binary, Docker: cfg.CI.Docker, Storage: dataPath,114
BaseURL: cfg.BaseURL, Network: cfg.CI.Network, Timeout: time.Duration(cfg.CI.TimeoutSec) * time.Second,114
BaseURL: cfg.BaseURL, Network: cfg.CI.Network, Name: cfg.Runner.Name,115
Log: log, OnEvent: srv.Dispatch,115
Timeout: time.Duration(cfg.CI.TimeoutSec) * time.Second,116
Log: log, OnEvent: srv.Dispatch, Presets: cfg.CI.ImageOverrides(),116
}117
}117
srv.Runner = rn118
srv.Runner = rn118
go rn.Loop(ctx, cfg.CI.Concurrency)119
go rn.Loop(ctx, cfg.CI.Concurrency)@@ -32,7 +32,7 @@ jobs:
32
32
| Veld | Betekenis |
33
33
| --- | --- |
34
34
| `stages` | Volgorde. Weggelaten: de stages in de volgorde waarin de jobs ze noemen. Een job zonder stage valt in `test`. |
35
| `image` | Standaardimage, als tekst of als `name:`. `default.image` wint als die gezet is. |
35
| `image` | Standaardimage, als tekst of als `name:`. `default.image` wint als die gezet is. Een preset zoals `bluegit/base` mag. `node:22` blijft een gewoon image. |
36
36
| `default` | `image`, `before_script`, `after_script`, `tags`, `timeout`, `cache` voor jobs die het zelf niet zetten. |
37
37
| `include` | Alleen `local`. Een job met dezelfde naam wordt samengevoegd; het buitenste bestand wint per veld. |
38
38
| `variables` | Tekst, of `{value: ...}`. Een job overschrijft dezelfde naam. |
@@ -80,7 +80,25 @@ Een merge-request-pipeline start bij het openen van de merge request, bij elke p
80
80
81
81
## Bewust niet
82
82
83
`pages`, `spec`, een include van een ander project of van een URL, trigger- en child-pipelines, `coverage`, `id_tokens`, `inherit` en `hooks`. Die sleutels geven een waarschuwing in de editor en houden de rest van het bestand niet tegen. Er is één runner, in het BlueGit-proces, die Docker op dezelfde host aanroept. Zijn naam is `runner.name` in de configuratie, standaard Steve. Die naam staat bij de runner op de jobpagina, op de pipelinedetails en boven het joblog. `tags` kiezen die runner niet. `services` delen één netwerk met de job; er is geen healthcheck verder dan een gestarte container.
83
`pages`, `spec`, een include van een ander project of van een URL, trigger- en child-pipelines, `coverage`, `id_tokens`, `inherit` en `hooks`. Die sleutels geven een waarschuwing in de editor en houden de rest van het bestand niet tegen. Er is één runner, in het BlueGit-proces, die Docker op dezelfde host aanroept. Zijn naam is `runner.name` in de configuratie, standaard Steve. In `Preparing the docker executor` staat altijd `Using docker image …`, en de image-id met digest als het image al lokaal aanwezig is. Een preset schrijft daar ook `Using image preset … based on …` en, na een bouw, `Underlying image … with digest …`. In `Preparing environment` staan de runnernaam, de host, de werkmap `/workspace` en het pipeline- en jobnummer. Die naam staat bij de runner op de jobpagina, op de pipelinedetails en boven het joblog. `tags` kiezen die runner niet. `services` delen één netwerk met de job; er is geen healthcheck verder dan een gestarte container.
84
85
## Image-presets
86
87
Steve heeft geen aparte runners per taal. `image: bluegit/base` en de andere aliassen zijn Dockerfiles in deze repository. Bij het eerste gebruik bouwt Steve ze lokaal en hergebruikt hij het resultaat zolang de Dockerfile hetzelfde blijft.
88
89
| Preset | Basis |
90
| --- | --- |
91
| `bluegit/base` | Alpine 3.20, met git, curl en bash |
92
| `bluegit/node` | Node.js 22 |
93
| `bluegit/python` | Python 3.12 |
94
| `bluegit/go` | Go 1.22 |
95
| `bluegit/rust` | Rust 1.81 |
96
| `bluegit/java` | Java 21 (Temurin) |
97
| `bluegit/dotnet` | .NET SDK 8 |
98
99
Elk image krijgt daar bash, ca-certificates, curl en git bij. `ci.presets` in `config.yml` voegt een alias toe of vervangt een ingebouwde: `image` mapt direct, `dockerfile` wijst naar een bestand, `from` herschrijft de eerste `FROM`.
100
101
`/-/info` toont deze specificatie en de presets. `GET /api/v1/ci/spec` geeft dezelfde inhoud als JSON. De pagina zet die JSON ook in `<script type="application/json" id="bluegit-ci-spec">`.
84
102
85
103
## Editor
86
104
@@ -107,10 +125,14 @@ Het commit moet in de repository bestaan. Het asset moet een artifact zijn van e
107
125
108
126
## Wanneer een job start
109
127
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1).
128
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.
129
130
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen. Een lopende job is een blauw icoon met een spinner; `pending` en `created` zijn een holle grijze cirkel. De commitbalk op het repo-overzicht toont diezelfde status.
131
132
Een commit die BlueGit zelf maakt loopt door één post-receive-route, dezelfde als een `git push`. Dat geldt voor de Pipeline Editor, het toepassen van een suggestie, het mergen van een merge request en een tag die in de interface of via de release-API ontstaat. Die route start de pipeline, de push-webhook en de activity.
111
133
112
134
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).
113
135
114
136
## Live log
115
137
116
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.
138
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. Diezelfde poll werkt de wachtrijplek bij zolang de job nog queued is. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.
@@ -32,7 +32,7 @@ jobs:32
| Veld | Betekenis |32
| Veld | Betekenis |33
| --- | --- |33
| --- | --- |34
| `stages` | Volgorde. Weggelaten: de stages in de volgorde waarin de jobs ze noemen. Een job zonder stage valt in `test`. |34
| `stages` | Volgorde. Weggelaten: de stages in de volgorde waarin de jobs ze noemen. Een job zonder stage valt in `test`. |35
| `image` | Standaardimage, als tekst of als `name:`. `default.image` wint als die gezet is. |35
| `image` | Standaardimage, als tekst of als `name:`. `default.image` wint als die gezet is. Een preset zoals `bluegit/base` mag. `node:22` blijft een gewoon image. |36
| `default` | `image`, `before_script`, `after_script`, `tags`, `timeout`, `cache` voor jobs die het zelf niet zetten. |36
| `default` | `image`, `before_script`, `after_script`, `tags`, `timeout`, `cache` voor jobs die het zelf niet zetten. |37
| `include` | Alleen `local`. Een job met dezelfde naam wordt samengevoegd; het buitenste bestand wint per veld. |37
| `include` | Alleen `local`. Een job met dezelfde naam wordt samengevoegd; het buitenste bestand wint per veld. |38
| `variables` | Tekst, of `{value: ...}`. Een job overschrijft dezelfde naam. |38
| `variables` | Tekst, of `{value: ...}`. Een job overschrijft dezelfde naam. |@@ -80,7 +80,25 @@ Een merge-request-pipeline start bij het openen van de merge request, bij elke p80
80
81
## Bewust niet81
## Bewust niet82
82
83
`pages`, `spec`, een include van een ander project of van een URL, trigger- en child-pipelines, `coverage`, `id_tokens`, `inherit` en `hooks`. Die sleutels geven een waarschuwing in de editor en houden de rest van het bestand niet tegen. Er is één runner, in het BlueGit-proces, die Docker op dezelfde host aanroept. Zijn naam is `runner.name` in de configuratie, standaard Steve. Die naam staat bij de runner op de jobpagina, op de pipelinedetails en boven het joblog. `tags` kiezen die runner niet. `services` delen één netwerk met de job; er is geen healthcheck verder dan een gestarte container.83
`pages`, `spec`, een include van een ander project of van een URL, trigger- en child-pipelines, `coverage`, `id_tokens`, `inherit` en `hooks`. Die sleutels geven een waarschuwing in de editor en houden de rest van het bestand niet tegen. Er is één runner, in het BlueGit-proces, die Docker op dezelfde host aanroept. Zijn naam is `runner.name` in de configuratie, standaard Steve. In `Preparing the docker executor` staat altijd `Using docker image …`, en de image-id met digest als het image al lokaal aanwezig is. Een preset schrijft daar ook `Using image preset … based on …` en, na een bouw, `Underlying image … with digest …`. In `Preparing environment` staan de runnernaam, de host, de werkmap `/workspace` en het pipeline- en jobnummer. Die naam staat bij de runner op de jobpagina, op de pipelinedetails en boven het joblog. `tags` kiezen die runner niet. `services` delen één netwerk met de job; er is geen healthcheck verder dan een gestarte container.84
85
## Image-presets86
87
Steve heeft geen aparte runners per taal. `image: bluegit/base` en de andere aliassen zijn Dockerfiles in deze repository. Bij het eerste gebruik bouwt Steve ze lokaal en hergebruikt hij het resultaat zolang de Dockerfile hetzelfde blijft.88
89
| Preset | Basis |90
| --- | --- |91
| `bluegit/base` | Alpine 3.20, met git, curl en bash |92
| `bluegit/node` | Node.js 22 |93
| `bluegit/python` | Python 3.12 |94
| `bluegit/go` | Go 1.22 |95
| `bluegit/rust` | Rust 1.81 |96
| `bluegit/java` | Java 21 (Temurin) |97
| `bluegit/dotnet` | .NET SDK 8 |98
99
Elk image krijgt daar bash, ca-certificates, curl en git bij. `ci.presets` in `config.yml` voegt een alias toe of vervangt een ingebouwde: `image` mapt direct, `dockerfile` wijst naar een bestand, `from` herschrijft de eerste `FROM`.100
101
`/-/info` toont deze specificatie en de presets. `GET /api/v1/ci/spec` geeft dezelfde inhoud als JSON. De pagina zet die JSON ook in `<script type="application/json" id="bluegit-ci-spec">`.84
102
85
## Editor103
## Editor86
104
@@ -107,10 +125,14 @@ Het commit moet in de repository bestaan. Het asset moet een artifact zijn van e107
125
108
## Wanneer een job start126
## Wanneer een job start109
127
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1).128
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.129
130
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen. Een lopende job is een blauw icoon met een spinner; `pending` en `created` zijn een holle grijze cirkel. De commitbalk op het repo-overzicht toont diezelfde status.131
132
Een commit die BlueGit zelf maakt loopt door één post-receive-route, dezelfde als een `git push`. Dat geldt voor de Pipeline Editor, het toepassen van een suggestie, het mergen van een merge request en een tag die in de interface of via de release-API ontstaat. Die route start de pipeline, de push-webhook en de activity.111
133
112
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).134
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).113
135
114
## Live log136
## Live log115
137
116
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.138
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. Diezelfde poll werkt de wachtrijplek bij zolang de job nog queued is. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.@@ -0,0 +1,236 @@
1
// Package cispec is de blue-ci-cd.yml-specificatie.
2
// De infopagina en GET /api/v1/ci/spec gebruiken allebei Build, zodat de
3
// tekst en de presets niet uit elkaar lopen.
4
package cispec
5
6
import (
7
"bytes"
8
"encoding/json"
9
10
"gitlab.com/Timfa/bluegit/internal/i18n"
11
"gitlab.com/Timfa/bluegit/internal/images"
12
)
13
14
// Doc is het document dat de pagina tekent en de API teruggeeft.
15
type Doc struct {
16
File string `json:"file"`
17
Example string `json:"example"`
18
Sections []Section `json:"sections"`
19
}
20
21
// Section is één blok: sleutelwoorden, variabelen, verschillen of presets.
22
type Section struct {
23
ID string `json:"id"`
24
Title string `json:"title"`
25
Intro string `json:"intro,omitempty"`
26
Kind string `json:"kind"`
27
Items []Item `json:"items,omitempty"`
28
Variables []Variable `json:"variables,omitempty"`
29
Lines []string `json:"lines,omitempty"`
30
Presets []Preset `json:"presets,omitempty"`
31
}
32
33
// Item is één sleutelwoord.
34
type Item struct {
35
Name string `json:"name"`
36
Summary string `json:"summary"`
37
}
38
39
// Variable is een voorgedefinieerde CI_-variabele.
40
// Scope is both, container of mr en blijft in het Engels, ook als de pagina vertaald is.
41
type Variable struct {
42
Name string `json:"name"`
43
Scope string `json:"scope"`
44
Where string `json:"where"`
45
Summary string `json:"summary"`
46
}
47
48
// Preset is één image-alias zoals Steve die bouwt of mapt.
49
type Preset struct {
50
Name string `json:"name"`
51
Runtime string `json:"runtime"`
52
From string `json:"from"`
53
Tools []string `json:"tools"`
54
Mode string `json:"mode"`
55
}
56
57
const example = `image: bluegit/base
58
unit:
59
stage: test
60
image: bluegit/node
61
script:
62
- node --version
63
plain:
64
stage: test
65
image: node:22
66
script:
67
- node --version
68
`
69
70
// Build maakt het document in lang. presets nil gebruikt de ingebouwde lijst.
71
func Build(lang i18n.Lang, presets []images.Preset) Doc {
72
if presets == nil {
73
presets = images.Builtin()
74
}
75
t := func(key string) string { return i18n.T(lang, key) }
76
kw := func(name, key string) Item { return Item{Name: name, Summary: t(key)} }
77
where := map[string]string{
78
"both": t("info.where.both"),
79
"container": t("info.where.container"),
80
"mr": t("info.where.mr"),
81
}
82
variable := func(name, scope string) Variable {
83
return Variable{Name: name, Scope: scope, Where: where[scope], Summary: t("info.var." + name)}
84
}
85
doc := Doc{
86
File: "blue-ci-cd.yml",
87
Example: example,
88
Sections: []Section{
89
{
90
ID: "pipeline", Title: t("info.sec.pipeline"), Kind: "keywords",
91
Items: []Item{
92
kw("stages", "info.kw.stages"),
93
kw("variables", "info.kw.variables"),
94
kw("image", "info.kw.image"),
95
kw("default", "info.kw.default"),
96
kw("include", "info.kw.include"),
97
kw("before_script", "info.kw.before_script"),
98
kw("after_script", "info.kw.after_script"),
99
kw("cache", "info.kw.cache"),
100
kw("workflow", "info.kw.workflow"),
101
kw("jobs", "info.kw.jobs"),
102
},
103
},
104
{
105
ID: "jobs", Title: t("info.sec.job"), Kind: "keywords",
106
Items: []Item{
107
kw("stage", "info.kw.stage"),
108
kw("image", "info.kw.image"),
109
kw("before_script", "info.kw.before_script"),
110
kw("script", "info.kw.script"),
111
kw("after_script", "info.kw.after_script"),
112
kw("needs", "info.kw.needs"),
113
kw("rules", "info.kw.rules"),
114
kw("only", "info.kw.only"),
115
kw("except", "info.kw.except"),
116
kw("when", "info.kw.when"),
117
kw("allow_failure", "info.kw.allow_failure"),
118
kw("artifacts", "info.kw.artifacts"),
119
kw("cache", "info.kw.cache"),
120
kw("resource_group", "info.kw.resource_group"),
121
kw("timeout", "info.kw.timeout"),
122
kw("retry", "info.kw.retry"),
123
kw("parallel", "info.kw.parallel"),
124
kw("services", "info.kw.services"),
125
kw("environment", "info.kw.environment"),
126
kw("interruptible", "info.kw.interruptible"),
127
kw("tags", "info.kw.tags"),
128
kw("extends", "info.kw.extends"),
129
},
130
},
131
{
132
ID: "rules", Title: t("info.sec.rules"), Kind: "keywords",
133
Intro: t("info.rules.intro"),
134
Items: []Item{
135
kw("if", "info.kw.if"),
136
kw("changes", "info.kw.changes"),
137
kw("exists", "info.kw.exists"),
138
kw("when", "info.kw.when"),
139
},
140
},
141
{
142
ID: "variables", Title: t("info.sec.variables"), Kind: "variables",
143
Variables: []Variable{
144
variable("CI", "both"),
145
variable("CI_CONFIG_PATH", "both"),
146
variable("CI_SERVER_NAME", "both"),
147
variable("CI_COMMIT_SHA", "both"),
148
variable("CI_COMMIT_SHORT_SHA", "both"),
149
variable("CI_COMMIT_REF", "both"),
150
variable("CI_COMMIT_REF_NAME", "both"),
151
variable("CI_COMMIT_REF_SLUG", "both"),
152
variable("CI_COMMIT_TITLE", "both"),
153
variable("CI_COMMIT_BRANCH", "both"),
154
variable("CI_COMMIT_TAG", "both"),
155
variable("CI_DEFAULT_BRANCH", "both"),
156
variable("CI_PIPELINE_ID", "both"),
157
variable("CI_PIPELINE_SOURCE", "both"),
158
variable("CI_PIPELINE_URL", "both"),
159
variable("CI_PROJECT_PATH", "both"),
160
variable("CI_PROJECT_NAME", "both"),
161
variable("CI_PROJECT_NAMESPACE", "both"),
162
variable("CI_PROJECT_URL", "both"),
163
variable("CI_API_URL", "both"),
164
variable("CI_JOB_ID", "container"),
165
variable("CI_JOB_NAME", "container"),
166
variable("CI_JOB_STAGE", "container"),
167
variable("CI_JOB_URL", "container"),
168
variable("CI_JOB_TOKEN", "container"),
169
variable("CI_NODE_INDEX", "container"),
170
variable("CI_NODE_TOTAL", "container"),
171
variable("CI_ENVIRONMENT_NAME", "container"),
172
variable("CI_ENVIRONMENT_URL", "container"),
173
variable("CI_MERGE_REQUEST_ID", "mr"),
174
variable("CI_MERGE_REQUEST_IID", "mr"),
175
variable("CI_MERGE_REQUEST_TITLE", "mr"),
176
variable("CI_MERGE_REQUEST_SOURCE_BRANCH_NAME", "mr"),
177
variable("CI_MERGE_REQUEST_SOURCE_BRANCH_SHA", "mr"),
178
variable("CI_MERGE_REQUEST_TARGET_BRANCH_NAME", "mr"),
179
variable("CI_MERGE_REQUEST_TARGET_BRANCH_SHA", "mr"),
180
variable("CI_MERGE_REQUEST_PROJECT_PATH", "mr"),
181
variable("CI_MERGE_REQUEST_PROJECT_URL", "mr"),
182
},
183
},
184
{
185
ID: "differences", Title: t("info.sec.diff"), Kind: "list",
186
Lines: []string{
187
t("info.diff.file"),
188
t("info.diff.runner"),
189
t("info.diff.include"),
190
t("info.diff.unsupported"),
191
t("info.diff.services"),
192
t("info.diff.env"),
193
t("info.diff.retry"),
194
t("info.diff.parallel"),
195
t("info.diff.rules"),
196
t("info.diff.mr"),
197
t("info.diff.cache"),
198
t("info.diff.images"),
199
},
200
},
201
{
202
ID: "presets", Title: t("info.sec.presets"), Kind: "presets",
203
Intro: t("info.presets.intro") + " " + t("info.presets.config"),
204
Presets: presetDocs(presets),
205
},
206
},
207
}
208
return doc
209
}
210
211
func presetDocs(in []images.Preset) []Preset {
212
out := make([]Preset, 0, len(in))
213
for _, p := range in {
214
mode := "dockerfile"
215
if p.Direct != "" {
216
mode = "image"
217
}
218
tools := p.Tools
219
if tools == nil {
220
tools = []string{}
221
}
222
out = append(out, Preset{
223
Name: p.Name, Runtime: p.Runtime, From: p.From, Tools: tools, Mode: mode,
224
})
225
}
226
return out
227
}
228
229
// Marshal is de JSON die de pagina in het scriptblok zet en de API schrijft.
230
func Marshal(doc Doc) []byte {
231
var buf bytes.Buffer
232
enc := json.NewEncoder(&buf)
233
enc.SetEscapeHTML(true)
234
_ = enc.Encode(doc)
235
return buf.Bytes()
236
}
@@ -0,0 +1,236 @@1
// Package cispec is de blue-ci-cd.yml-specificatie.2
// De infopagina en GET /api/v1/ci/spec gebruiken allebei Build, zodat de3
// tekst en de presets niet uit elkaar lopen.4
package cispec5
6
import (7
"bytes"8
"encoding/json"9
10
"gitlab.com/Timfa/bluegit/internal/i18n"11
"gitlab.com/Timfa/bluegit/internal/images"12
)13
14
// Doc is het document dat de pagina tekent en de API teruggeeft.15
type Doc struct {16
File string `json:"file"`17
Example string `json:"example"`18
Sections []Section `json:"sections"`19
}20
21
// Section is één blok: sleutelwoorden, variabelen, verschillen of presets.22
type Section struct {23
ID string `json:"id"`24
Title string `json:"title"`25
Intro string `json:"intro,omitempty"`26
Kind string `json:"kind"`27
Items []Item `json:"items,omitempty"`28
Variables []Variable `json:"variables,omitempty"`29
Lines []string `json:"lines,omitempty"`30
Presets []Preset `json:"presets,omitempty"`31
}32
33
// Item is één sleutelwoord.34
type Item struct {35
Name string `json:"name"`36
Summary string `json:"summary"`37
}38
39
// Variable is een voorgedefinieerde CI_-variabele.40
// Scope is both, container of mr en blijft in het Engels, ook als de pagina vertaald is.41
type Variable struct {42
Name string `json:"name"`43
Scope string `json:"scope"`44
Where string `json:"where"`45
Summary string `json:"summary"`46
}47
48
// Preset is één image-alias zoals Steve die bouwt of mapt.49
type Preset struct {50
Name string `json:"name"`51
Runtime string `json:"runtime"`52
From string `json:"from"`53
Tools []string `json:"tools"`54
Mode string `json:"mode"`55
}56
57
const example = `image: bluegit/base58
unit:59
stage: test60
image: bluegit/node61
script:62
- node --version63
plain:64
stage: test65
image: node:2266
script:67
- node --version68
`69
70
// Build maakt het document in lang. presets nil gebruikt de ingebouwde lijst.71
func Build(lang i18n.Lang, presets []images.Preset) Doc {72
if presets == nil {73
presets = images.Builtin()74
}75
t := func(key string) string { return i18n.T(lang, key) }76
kw := func(name, key string) Item { return Item{Name: name, Summary: t(key)} }77
where := map[string]string{78
"both": t("info.where.both"),79
"container": t("info.where.container"),80
"mr": t("info.where.mr"),81
}82
variable := func(name, scope string) Variable {83
return Variable{Name: name, Scope: scope, Where: where[scope], Summary: t("info.var." + name)}84
}85
doc := Doc{86
File: "blue-ci-cd.yml",87
Example: example,88
Sections: []Section{89
{90
ID: "pipeline", Title: t("info.sec.pipeline"), Kind: "keywords",91
Items: []Item{92
kw("stages", "info.kw.stages"),93
kw("variables", "info.kw.variables"),94
kw("image", "info.kw.image"),95
kw("default", "info.kw.default"),96
kw("include", "info.kw.include"),97
kw("before_script", "info.kw.before_script"),98
kw("after_script", "info.kw.after_script"),99
kw("cache", "info.kw.cache"),100
kw("workflow", "info.kw.workflow"),101
kw("jobs", "info.kw.jobs"),102
},103
},104
{105
ID: "jobs", Title: t("info.sec.job"), Kind: "keywords",106
Items: []Item{107
kw("stage", "info.kw.stage"),108
kw("image", "info.kw.image"),109
kw("before_script", "info.kw.before_script"),110
kw("script", "info.kw.script"),111
kw("after_script", "info.kw.after_script"),112
kw("needs", "info.kw.needs"),113
kw("rules", "info.kw.rules"),114
kw("only", "info.kw.only"),115
kw("except", "info.kw.except"),116
kw("when", "info.kw.when"),117
kw("allow_failure", "info.kw.allow_failure"),118
kw("artifacts", "info.kw.artifacts"),119
kw("cache", "info.kw.cache"),120
kw("resource_group", "info.kw.resource_group"),121
kw("timeout", "info.kw.timeout"),122
kw("retry", "info.kw.retry"),123
kw("parallel", "info.kw.parallel"),124
kw("services", "info.kw.services"),125
kw("environment", "info.kw.environment"),126
kw("interruptible", "info.kw.interruptible"),127
kw("tags", "info.kw.tags"),128
kw("extends", "info.kw.extends"),129
},130
},131
{132
ID: "rules", Title: t("info.sec.rules"), Kind: "keywords",133
Intro: t("info.rules.intro"),134
Items: []Item{135
kw("if", "info.kw.if"),136
kw("changes", "info.kw.changes"),137
kw("exists", "info.kw.exists"),138
kw("when", "info.kw.when"),139
},140
},141
{142
ID: "variables", Title: t("info.sec.variables"), Kind: "variables",143
Variables: []Variable{144
variable("CI", "both"),145
variable("CI_CONFIG_PATH", "both"),146
variable("CI_SERVER_NAME", "both"),147
variable("CI_COMMIT_SHA", "both"),148
variable("CI_COMMIT_SHORT_SHA", "both"),149
variable("CI_COMMIT_REF", "both"),150
variable("CI_COMMIT_REF_NAME", "both"),151
variable("CI_COMMIT_REF_SLUG", "both"),152
variable("CI_COMMIT_TITLE", "both"),153
variable("CI_COMMIT_BRANCH", "both"),154
variable("CI_COMMIT_TAG", "both"),155
variable("CI_DEFAULT_BRANCH", "both"),156
variable("CI_PIPELINE_ID", "both"),157
variable("CI_PIPELINE_SOURCE", "both"),158
variable("CI_PIPELINE_URL", "both"),159
variable("CI_PROJECT_PATH", "both"),160
variable("CI_PROJECT_NAME", "both"),161
variable("CI_PROJECT_NAMESPACE", "both"),162
variable("CI_PROJECT_URL", "both"),163
variable("CI_API_URL", "both"),164
variable("CI_JOB_ID", "container"),165
variable("CI_JOB_NAME", "container"),166
variable("CI_JOB_STAGE", "container"),167
variable("CI_JOB_URL", "container"),168
variable("CI_JOB_TOKEN", "container"),169
variable("CI_NODE_INDEX", "container"),170
variable("CI_NODE_TOTAL", "container"),171
variable("CI_ENVIRONMENT_NAME", "container"),172
variable("CI_ENVIRONMENT_URL", "container"),173
variable("CI_MERGE_REQUEST_ID", "mr"),174
variable("CI_MERGE_REQUEST_IID", "mr"),175
variable("CI_MERGE_REQUEST_TITLE", "mr"),176
variable("CI_MERGE_REQUEST_SOURCE_BRANCH_NAME", "mr"),177
variable("CI_MERGE_REQUEST_SOURCE_BRANCH_SHA", "mr"),178
variable("CI_MERGE_REQUEST_TARGET_BRANCH_NAME", "mr"),179
variable("CI_MERGE_REQUEST_TARGET_BRANCH_SHA", "mr"),180
variable("CI_MERGE_REQUEST_PROJECT_PATH", "mr"),181
variable("CI_MERGE_REQUEST_PROJECT_URL", "mr"),182
},183
},184
{185
ID: "differences", Title: t("info.sec.diff"), Kind: "list",186
Lines: []string{187
t("info.diff.file"),188
t("info.diff.runner"),189
t("info.diff.include"),190
t("info.diff.unsupported"),191
t("info.diff.services"),192
t("info.diff.env"),193
t("info.diff.retry"),194
t("info.diff.parallel"),195
t("info.diff.rules"),196
t("info.diff.mr"),197
t("info.diff.cache"),198
t("info.diff.images"),199
},200
},201
{202
ID: "presets", Title: t("info.sec.presets"), Kind: "presets",203
Intro: t("info.presets.intro") + " " + t("info.presets.config"),204
Presets: presetDocs(presets),205
},206
},207
}208
return doc209
}210
211
func presetDocs(in []images.Preset) []Preset {212
out := make([]Preset, 0, len(in))213
for _, p := range in {214
mode := "dockerfile"215
if p.Direct != "" {216
mode = "image"217
}218
tools := p.Tools219
if tools == nil {220
tools = []string{}221
}222
out = append(out, Preset{223
Name: p.Name, Runtime: p.Runtime, From: p.From, Tools: tools, Mode: mode,224
})225
}226
return out227
}228
229
// Marshal is de JSON die de pagina in het scriptblok zet en de API schrijft.230
func Marshal(doc Doc) []byte {231
var buf bytes.Buffer232
enc := json.NewEncoder(&buf)233
enc.SetEscapeHTML(true)234
_ = enc.Encode(doc)235
return buf.Bytes()236
}@@ -0,0 +1,68 @@
1
package cispec
2
3
import (
4
"encoding/json"
5
"strings"
6
"testing"
7
8
"gitlab.com/Timfa/bluegit/internal/i18n"
9
"gitlab.com/Timfa/bluegit/internal/images"
10
)
11
12
func TestDocumentListsSpecAndPresets(t *testing.T) {
13
doc := Build(i18n.EN, nil)
14
raw := Marshal(doc)
15
var again Doc
16
if err := json.Unmarshal(raw, &again); err != nil {
17
t.Fatal(err)
18
}
19
if string(Marshal(again)) != string(raw) {
20
t.Fatal("marshal loopt uiteen")
21
}
22
names := map[string]bool{}
23
for _, sec := range doc.Sections {
24
for _, item := range sec.Items {
25
names[item.Name] = true
26
if item.Summary == "" || item.Summary == "info.kw."+strings.ReplaceAll(item.Name, ".", "") {
27
t.Fatalf("lege tekst %s", item.Name)
28
}
29
}
30
}
31
for _, name := range []string{"stages", "workflow", "rules", "retry", "parallel", "services", "environment", "interruptible", "artifacts", "cache", "needs", "extends", "if", "changes", "exists"} {
32
if !names[name] {
33
t.Fatalf("mist %s", name)
34
}
35
}
36
var presets []Preset
37
var variables []Variable
38
for _, sec := range doc.Sections {
39
presets = append(presets, sec.Presets...)
40
variables = append(variables, sec.Variables...)
41
}
42
if len(presets) != 7 || presets[0].Name != "bluegit/base" || presets[0].From != "alpine:3.20" || presets[0].Mode != "dockerfile" {
43
t.Fatalf("presets %+v", presets)
44
}
45
found := map[string]Variable{}
46
for _, v := range variables {
47
found[v.Name] = v
48
}
49
if found["CI_JOB_TOKEN"].Scope != "container" || found["CI_PIPELINE_ID"].Scope != "both" || found["CI_MERGE_REQUEST_IID"].Scope != "mr" {
50
t.Fatalf("scopes %+v %+v %+v", found["CI_JOB_TOKEN"], found["CI_PIPELINE_ID"], found["CI_MERGE_REQUEST_IID"])
51
}
52
nl := Build(i18n.NL, nil)
53
if nl.Sections[0].Title == doc.Sections[0].Title && nl.Sections[0].Items[0].Summary == doc.Sections[0].Items[0].Summary {
54
t.Fatal("Nederlands valt terug op Engels")
55
}
56
cu := Build(i18n.Cuneiform, images.Builtin())
57
if cu.Sections[0].Items[0].Name != "stages" {
58
t.Fatal(cu.Sections[0].Items[0].Name)
59
}
60
for _, r := range cu.Sections[0].Title {
61
if r == ' ' {
62
continue
63
}
64
if r >= 'a' && r <= 'z' || r >= 'A' && r <= 'Z' {
65
t.Fatalf("Latijn in de titel %s", cu.Sections[0].Title)
66
}
67
}
68
}
@@ -0,0 +1,68 @@1
package cispec2
3
import (4
"encoding/json"5
"strings"6
"testing"7
8
"gitlab.com/Timfa/bluegit/internal/i18n"9
"gitlab.com/Timfa/bluegit/internal/images"10
)11
12
func TestDocumentListsSpecAndPresets(t *testing.T) {13
doc := Build(i18n.EN, nil)14
raw := Marshal(doc)15
var again Doc16
if err := json.Unmarshal(raw, &again); err != nil {17
t.Fatal(err)18
}19
if string(Marshal(again)) != string(raw) {20
t.Fatal("marshal loopt uiteen")21
}22
names := map[string]bool{}23
for _, sec := range doc.Sections {24
for _, item := range sec.Items {25
names[item.Name] = true26
if item.Summary == "" || item.Summary == "info.kw."+strings.ReplaceAll(item.Name, ".", "") {27
t.Fatalf("lege tekst %s", item.Name)28
}29
}30
}31
for _, name := range []string{"stages", "workflow", "rules", "retry", "parallel", "services", "environment", "interruptible", "artifacts", "cache", "needs", "extends", "if", "changes", "exists"} {32
if !names[name] {33
t.Fatalf("mist %s", name)34
}35
}36
var presets []Preset37
var variables []Variable38
for _, sec := range doc.Sections {39
presets = append(presets, sec.Presets...)40
variables = append(variables, sec.Variables...)41
}42
if len(presets) != 7 || presets[0].Name != "bluegit/base" || presets[0].From != "alpine:3.20" || presets[0].Mode != "dockerfile" {43
t.Fatalf("presets %+v", presets)44
}45
found := map[string]Variable{}46
for _, v := range variables {47
found[v.Name] = v48
}49
if found["CI_JOB_TOKEN"].Scope != "container" || found["CI_PIPELINE_ID"].Scope != "both" || found["CI_MERGE_REQUEST_IID"].Scope != "mr" {50
t.Fatalf("scopes %+v %+v %+v", found["CI_JOB_TOKEN"], found["CI_PIPELINE_ID"], found["CI_MERGE_REQUEST_IID"])51
}52
nl := Build(i18n.NL, nil)53
if nl.Sections[0].Title == doc.Sections[0].Title && nl.Sections[0].Items[0].Summary == doc.Sections[0].Items[0].Summary {54
t.Fatal("Nederlands valt terug op Engels")55
}56
cu := Build(i18n.Cuneiform, images.Builtin())57
if cu.Sections[0].Items[0].Name != "stages" {58
t.Fatal(cu.Sections[0].Items[0].Name)59
}60
for _, r := range cu.Sections[0].Title {61
if r == ' ' {62
continue63
}64
if r >= 'a' && r <= 'z' || r >= 'A' && r <= 'Z' {65
t.Fatalf("Latijn in de titel %s", cu.Sections[0].Title)66
}67
}68
}@@ -6,9 +6,11 @@ import (
6
6
"net"
7
7
"net/url"
8
8
"os"
9
"path/filepath"
9
10
"strconv"
10
11
"strings"
11
12
13
"gitlab.com/Timfa/bluegit/internal/images"
12
14
"gitlab.com/Timfa/bluegit/internal/realip"
13
15
"gopkg.in/yaml.v3"
14
16
)
@@ -73,11 +75,32 @@ type Runner struct {
73
75
74
76
// CI stuurt de Docker-runner.
75
77
type CI struct {
76
Enabled bool `yaml:"enabled"`
77
Docker string `yaml:"docker_binary"`
78
Concurrency int `yaml:"concurrency"`
79
Network string `yaml:"network"`
80
TimeoutSec int `yaml:"timeout_seconds"`
78
Enabled bool `yaml:"enabled"`
79
Docker string `yaml:"docker_binary"`
80
Concurrency int `yaml:"concurrency"`
81
Network string `yaml:"network"`
82
TimeoutSec int `yaml:"timeout_seconds"`
83
Presets map[string]PresetConfig `yaml:"presets"`
84
}
85
86
// PresetConfig is één image-alias. image mapt direct. dockerfile wordt
87
// door Steve gebouwd. from herschrijft de eerste FROM van een Dockerfile.
88
type PresetConfig struct {
89
Image string `yaml:"image"`
90
Dockerfile string `yaml:"dockerfile"`
91
From string `yaml:"from"`
92
}
93
94
// ImageOverrides is de vorm die de runner en de infopagina lezen.
95
func (c CI) ImageOverrides() map[string]images.Override {
96
if len(c.Presets) == 0 {
97
return nil
98
}
99
out := make(map[string]images.Override, len(c.Presets))
100
for name, p := range c.Presets {
101
out[name] = images.Override{Image: p.Image, Dockerfile: p.Dockerfile, From: p.From}
102
}
103
return out
81
104
}
82
105
83
106
// Load leest path en vult ontbrekende waarden aan.
@@ -110,12 +133,26 @@ func Load(path string) (Config, error) {
110
133
}
111
134
c.Auth.ClientSecret = strings.TrimSpace(string(b))
112
135
}
136
c.resolvePresetPaths(path)
113
137
if err := c.Validate(); err != nil {
114
138
return Config{}, err
115
139
}
116
140
return c, nil
117
141
}
118
142
143
func (c *Config) resolvePresetPaths(configFile string) {
144
if len(c.CI.Presets) == 0 {
145
return
146
}
147
base := filepath.Dir(configFile)
148
for name, p := range c.CI.Presets {
149
if p.Dockerfile != "" && !filepath.IsAbs(p.Dockerfile) {
150
p.Dockerfile = filepath.Join(base, p.Dockerfile)
151
c.CI.Presets[name] = p
152
}
153
}
154
}
155
119
156
func (c *Config) applyDefaults() {
120
157
if c.Listen == "" {
121
158
c.Listen = "127.0.0.1:8080"
@@ -220,6 +257,9 @@ func (c *Config) Validate() error {
220
257
if _, _, err := net.SplitHostPort(c.SSH.Listen); err != nil {
221
258
return fmt.Errorf("ssh.listen moet host:poort zijn")
222
259
}
260
if _, err := images.Effective(c.CI.ImageOverrides()); err != nil {
261
return err
262
}
223
263
return nil
224
264
}
225
265
@@ -321,5 +361,15 @@ ci:
321
361
concurrency: 1
322
362
network: bridge
323
363
timeout_seconds: 1800
364
# Image-aliassen voor jobs. bluegit/base, bluegit/node, bluegit/python,
365
# bluegit/go, bluegit/rust, bluegit/java en bluegit/dotnet zijn ingebouwd.
366
# Een eigen alias wijst naar een Dockerfile of naar een kant-en-klaar image.
367
# presets:
368
# team/tools:
369
# image: alpine:3.20
370
# team/build:
371
# dockerfile: /etc/bluegit/images/build/Dockerfile
372
# bluegit/node:
373
# from: node:22-bookworm
324
374
`
325
375
}
@@ -6,9 +6,11 @@ import (6
"net"6
"net"7
"net/url"7
"net/url"8
"os"8
"os"9
"path/filepath"9
"strconv"10
"strconv"10
"strings"11
"strings"11
12
13
"gitlab.com/Timfa/bluegit/internal/images"12
"gitlab.com/Timfa/bluegit/internal/realip"14
"gitlab.com/Timfa/bluegit/internal/realip"13
"gopkg.in/yaml.v3"15
"gopkg.in/yaml.v3"14
)16
)@@ -73,11 +75,32 @@ type Runner struct {73
75
74
// CI stuurt de Docker-runner.76
// CI stuurt de Docker-runner.75
type CI struct {77
type CI struct {76
Enabled bool `yaml:"enabled"`78
Enabled bool `yaml:"enabled"`77
Docker string `yaml:"docker_binary"`79
Docker string `yaml:"docker_binary"`78
Concurrency int `yaml:"concurrency"`80
Concurrency int `yaml:"concurrency"`79
Network string `yaml:"network"`81
Network string `yaml:"network"`80
TimeoutSec int `yaml:"timeout_seconds"`82
TimeoutSec int `yaml:"timeout_seconds"`83
Presets map[string]PresetConfig `yaml:"presets"`84
}85
86
// PresetConfig is één image-alias. image mapt direct. dockerfile wordt87
// door Steve gebouwd. from herschrijft de eerste FROM van een Dockerfile.88
type PresetConfig struct {89
Image string `yaml:"image"`90
Dockerfile string `yaml:"dockerfile"`91
From string `yaml:"from"`92
}93
94
// ImageOverrides is de vorm die de runner en de infopagina lezen.95
func (c CI) ImageOverrides() map[string]images.Override {96
if len(c.Presets) == 0 {97
return nil98
}99
out := make(map[string]images.Override, len(c.Presets))100
for name, p := range c.Presets {101
out[name] = images.Override{Image: p.Image, Dockerfile: p.Dockerfile, From: p.From}102
}103
return out81
}104
}82
105
83
// Load leest path en vult ontbrekende waarden aan.106
// Load leest path en vult ontbrekende waarden aan.@@ -110,12 +133,26 @@ func Load(path string) (Config, error) {110
}133
}111
c.Auth.ClientSecret = strings.TrimSpace(string(b))134
c.Auth.ClientSecret = strings.TrimSpace(string(b))112
}135
}136
c.resolvePresetPaths(path)113
if err := c.Validate(); err != nil {137
if err := c.Validate(); err != nil {114
return Config{}, err138
return Config{}, err115
}139
}116
return c, nil140
return c, nil117
}141
}118
142
143
func (c *Config) resolvePresetPaths(configFile string) {144
if len(c.CI.Presets) == 0 {145
return146
}147
base := filepath.Dir(configFile)148
for name, p := range c.CI.Presets {149
if p.Dockerfile != "" && !filepath.IsAbs(p.Dockerfile) {150
p.Dockerfile = filepath.Join(base, p.Dockerfile)151
c.CI.Presets[name] = p152
}153
}154
}155
119
func (c *Config) applyDefaults() {156
func (c *Config) applyDefaults() {120
if c.Listen == "" {157
if c.Listen == "" {121
c.Listen = "127.0.0.1:8080"158
c.Listen = "127.0.0.1:8080"@@ -220,6 +257,9 @@ func (c *Config) Validate() error {220
if _, _, err := net.SplitHostPort(c.SSH.Listen); err != nil {257
if _, _, err := net.SplitHostPort(c.SSH.Listen); err != nil {221
return fmt.Errorf("ssh.listen moet host:poort zijn")258
return fmt.Errorf("ssh.listen moet host:poort zijn")222
}259
}260
if _, err := images.Effective(c.CI.ImageOverrides()); err != nil {261
return err262
}223
return nil263
return nil224
}264
}225
265
@@ -321,5 +361,15 @@ ci:321
concurrency: 1361
concurrency: 1322
network: bridge362
network: bridge323
timeout_seconds: 1800363
timeout_seconds: 1800364
# Image-aliassen voor jobs. bluegit/base, bluegit/node, bluegit/python,365
# bluegit/go, bluegit/rust, bluegit/java en bluegit/dotnet zijn ingebouwd.366
# Een eigen alias wijst naar een Dockerfile of naar een kant-en-klaar image.367
# presets:368
# team/tools:369
# image: alpine:3.20370
# team/build:371
# dockerfile: /etc/bluegit/images/build/Dockerfile372
# bluegit/node:373
# from: node:22-bookworm324
`374
`325
}375
}@@ -7,6 +7,37 @@ import (
7
7
"testing"
8
8
)
9
9
10
func TestPresetConfig(t *testing.T) {
11
dir := t.TempDir()
12
path := filepath.Join(dir, "config.yml")
13
docker := filepath.Join(dir, "Dockerfile")
14
if err := os.WriteFile(docker, []byte("FROM alpine:3.20\nRUN apk add --no-cache git\n"), 0o644); err != nil {
15
t.Fatal(err)
16
}
17
body := []byte("base_url: https://git.example.test\nauth:\n mode: oauth\n client_id: git.example.test\nci:\n presets:\n bluegit/node:\n from: node:22-bookworm\n team/tools:\n dockerfile: Dockerfile\n team/plain:\n image: alpine:3.20\n")
18
if err := os.WriteFile(path, body, 0o600); err != nil {
19
t.Fatal(err)
20
}
21
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")
22
cfg, err := Load(path)
23
if err != nil {
24
t.Fatal(err)
25
}
26
if cfg.CI.Presets["team/tools"].Dockerfile != docker {
27
t.Fatalf("pad %s", cfg.CI.Presets["team/tools"].Dockerfile)
28
}
29
if cfg.CI.Presets["bluegit/node"].From != "node:22-bookworm" || cfg.CI.Presets["team/plain"].Image != "alpine:3.20" {
30
t.Fatalf("%+v", cfg.CI.Presets)
31
}
32
bad := []byte("base_url: https://git.example.test\nauth:\n mode: oauth\n client_id: git.example.test\nci:\n presets:\n node:22:\n image: alpine\n")
33
if err := os.WriteFile(path, bad, 0o600); err != nil {
34
t.Fatal(err)
35
}
36
if _, err := Load(path); err == nil {
37
t.Fatal("een tag in de aliasnaam hoort te falen")
38
}
39
}
40
10
41
func TestRunnerName(t *testing.T) {
11
42
dir := t.TempDir()
12
43
path := filepath.Join(dir, "config.yml")
@@ -7,6 +7,37 @@ import (7
"testing"7
"testing"8
)8
)9
9
10
func TestPresetConfig(t *testing.T) {11
dir := t.TempDir()12
path := filepath.Join(dir, "config.yml")13
docker := filepath.Join(dir, "Dockerfile")14
if err := os.WriteFile(docker, []byte("FROM alpine:3.20\nRUN apk add --no-cache git\n"), 0o644); err != nil {15
t.Fatal(err)16
}17
body := []byte("base_url: https://git.example.test\nauth:\n mode: oauth\n client_id: git.example.test\nci:\n presets:\n bluegit/node:\n from: node:22-bookworm\n team/tools:\n dockerfile: Dockerfile\n team/plain:\n image: alpine:3.20\n")18
if err := os.WriteFile(path, body, 0o600); err != nil {19
t.Fatal(err)20
}21
t.Setenv("BLUEGIT_AUTH_CLIENT_SECRET", "geheim")22
cfg, err := Load(path)23
if err != nil {24
t.Fatal(err)25
}26
if cfg.CI.Presets["team/tools"].Dockerfile != docker {27
t.Fatalf("pad %s", cfg.CI.Presets["team/tools"].Dockerfile)28
}29
if cfg.CI.Presets["bluegit/node"].From != "node:22-bookworm" || cfg.CI.Presets["team/plain"].Image != "alpine:3.20" {30
t.Fatalf("%+v", cfg.CI.Presets)31
}32
bad := []byte("base_url: https://git.example.test\nauth:\n mode: oauth\n client_id: git.example.test\nci:\n presets:\n node:22:\n image: alpine\n")33
if err := os.WriteFile(path, bad, 0o600); err != nil {34
t.Fatal(err)35
}36
if _, err := Load(path); err == nil {37
t.Fatal("een tag in de aliasnaam hoort te falen")38
}39
}40
10
func TestRunnerName(t *testing.T) {41
func TestRunnerName(t *testing.T) {11
dir := t.TempDir()42
dir := t.TempDir()12
path := filepath.Join(dir, "config.yml")43
path := filepath.Join(dir, "config.yml")@@ -0,0 +1,98 @@
1
package gitrepo
2
3
import (
4
"context"
5
"strconv"
6
"strings"
7
)
8
9
// BranchTip is de punt van een lokale branch.
10
type BranchTip struct {
11
Name, SHA, Subject, Date string
12
}
13
14
// BranchTips geeft elke lokale branch met zijn laatste commit.
15
func BranchTips(ctx context.Context, gitBin, dir string) ([]BranchTip, error) {
16
const format = "%(refname:short)%00%(objectname)%00%(subject)%00%(creatordate:short)"
17
out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format="+format, "refs/heads")
18
if err != nil {
19
return nil, err
20
}
21
var tips []BranchTip
22
for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {
23
if line == "" {
24
continue
25
}
26
parts := strings.Split(line, "\x00")
27
if len(parts) < 4 || parts[0] == "" {
28
continue
29
}
30
tips = append(tips, BranchTip{Name: parts[0], SHA: parts[1], Subject: parts[2], Date: parts[3]})
31
}
32
return tips, nil
33
}
34
35
// AheadBehind telt commits die branch voor en achter base heeft.
36
// Links in de git-telling is achter, rechts is voor.
37
func AheadBehind(ctx context.Context, gitBin, dir, base, branch string) (ahead, behind int, err error) {
38
out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--left-right", "--count", base+"..."+branch)
39
if err != nil {
40
return 0, 0, err
41
}
42
fields := strings.Fields(out)
43
if len(fields) != 2 {
44
return 0, 0, nil
45
}
46
behind, _ = strconv.Atoi(fields[0])
47
ahead, _ = strconv.Atoi(fields[1])
48
return ahead, behind, nil
49
}
50
51
// CreateBranch maakt name op rev. rev is een branch, tag of commit.
52
func CreateBranch(ctx context.Context, gitBin, dir, name, rev string) error {
53
sha, err := run(ctx, gitBin, nil, "-C", dir, "rev-parse", "--verify", "--end-of-options", rev+"^{commit}")
54
if err != nil {
55
return err
56
}
57
_, err = run(ctx, gitBin, nil, "-C", dir, "branch", "--", name, strings.TrimSpace(sha))
58
return err
59
}
60
61
// DeleteBranch verwijdert een lokale branch.
62
func DeleteBranch(ctx context.Context, gitBin, dir, name string) error {
63
_, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-D", "--", name)
64
return err
65
}
66
67
// RenameBranch hernoemt een lokale branch.
68
func RenameBranch(ctx context.Context, gitBin, dir, oldName, newName string) error {
69
_, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-m", "--", oldName, newName)
70
return err
71
}
72
73
// ComparePatch is de three-dot diff van from...to, dezelfde vorm als een commit.
74
func ComparePatch(ctx context.Context, gitBin, dir, from, to string) ([]PatchFile, error) {
75
out, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", from+"..."+to)
76
if err != nil {
77
return nil, err
78
}
79
return ParsePatch(out), nil
80
}
81
82
// Subjects geeft de onderwerpen van rev, nieuwste eerst.
83
func Subjects(ctx context.Context, gitBin, dir, rev string, limit int) ([]string, error) {
84
if limit < 1 {
85
limit = 1
86
}
87
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%s", "-n", strconv.Itoa(limit), rev)
88
if err != nil {
89
return nil, err
90
}
91
var subjects []string
92
for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {
93
if line != "" {
94
subjects = append(subjects, line)
95
}
96
}
97
return subjects, nil
98
}
@@ -0,0 +1,98 @@1
package gitrepo2
3
import (4
"context"5
"strconv"6
"strings"7
)8
9
// BranchTip is de punt van een lokale branch.10
type BranchTip struct {11
Name, SHA, Subject, Date string12
}13
14
// BranchTips geeft elke lokale branch met zijn laatste commit.15
func BranchTips(ctx context.Context, gitBin, dir string) ([]BranchTip, error) {16
const format = "%(refname:short)%00%(objectname)%00%(subject)%00%(creatordate:short)"17
out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format="+format, "refs/heads")18
if err != nil {19
return nil, err20
}21
var tips []BranchTip22
for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {23
if line == "" {24
continue25
}26
parts := strings.Split(line, "\x00")27
if len(parts) < 4 || parts[0] == "" {28
continue29
}30
tips = append(tips, BranchTip{Name: parts[0], SHA: parts[1], Subject: parts[2], Date: parts[3]})31
}32
return tips, nil33
}34
35
// AheadBehind telt commits die branch voor en achter base heeft.36
// Links in de git-telling is achter, rechts is voor.37
func AheadBehind(ctx context.Context, gitBin, dir, base, branch string) (ahead, behind int, err error) {38
out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--left-right", "--count", base+"..."+branch)39
if err != nil {40
return 0, 0, err41
}42
fields := strings.Fields(out)43
if len(fields) != 2 {44
return 0, 0, nil45
}46
behind, _ = strconv.Atoi(fields[0])47
ahead, _ = strconv.Atoi(fields[1])48
return ahead, behind, nil49
}50
51
// CreateBranch maakt name op rev. rev is een branch, tag of commit.52
func CreateBranch(ctx context.Context, gitBin, dir, name, rev string) error {53
sha, err := run(ctx, gitBin, nil, "-C", dir, "rev-parse", "--verify", "--end-of-options", rev+"^{commit}")54
if err != nil {55
return err56
}57
_, err = run(ctx, gitBin, nil, "-C", dir, "branch", "--", name, strings.TrimSpace(sha))58
return err59
}60
61
// DeleteBranch verwijdert een lokale branch.62
func DeleteBranch(ctx context.Context, gitBin, dir, name string) error {63
_, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-D", "--", name)64
return err65
}66
67
// RenameBranch hernoemt een lokale branch.68
func RenameBranch(ctx context.Context, gitBin, dir, oldName, newName string) error {69
_, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-m", "--", oldName, newName)70
return err71
}72
73
// ComparePatch is de three-dot diff van from...to, dezelfde vorm als een commit.74
func ComparePatch(ctx context.Context, gitBin, dir, from, to string) ([]PatchFile, error) {75
out, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", from+"..."+to)76
if err != nil {77
return nil, err78
}79
return ParsePatch(out), nil80
}81
82
// Subjects geeft de onderwerpen van rev, nieuwste eerst.83
func Subjects(ctx context.Context, gitBin, dir, rev string, limit int) ([]string, error) {84
if limit < 1 {85
limit = 186
}87
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%s", "-n", strconv.Itoa(limit), rev)88
if err != nil {89
return nil, err90
}91
var subjects []string92
for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {93
if line != "" {94
subjects = append(subjects, line)95
}96
}97
return subjects, nil98
}@@ -0,0 +1,73 @@
1
package gitrepo
2
3
import (
4
"context"
5
"os"
6
"os/exec"
7
"path/filepath"
8
"testing"
9
)
10
11
func TestBranchOps(t *testing.T) {
12
if _, err := exec.LookPath("git"); err != nil {
13
t.Skip("git ontbreekt")
14
}
15
dir := t.TempDir()
16
git := func(args ...string) {
17
t.Helper()
18
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
19
cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")
20
if out, err := cmd.CombinedOutput(); err != nil {
21
t.Fatalf("git %v: %v\n%s", args, err, out)
22
}
23
}
24
git("init", "-b", "master")
25
git("config", "commit.gpgsign", "false")
26
if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("een\n"), 0o644); err != nil {
27
t.Fatal(err)
28
}
29
git("add", "hello.txt")
30
git("commit", "-m", "start")
31
git("checkout", "-b", "topic")
32
if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("twee\n"), 0o644); err != nil {
33
t.Fatal(err)
34
}
35
git("add", "hello.txt")
36
git("commit", "-m", "onderwerp-xyz")
37
38
ctx := context.Background()
39
tips, err := BranchTips(ctx, "git", dir)
40
if err != nil || len(tips) != 2 {
41
t.Fatalf("tips %v %v", tips, err)
42
}
43
ahead, behind, err := AheadBehind(ctx, "git", dir, "master", "topic")
44
if err != nil || ahead != 1 || behind != 0 {
45
t.Fatalf("voor/achter %d %d %v", ahead, behind, err)
46
}
47
if err := CreateBranch(ctx, "git", dir, "wip", "topic"); err != nil {
48
t.Fatal(err)
49
}
50
if err := RenameBranch(ctx, "git", dir, "wip", "wip2"); err != nil {
51
t.Fatal(err)
52
}
53
if err := DeleteBranch(ctx, "git", dir, "wip2"); err != nil {
54
t.Fatal(err)
55
}
56
names, err := Branches(ctx, "git", dir)
57
if err != nil {
58
t.Fatal(err)
59
}
60
for _, name := range names {
61
if name == "wip" || name == "wip2" {
62
t.Fatalf("branch bleef bestaan: %v", names)
63
}
64
}
65
files, err := ComparePatch(ctx, "git", dir, "master", "topic")
66
if err != nil || len(files) != 1 || files[0].Path != "hello.txt" {
67
t.Fatalf("vergelijk %v %v", files, err)
68
}
69
subjects, err := Subjects(ctx, "git", dir, "master..topic", 20)
70
if err != nil || len(subjects) != 1 || subjects[0] != "onderwerp-xyz" {
71
t.Fatalf("onderwerpen %v %v", subjects, err)
72
}
73
}
@@ -0,0 +1,73 @@1
package gitrepo2
3
import (4
"context"5
"os"6
"os/exec"7
"path/filepath"8
"testing"9
)10
11
func TestBranchOps(t *testing.T) {12
if _, err := exec.LookPath("git"); err != nil {13
t.Skip("git ontbreekt")14
}15
dir := t.TempDir()16
git := func(args ...string) {17
t.Helper()18
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)19
cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")20
if out, err := cmd.CombinedOutput(); err != nil {21
t.Fatalf("git %v: %v\n%s", args, err, out)22
}23
}24
git("init", "-b", "master")25
git("config", "commit.gpgsign", "false")26
if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("een\n"), 0o644); err != nil {27
t.Fatal(err)28
}29
git("add", "hello.txt")30
git("commit", "-m", "start")31
git("checkout", "-b", "topic")32
if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("twee\n"), 0o644); err != nil {33
t.Fatal(err)34
}35
git("add", "hello.txt")36
git("commit", "-m", "onderwerp-xyz")37
38
ctx := context.Background()39
tips, err := BranchTips(ctx, "git", dir)40
if err != nil || len(tips) != 2 {41
t.Fatalf("tips %v %v", tips, err)42
}43
ahead, behind, err := AheadBehind(ctx, "git", dir, "master", "topic")44
if err != nil || ahead != 1 || behind != 0 {45
t.Fatalf("voor/achter %d %d %v", ahead, behind, err)46
}47
if err := CreateBranch(ctx, "git", dir, "wip", "topic"); err != nil {48
t.Fatal(err)49
}50
if err := RenameBranch(ctx, "git", dir, "wip", "wip2"); err != nil {51
t.Fatal(err)52
}53
if err := DeleteBranch(ctx, "git", dir, "wip2"); err != nil {54
t.Fatal(err)55
}56
names, err := Branches(ctx, "git", dir)57
if err != nil {58
t.Fatal(err)59
}60
for _, name := range names {61
if name == "wip" || name == "wip2" {62
t.Fatalf("branch bleef bestaan: %v", names)63
}64
}65
files, err := ComparePatch(ctx, "git", dir, "master", "topic")66
if err != nil || len(files) != 1 || files[0].Path != "hello.txt" {67
t.Fatalf("vergelijk %v %v", files, err)68
}69
subjects, err := Subjects(ctx, "git", dir, "master..topic", 20)70
if err != nil || len(subjects) != 1 || subjects[0] != "onderwerp-xyz" {71
t.Fatalf("onderwerpen %v %v", subjects, err)72
}73
}@@ -0,0 +1,198 @@
1
package gitrepo
2
3
import (
4
"context"
5
"strconv"
6
"strings"
7
)
8
9
// PatchFile is één bestand in de diff van een commit tegen zijn eerste parent.
10
// Een root-commit wordt vergeleken met de lege boom.
11
type PatchFile struct {
12
Status string
13
Path string
14
OldPath string
15
Added int
16
Deleted int
17
Binary bool
18
Lines []DiffLine
19
}
20
21
// CommitPatch leest de parents en de diff van sha.
22
// Een mergecommit wordt tegen de eerste parent gezet.
23
func CommitPatch(ctx context.Context, gitBin, dir, sha string) (parents []string, files []PatchFile, err error) {
24
out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--parents", "-n", "1", sha)
25
if err != nil {
26
return nil, nil, err
27
}
28
fields := strings.Fields(out)
29
if len(fields) == 0 {
30
return nil, nil, err
31
}
32
if len(fields) > 1 {
33
parents = append([]string(nil), fields[1:]...)
34
}
35
base := ""
36
if len(parents) > 0 {
37
base = parents[0]
38
} else {
39
empty, err := run(ctx, gitBin, nil, "hash-object", "-t", "tree", "--stdin")
40
if err != nil {
41
return nil, nil, err
42
}
43
base = strings.TrimSpace(empty)
44
}
45
raw, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", base, sha)
46
if err != nil {
47
return nil, nil, err
48
}
49
return parents, ParsePatch(raw), nil
50
}
51
52
// ParsePatch leest de tekst van git diff, inclusief hernoemen en binaire bestanden.
53
func ParsePatch(raw string) []PatchFile {
54
var files []PatchFile
55
var cur *PatchFile
56
var oldGuess, newGuess string
57
var oldLine, newLine int
58
inHunk := false
59
skipBinary := false
60
for _, line := range strings.Split(raw, "\n") {
61
switch {
62
case strings.HasPrefix(line, "diff --git "):
63
files = append(files, PatchFile{Status: "modified"})
64
cur = &files[len(files)-1]
65
oldGuess, newGuess = splitDiffPaths(line)
66
cur.Path = newGuess
67
oldLine, newLine = 0, 0
68
inHunk = false
69
skipBinary = false
70
case cur == nil || skipBinary:
71
continue
72
case strings.HasPrefix(line, "new file mode "):
73
cur.Status = "added"
74
case strings.HasPrefix(line, "deleted file mode "):
75
cur.Status = "deleted"
76
if oldGuess != "" {
77
cur.Path = oldGuess
78
}
79
case strings.HasPrefix(line, "rename from ") || strings.HasPrefix(line, "copy from "):
80
cur.Status = "renamed"
81
cur.OldPath = metaPath(line)
82
case strings.HasPrefix(line, "rename to ") || strings.HasPrefix(line, "copy to "):
83
cur.Status = "renamed"
84
if p := metaPath(line); p != "" {
85
cur.Path = p
86
}
87
case strings.HasPrefix(line, "Binary files ") || strings.HasPrefix(line, "GIT binary patch"):
88
cur.Binary = true
89
cur.Lines = nil
90
cur.Added, cur.Deleted = 0, 0
91
skipBinary = true
92
inHunk = false
93
case strings.HasPrefix(line, "@@"):
94
oldLine, newLine = hunkStart(line)
95
oldLine--
96
newLine--
97
inHunk = true
98
cur.Lines = append(cur.Lines, DiffLine{Kind: "hunk", Text: line})
99
case !inHunk:
100
continue
101
case strings.HasPrefix(line, `\`):
102
continue
103
case strings.HasPrefix(line, "+"):
104
newLine++
105
cur.Added++
106
cur.Lines = append(cur.Lines, DiffLine{Kind: "add", New: newLine, Text: line[1:]})
107
case strings.HasPrefix(line, "-"):
108
oldLine++
109
cur.Deleted++
110
cur.Lines = append(cur.Lines, DiffLine{Kind: "del", Old: oldLine, Text: line[1:]})
111
case strings.HasPrefix(line, " "):
112
oldLine++
113
newLine++
114
cur.Lines = append(cur.Lines, DiffLine{Kind: "ctx", Old: oldLine, New: newLine, Text: line[1:]})
115
}
116
}
117
var out []PatchFile
118
for _, f := range files {
119
if f.Path == "" {
120
continue
121
}
122
if f.Status != "renamed" {
123
f.OldPath = ""
124
}
125
out = append(out, f)
126
}
127
return out
128
}
129
130
func splitDiffPaths(line string) (oldPath, newPath string) {
131
rest := strings.TrimSpace(strings.TrimPrefix(line, "diff --git "))
132
a, b, ok := splitQuotedPair(rest)
133
if !ok {
134
return "", ""
135
}
136
return stripAB(a), stripAB(b)
137
}
138
139
func splitQuotedPair(s string) (string, string, bool) {
140
s = strings.TrimSpace(s)
141
if s == "" {
142
return "", "", false
143
}
144
if strings.HasPrefix(s, `"`) {
145
a, rest, ok := unquotePrefix(s)
146
if !ok {
147
return "", "", false
148
}
149
rest = strings.TrimSpace(rest)
150
if strings.HasPrefix(rest, `"`) {
151
b, _, ok := unquotePrefix(rest)
152
return a, b, ok
153
}
154
return a, rest, rest != ""
155
}
156
i := strings.Index(s, " b/")
157
if i < 0 {
158
return "", "", false
159
}
160
return s[:i], s[i+1:], true
161
}
162
163
func unquotePrefix(s string) (string, string, bool) {
164
if len(s) < 2 || s[0] != '"' {
165
return "", "", false
166
}
167
for i := 1; i < len(s); i++ {
168
if s[i] == '\\' {
169
i++
170
continue
171
}
172
if s[i] == '"' {
173
u, err := strconv.Unquote(s[:i+1])
174
if err != nil {
175
return "", "", false
176
}
177
return u, s[i+1:], true
178
}
179
}
180
return "", "", false
181
}
182
183
func metaPath(line string) string {
184
if i := strings.IndexByte(line, ' '); i >= 0 {
185
line = line[i+1:]
186
}
187
// "rename from pad" heeft twee spaties in het commando.
188
if i := strings.IndexByte(line, ' '); i >= 0 && !strings.HasPrefix(line, `"`) && (strings.HasPrefix(line, "from ") || strings.HasPrefix(line, "to ")) {
189
line = line[i+1:]
190
}
191
line = strings.TrimSpace(line)
192
if strings.HasPrefix(line, `"`) {
193
if u, err := strconv.Unquote(line); err == nil {
194
return u
195
}
196
}
197
return line
198
}
@@ -0,0 +1,198 @@1
package gitrepo2
3
import (4
"context"5
"strconv"6
"strings"7
)8
9
// PatchFile is één bestand in de diff van een commit tegen zijn eerste parent.10
// Een root-commit wordt vergeleken met de lege boom.11
type PatchFile struct {12
Status string13
Path string14
OldPath string15
Added int16
Deleted int17
Binary bool18
Lines []DiffLine19
}20
21
// CommitPatch leest de parents en de diff van sha.22
// Een mergecommit wordt tegen de eerste parent gezet.23
func CommitPatch(ctx context.Context, gitBin, dir, sha string) (parents []string, files []PatchFile, err error) {24
out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--parents", "-n", "1", sha)25
if err != nil {26
return nil, nil, err27
}28
fields := strings.Fields(out)29
if len(fields) == 0 {30
return nil, nil, err31
}32
if len(fields) > 1 {33
parents = append([]string(nil), fields[1:]...)34
}35
base := ""36
if len(parents) > 0 {37
base = parents[0]38
} else {39
empty, err := run(ctx, gitBin, nil, "hash-object", "-t", "tree", "--stdin")40
if err != nil {41
return nil, nil, err42
}43
base = strings.TrimSpace(empty)44
}45
raw, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", base, sha)46
if err != nil {47
return nil, nil, err48
}49
return parents, ParsePatch(raw), nil50
}51
52
// ParsePatch leest de tekst van git diff, inclusief hernoemen en binaire bestanden.53
func ParsePatch(raw string) []PatchFile {54
var files []PatchFile55
var cur *PatchFile56
var oldGuess, newGuess string57
var oldLine, newLine int58
inHunk := false59
skipBinary := false60
for _, line := range strings.Split(raw, "\n") {61
switch {62
case strings.HasPrefix(line, "diff --git "):63
files = append(files, PatchFile{Status: "modified"})64
cur = &files[len(files)-1]65
oldGuess, newGuess = splitDiffPaths(line)66
cur.Path = newGuess67
oldLine, newLine = 0, 068
inHunk = false69
skipBinary = false70
case cur == nil || skipBinary:71
continue72
case strings.HasPrefix(line, "new file mode "):73
cur.Status = "added"74
case strings.HasPrefix(line, "deleted file mode "):75
cur.Status = "deleted"76
if oldGuess != "" {77
cur.Path = oldGuess78
}79
case strings.HasPrefix(line, "rename from ") || strings.HasPrefix(line, "copy from "):80
cur.Status = "renamed"81
cur.OldPath = metaPath(line)82
case strings.HasPrefix(line, "rename to ") || strings.HasPrefix(line, "copy to "):83
cur.Status = "renamed"84
if p := metaPath(line); p != "" {85
cur.Path = p86
}87
case strings.HasPrefix(line, "Binary files ") || strings.HasPrefix(line, "GIT binary patch"):88
cur.Binary = true89
cur.Lines = nil90
cur.Added, cur.Deleted = 0, 091
skipBinary = true92
inHunk = false93
case strings.HasPrefix(line, "@@"):94
oldLine, newLine = hunkStart(line)95
oldLine--96
newLine--97
inHunk = true98
cur.Lines = append(cur.Lines, DiffLine{Kind: "hunk", Text: line})99
case !inHunk:100
continue101
case strings.HasPrefix(line, `\`):102
continue103
case strings.HasPrefix(line, "+"):104
newLine++105
cur.Added++106
cur.Lines = append(cur.Lines, DiffLine{Kind: "add", New: newLine, Text: line[1:]})107
case strings.HasPrefix(line, "-"):108
oldLine++109
cur.Deleted++110
cur.Lines = append(cur.Lines, DiffLine{Kind: "del", Old: oldLine, Text: line[1:]})111
case strings.HasPrefix(line, " "):112
oldLine++113
newLine++114
cur.Lines = append(cur.Lines, DiffLine{Kind: "ctx", Old: oldLine, New: newLine, Text: line[1:]})115
}116
}117
var out []PatchFile118
for _, f := range files {119
if f.Path == "" {120
continue121
}122
if f.Status != "renamed" {123
f.OldPath = ""124
}125
out = append(out, f)126
}127
return out128
}129
130
func splitDiffPaths(line string) (oldPath, newPath string) {131
rest := strings.TrimSpace(strings.TrimPrefix(line, "diff --git "))132
a, b, ok := splitQuotedPair(rest)133
if !ok {134
return "", ""135
}136
return stripAB(a), stripAB(b)137
}138
139
func splitQuotedPair(s string) (string, string, bool) {140
s = strings.TrimSpace(s)141
if s == "" {142
return "", "", false143
}144
if strings.HasPrefix(s, `"`) {145
a, rest, ok := unquotePrefix(s)146
if !ok {147
return "", "", false148
}149
rest = strings.TrimSpace(rest)150
if strings.HasPrefix(rest, `"`) {151
b, _, ok := unquotePrefix(rest)152
return a, b, ok153
}154
return a, rest, rest != ""155
}156
i := strings.Index(s, " b/")157
if i < 0 {158
return "", "", false159
}160
return s[:i], s[i+1:], true161
}162
163
func unquotePrefix(s string) (string, string, bool) {164
if len(s) < 2 || s[0] != '"' {165
return "", "", false166
}167
for i := 1; i < len(s); i++ {168
if s[i] == '\\' {169
i++170
continue171
}172
if s[i] == '"' {173
u, err := strconv.Unquote(s[:i+1])174
if err != nil {175
return "", "", false176
}177
return u, s[i+1:], true178
}179
}180
return "", "", false181
}182
183
func metaPath(line string) string {184
if i := strings.IndexByte(line, ' '); i >= 0 {185
line = line[i+1:]186
}187
// "rename from pad" heeft twee spaties in het commando.188
if i := strings.IndexByte(line, ' '); i >= 0 && !strings.HasPrefix(line, `"`) && (strings.HasPrefix(line, "from ") || strings.HasPrefix(line, "to ")) {189
line = line[i+1:]190
}191
line = strings.TrimSpace(line)192
if strings.HasPrefix(line, `"`) {193
if u, err := strconv.Unquote(line); err == nil {194
return u195
}196
}197
return line198
}@@ -0,0 +1,186 @@
1
package gitrepo
2
3
import (
4
"context"
5
"os"
6
"os/exec"
7
"path/filepath"
8
"strings"
9
"testing"
10
)
11
12
func TestParsePatchKinds(t *testing.T) {
13
raw := "" +
14
"diff --git a/keep.go b/keep.go\n" +
15
"index 111..222 100644\n" +
16
"--- a/keep.go\n" +
17
"+++ b/keep.go\n" +
18
"@@ -1,2 +1,3 @@\n" +
19
" package p\n" +
20
"-func old() {}\n" +
21
"+func extra() {}\n" +
22
" \n" +
23
"diff --git a/gone.txt b/gone.txt\n" +
24
"deleted file mode 100644\n" +
25
"--- a/gone.txt\n" +
26
"+++ /dev/null\n" +
27
"@@ -1 +0,0 @@\n" +
28
"-weg\n" +
29
"diff --git \"a/oude naam.txt\" \"b/nieuwe naam.txt\"\n" +
30
"similarity index 90%\n" +
31
"rename from oude naam.txt\n" +
32
"rename to nieuwe naam.txt\n" +
33
"--- \"a/oude naam.txt\"\n" +
34
"+++ \"b/nieuwe naam.txt\"\n" +
35
"@@ -1 +1 @@\n" +
36
"-oud\n" +
37
"+nieuw\n" +
38
"diff --git a/plaatje.bin b/plaatje.bin\n" +
39
"new file mode 100644\n" +
40
"index 0000000..abc\n" +
41
"Binary files /dev/null and b/plaatje.bin differ\n"
42
files := ParsePatch(raw)
43
if len(files) != 4 {
44
t.Fatalf("bestanden: %+v", files)
45
}
46
if files[0].Status != "modified" || files[0].Added != 1 || files[0].Deleted != 1 || files[0].Path != "keep.go" {
47
t.Fatalf("wijziging: %+v", files[0])
48
}
49
if files[0].Lines[2].Kind != "del" || files[0].Lines[2].Old != 2 || files[0].Lines[3].Kind != "add" || files[0].Lines[3].New != 2 {
50
t.Fatalf("regelnummers: %+v", files[0].Lines)
51
}
52
if files[1].Status != "deleted" || files[1].Path != "gone.txt" || files[1].Deleted != 1 {
53
t.Fatalf("verwijderd: %+v", files[1])
54
}
55
if files[2].Status != "renamed" || files[2].OldPath != "oude naam.txt" || files[2].Path != "nieuwe naam.txt" {
56
t.Fatalf("hernoemd: %+v", files[2])
57
}
58
if !files[3].Binary || files[3].Status != "added" || len(files[3].Lines) != 0 || files[3].Path != "plaatje.bin" {
59
t.Fatalf("binair: %+v", files[3])
60
}
61
}
62
63
func TestCommitPatchHistory(t *testing.T) {
64
if _, err := exec.LookPath("git"); err != nil {
65
t.Skip("git ontbreekt")
66
}
67
dir := t.TempDir()
68
git := func(args ...string) {
69
t.Helper()
70
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
71
cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")
72
if out, err := cmd.CombinedOutput(); err != nil {
73
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
74
}
75
}
76
git("init", "-b", "master")
77
git("config", "commit.gpgsign", "false")
78
write := func(name, body string) {
79
t.Helper()
80
path := filepath.Join(dir, filepath.FromSlash(name))
81
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
82
t.Fatal(err)
83
}
84
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
85
t.Fatal(err)
86
}
87
}
88
write("a.txt", "alpha\n")
89
write("b.txt", "beta\n")
90
write("keep.go", "package p\n\nfunc keep() {}\n")
91
git("add", ".")
92
git("commit", "-m", "begin")
93
root := rev(t, dir)
94
95
ctx := context.Background()
96
parents, files, err := CommitPatch(ctx, "git", dir, root)
97
if err != nil {
98
t.Fatal(err)
99
}
100
if len(parents) != 0 || len(files) != 3 {
101
t.Fatalf("root parents=%v files=%d", parents, len(files))
102
}
103
for _, f := range files {
104
if f.Status != "added" {
105
t.Fatalf("rootbestand: %+v", f)
106
}
107
}
108
109
write("keep.go", "package p\n\nfunc keep() {}\nfunc extra() {}\n")
110
if err := os.Remove(filepath.Join(dir, "b.txt")); err != nil {
111
t.Fatal(err)
112
}
113
write("c.txt", strings.Repeat("x", 180)+"\n")
114
write("note file.txt", "spatie\n")
115
var huge strings.Builder
116
for i := 0; i < 220; i++ {
117
huge.WriteString("regel\n")
118
}
119
write("huge.txt", huge.String())
120
write("bin.dat", "a\x00b\n")
121
git("add", "-A")
122
git("mv", "a.txt", "a2.txt")
123
git("commit", "-m", "wijzig bestanden", "-m", "tweede alinea")
124
mixed := rev(t, dir)
125
126
parents, files, err = CommitPatch(ctx, "git", dir, mixed)
127
if err != nil {
128
t.Fatal(err)
129
}
130
if len(parents) != 1 || parents[0] != root {
131
t.Fatalf("parents: %v", parents)
132
}
133
byPath := map[string]PatchFile{}
134
for _, f := range files {
135
byPath[f.Path] = f
136
}
137
if byPath["a2.txt"].Status != "renamed" || byPath["a2.txt"].OldPath != "a.txt" {
138
t.Fatalf("rename: %+v", byPath["a2.txt"])
139
}
140
if byPath["b.txt"].Status != "deleted" || byPath["b.txt"].Deleted != 1 {
141
t.Fatalf("delete: %+v", byPath["b.txt"])
142
}
143
if byPath["c.txt"].Status != "added" || byPath["c.txt"].Added != 1 {
144
t.Fatalf("add: %+v", byPath["c.txt"])
145
}
146
if byPath["note file.txt"].Status != "added" {
147
t.Fatalf("spatie: %+v", byPath["note file.txt"])
148
}
149
if !byPath["bin.dat"].Binary || len(byPath["bin.dat"].Lines) != 0 {
150
t.Fatalf("binair: %+v", byPath["bin.dat"])
151
}
152
if byPath["huge.txt"].Added != 220 {
153
t.Fatalf("groot: %+v", byPath["huge.txt"])
154
}
155
if byPath["keep.go"].Status != "modified" || byPath["keep.go"].Added < 1 {
156
t.Fatalf("go: %+v", byPath["keep.go"])
157
}
158
159
git("checkout", "-b", "side")
160
write("side.txt", "zijtak\n")
161
git("add", "side.txt")
162
git("commit", "-m", "zijtak")
163
git("checkout", "master")
164
git("merge", "--no-ff", "side", "-m", "voeg zijtak samen")
165
merge := rev(t, dir)
166
parents, files, err = CommitPatch(ctx, "git", dir, merge)
167
if err != nil {
168
t.Fatal(err)
169
}
170
if len(parents) != 2 || parents[0] != mixed {
171
t.Fatalf("merge-parents: %v mixed=%s", parents, mixed)
172
}
173
if len(files) != 1 || files[0].Path != "side.txt" || files[0].Status != "added" {
174
t.Fatalf("merge-diff: %+v", files)
175
}
176
}
177
178
func rev(t *testing.T, dir string) string {
179
t.Helper()
180
cmd := exec.Command("git", "-C", dir, "rev-parse", "HEAD")
181
out, err := cmd.Output()
182
if err != nil {
183
t.Fatal(err)
184
}
185
return strings.TrimSpace(string(out))
186
}
@@ -0,0 +1,186 @@1
package gitrepo2
3
import (4
"context"5
"os"6
"os/exec"7
"path/filepath"8
"strings"9
"testing"10
)11
12
func TestParsePatchKinds(t *testing.T) {13
raw := "" +14
"diff --git a/keep.go b/keep.go\n" +15
"index 111..222 100644\n" +16
"--- a/keep.go\n" +17
"+++ b/keep.go\n" +18
"@@ -1,2 +1,3 @@\n" +19
" package p\n" +20
"-func old() {}\n" +21
"+func extra() {}\n" +22
" \n" +23
"diff --git a/gone.txt b/gone.txt\n" +24
"deleted file mode 100644\n" +25
"--- a/gone.txt\n" +26
"+++ /dev/null\n" +27
"@@ -1 +0,0 @@\n" +28
"-weg\n" +29
"diff --git \"a/oude naam.txt\" \"b/nieuwe naam.txt\"\n" +30
"similarity index 90%\n" +31
"rename from oude naam.txt\n" +32
"rename to nieuwe naam.txt\n" +33
"--- \"a/oude naam.txt\"\n" +34
"+++ \"b/nieuwe naam.txt\"\n" +35
"@@ -1 +1 @@\n" +36
"-oud\n" +37
"+nieuw\n" +38
"diff --git a/plaatje.bin b/plaatje.bin\n" +39
"new file mode 100644\n" +40
"index 0000000..abc\n" +41
"Binary files /dev/null and b/plaatje.bin differ\n"42
files := ParsePatch(raw)43
if len(files) != 4 {44
t.Fatalf("bestanden: %+v", files)45
}46
if files[0].Status != "modified" || files[0].Added != 1 || files[0].Deleted != 1 || files[0].Path != "keep.go" {47
t.Fatalf("wijziging: %+v", files[0])48
}49
if files[0].Lines[2].Kind != "del" || files[0].Lines[2].Old != 2 || files[0].Lines[3].Kind != "add" || files[0].Lines[3].New != 2 {50
t.Fatalf("regelnummers: %+v", files[0].Lines)51
}52
if files[1].Status != "deleted" || files[1].Path != "gone.txt" || files[1].Deleted != 1 {53
t.Fatalf("verwijderd: %+v", files[1])54
}55
if files[2].Status != "renamed" || files[2].OldPath != "oude naam.txt" || files[2].Path != "nieuwe naam.txt" {56
t.Fatalf("hernoemd: %+v", files[2])57
}58
if !files[3].Binary || files[3].Status != "added" || len(files[3].Lines) != 0 || files[3].Path != "plaatje.bin" {59
t.Fatalf("binair: %+v", files[3])60
}61
}62
63
func TestCommitPatchHistory(t *testing.T) {64
if _, err := exec.LookPath("git"); err != nil {65
t.Skip("git ontbreekt")66
}67
dir := t.TempDir()68
git := func(args ...string) {69
t.Helper()70
cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)71
cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")72
if out, err := cmd.CombinedOutput(); err != nil {73
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)74
}75
}76
git("init", "-b", "master")77
git("config", "commit.gpgsign", "false")78
write := func(name, body string) {79
t.Helper()80
path := filepath.Join(dir, filepath.FromSlash(name))81
if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {82
t.Fatal(err)83
}84
if err := os.WriteFile(path, []byte(body), 0o644); err != nil {85
t.Fatal(err)86
}87
}88
write("a.txt", "alpha\n")89
write("b.txt", "beta\n")90
write("keep.go", "package p\n\nfunc keep() {}\n")91
git("add", ".")92
git("commit", "-m", "begin")93
root := rev(t, dir)94
95
ctx := context.Background()96
parents, files, err := CommitPatch(ctx, "git", dir, root)97
if err != nil {98
t.Fatal(err)99
}100
if len(parents) != 0 || len(files) != 3 {101
t.Fatalf("root parents=%v files=%d", parents, len(files))102
}103
for _, f := range files {104
if f.Status != "added" {105
t.Fatalf("rootbestand: %+v", f)106
}107
}108
109
write("keep.go", "package p\n\nfunc keep() {}\nfunc extra() {}\n")110
if err := os.Remove(filepath.Join(dir, "b.txt")); err != nil {111
t.Fatal(err)112
}113
write("c.txt", strings.Repeat("x", 180)+"\n")114
write("note file.txt", "spatie\n")115
var huge strings.Builder116
for i := 0; i < 220; i++ {117
huge.WriteString("regel\n")118
}119
write("huge.txt", huge.String())120
write("bin.dat", "a\x00b\n")121
git("add", "-A")122
git("mv", "a.txt", "a2.txt")123
git("commit", "-m", "wijzig bestanden", "-m", "tweede alinea")124
mixed := rev(t, dir)125
126
parents, files, err = CommitPatch(ctx, "git", dir, mixed)127
if err != nil {128
t.Fatal(err)129
}130
if len(parents) != 1 || parents[0] != root {131
t.Fatalf("parents: %v", parents)132
}133
byPath := map[string]PatchFile{}134
for _, f := range files {135
byPath[f.Path] = f136
}137
if byPath["a2.txt"].Status != "renamed" || byPath["a2.txt"].OldPath != "a.txt" {138
t.Fatalf("rename: %+v", byPath["a2.txt"])139
}140
if byPath["b.txt"].Status != "deleted" || byPath["b.txt"].Deleted != 1 {141
t.Fatalf("delete: %+v", byPath["b.txt"])142
}143
if byPath["c.txt"].Status != "added" || byPath["c.txt"].Added != 1 {144
t.Fatalf("add: %+v", byPath["c.txt"])145
}146
if byPath["note file.txt"].Status != "added" {147
t.Fatalf("spatie: %+v", byPath["note file.txt"])148
}149
if !byPath["bin.dat"].Binary || len(byPath["bin.dat"].Lines) != 0 {150
t.Fatalf("binair: %+v", byPath["bin.dat"])151
}152
if byPath["huge.txt"].Added != 220 {153
t.Fatalf("groot: %+v", byPath["huge.txt"])154
}155
if byPath["keep.go"].Status != "modified" || byPath["keep.go"].Added < 1 {156
t.Fatalf("go: %+v", byPath["keep.go"])157
}158
159
git("checkout", "-b", "side")160
write("side.txt", "zijtak\n")161
git("add", "side.txt")162
git("commit", "-m", "zijtak")163
git("checkout", "master")164
git("merge", "--no-ff", "side", "-m", "voeg zijtak samen")165
merge := rev(t, dir)166
parents, files, err = CommitPatch(ctx, "git", dir, merge)167
if err != nil {168
t.Fatal(err)169
}170
if len(parents) != 2 || parents[0] != mixed {171
t.Fatalf("merge-parents: %v mixed=%s", parents, mixed)172
}173
if len(files) != 1 || files[0].Path != "side.txt" || files[0].Status != "added" {174
t.Fatalf("merge-diff: %+v", files)175
}176
}177
178
func rev(t *testing.T, dir string) string {179
t.Helper()180
cmd := exec.Command("git", "-C", dir, "rev-parse", "HEAD")181
out, err := cmd.Output()182
if err != nil {183
t.Fatal(err)184
}185
return strings.TrimSpace(string(out))186
}@@ -661,7 +661,8 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai
661
661
if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {
662
662
return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
663
663
}
664
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {
664
// De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.
665
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {
665
666
return i18n.E("err.mergeConflict")
666
667
}
667
668
pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
@@ -661,7 +661,8 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai661
if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {661
if _, err := run(ctx, gitBin, env, "-C", repo, "checkout", target); err != nil {662
return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))662
return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))663
}663
}664
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, source); err != nil {664
// De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.665
if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {665
return i18n.E("err.mergeConflict")666
return i18n.E("err.mergeConflict")666
}667
}667
pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)668
pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)@@ -9,21 +9,36 @@ import (
9
9
10
10
// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.
11
11
func Lines(filename, src string) []string {
12
lang := langOf(filename)
13
inBlock := false
14
12
raw := strings.Split(src, "\n")
15
13
if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {
16
14
raw = raw[:len(raw)-1]
17
15
}
16
p := NewPainter(filename)
18
17
out := make([]string, 0, len(raw))
19
18
for _, line := range raw {
20
var htmlLine string
21
htmlLine, inBlock = paint(lang, line, inBlock)
22
out = append(out, htmlLine)
19
out = append(out, p.Line(line))
23
20
}
24
21
return out
25
22
}
26
23
24
// Painter kleurt opeenvolgende regels en onthoudt een blokcommentaar.
25
type Painter struct {
26
lang string
27
inBlock bool
28
}
29
30
// NewPainter kiest de taal bij de bestandsnaam.
31
func NewPainter(filename string) *Painter {
32
return &Painter{lang: langOf(filename)}
33
}
34
35
// Line geeft geëscapete HTML voor één regel.
36
func (p *Painter) Line(text string) string {
37
htmlLine, inBlock := paint(p.lang, text, p.inBlock)
38
p.inBlock = inBlock
39
return htmlLine
40
}
41
27
42
func langOf(filename string) string {
28
43
switch strings.ToLower(path.Ext(filename)) {
29
44
case ".go":
@@ -9,21 +9,36 @@ import (9
9
10
// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.10
// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.11
func Lines(filename, src string) []string {11
func Lines(filename, src string) []string {12
lang := langOf(filename)13
inBlock := false14
raw := strings.Split(src, "\n")12
raw := strings.Split(src, "\n")15
if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {13
if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {16
raw = raw[:len(raw)-1]14
raw = raw[:len(raw)-1]17
}15
}16
p := NewPainter(filename)18
out := make([]string, 0, len(raw))17
out := make([]string, 0, len(raw))19
for _, line := range raw {18
for _, line := range raw {20
var htmlLine string19
out = append(out, p.Line(line))21
htmlLine, inBlock = paint(lang, line, inBlock)22
out = append(out, htmlLine)23
}20
}24
return out21
return out25
}22
}26
23
24
// Painter kleurt opeenvolgende regels en onthoudt een blokcommentaar.25
type Painter struct {26
lang string27
inBlock bool28
}29
30
// NewPainter kiest de taal bij de bestandsnaam.31
func NewPainter(filename string) *Painter {32
return &Painter{lang: langOf(filename)}33
}34
35
// Line geeft geëscapete HTML voor één regel.36
func (p *Painter) Line(text string) string {37
htmlLine, inBlock := paint(p.lang, text, p.inBlock)38
p.inBlock = inBlock39
return htmlLine40
}41
27
func langOf(filename string) string {42
func langOf(filename string) string {28
switch strings.ToLower(path.Ext(filename)) {43
switch strings.ToLower(path.Ext(filename)) {29
case ".go":44
case ".go":@@ -229,6 +229,7 @@ var en = map[string]string{
229
229
"pipe.duration": "Duration",
230
230
"pipe.finished": "Finished",
231
231
"pipe.queued": "Queued",
232
"pipe.queuePos": "In queue (#%d)",
232
233
"pipe.timeout": "Timeout",
233
234
"pipe.environment": "Environment",
234
235
"pipe.runner": "Runner",
@@ -229,6 +229,7 @@ var en = map[string]string{229
"pipe.duration": "Duration",229
"pipe.duration": "Duration",230
"pipe.finished": "Finished",230
"pipe.finished": "Finished",231
"pipe.queued": "Queued",231
"pipe.queued": "Queued",232
"pipe.queuePos": "In queue (#%d)",232
"pipe.timeout": "Timeout",233
"pipe.timeout": "Timeout",233
"pipe.environment": "Environment",234
"pipe.environment": "Environment",234
"pipe.runner": "Runner",235
"pipe.runner": "Runner",@@ -0,0 +1,224 @@
1
package i18n
2
3
func init() {
4
addCatalog(en, branchEN)
5
addCatalog(nl, branchNL)
6
addCatalog(de, branchDE)
7
addCatalog(fr, branchFR)
8
}
9
10
var branchEN = map[string]string{
11
"branch.search": "Search branches",
12
"branch.default": "default",
13
"branch.create": "New branch",
14
"branch.name": "Branch name",
15
"branch.from": "Create from",
16
"branch.delete": "Delete",
17
"branch.rename": "Rename",
18
"branch.deleteAsk": "Delete branch %s?",
19
"branch.renameAsk": "Rename branch %s?",
20
"branch.confirm": "Type the branch name to confirm",
21
"branch.compare": "Compare",
22
"branch.newMR": "Create merge request",
23
"branch.last": "Last commit",
24
"branch.ahead": "%d ahead",
25
"branch.behind": "%d behind",
26
"branch.even": "Up to date",
27
"branch.actions": "Actions",
28
"mr.draft": "Draft",
29
"mr.markDraft": "Mark as draft",
30
"mr.block.draft": "This merge request is a draft.",
31
"mr.preview": "Preview",
32
"mr.write": "Write",
33
"mr.overview": "Overview",
34
"mr.pipelines": "Pipelines",
35
"mr.labels": "Labels",
36
"mr.labelsHint": "Comma-separated labels",
37
"mr.timeline": "Activity",
38
"mr.opened": "opened this merge request",
39
"mr.pushed": "pushed",
40
"mr.retitled": "changed the title",
41
"mr.relabeled": "changed the labels",
42
"mr.mergedEvent": "merged this merge request",
43
"mr.closedEvent": "closed this merge request",
44
"mr.reopenedEvent": "reopened this merge request",
45
"mr.reply": "Reply",
46
"mr.replying": "Reply to %s",
47
"mr.create": "Create merge request",
48
"mr.edit": "Edit",
49
"mr.save": "Save changes",
50
"mr.mergeTitle": "Merge %s into %s",
51
"mr.emptyCompare": "Choose two different branches",
52
"mr.commented": "commented",
53
"mr.pipeEvent": "Pipeline #%d is %s",
54
"err.branchName": "Branch name %s is not allowed",
55
"err.branchLocked": "Branch %s cannot be renamed or deleted",
56
"err.branchConfirm": "Type the branch name to confirm.",
57
"err.noteParent": "That comment does not exist",
58
"flash.branchCreated": "Branch created",
59
"flash.branchDeleted": "Branch deleted",
60
"flash.branchRenamed": "Branch renamed",
61
"flash.mrUpdated": "Merge request updated",
62
}
63
64
var branchNL = map[string]string{
65
"branch.search": "Zoek branches",
66
"branch.default": "standaard",
67
"branch.create": "Nieuwe branch",
68
"branch.name": "Branchnaam",
69
"branch.from": "Aanmaken vanaf",
70
"branch.delete": "Verwijderen",
71
"branch.rename": "Hernoemen",
72
"branch.deleteAsk": "Branch %s verwijderen?",
73
"branch.renameAsk": "Branch %s hernoemen?",
74
"branch.confirm": "Typ de branchnaam ter bevestiging",
75
"branch.compare": "Vergelijken",
76
"branch.newMR": "Merge request maken",
77
"branch.last": "Laatste commit",
78
"branch.ahead": "%d voor",
79
"branch.behind": "%d achter",
80
"branch.even": "Bijgewerkt",
81
"branch.actions": "Acties",
82
"mr.draft": "Concept",
83
"mr.markDraft": "Als concept markeren",
84
"mr.block.draft": "Deze merge request is een concept.",
85
"mr.preview": "Voorbeeld",
86
"mr.write": "Schrijven",
87
"mr.overview": "Overzicht",
88
"mr.pipelines": "Pipelines",
89
"mr.labels": "Labels",
90
"mr.labelsHint": "Labels, gescheiden door komma's",
91
"mr.timeline": "Activiteit",
92
"mr.opened": "heeft deze merge request geopend",
93
"mr.pushed": "heeft gepusht",
94
"mr.retitled": "heeft de titel gewijzigd",
95
"mr.relabeled": "heeft de labels gewijzigd",
96
"mr.mergedEvent": "heeft deze merge request gemerged",
97
"mr.closedEvent": "heeft deze merge request gesloten",
98
"mr.reopenedEvent": "heeft deze merge request heropend",
99
"mr.reply": "Antwoorden",
100
"mr.replying": "Antwoord op %s",
101
"mr.create": "Merge request maken",
102
"mr.edit": "Bewerken",
103
"mr.save": "Wijzigingen opslaan",
104
"mr.mergeTitle": "%s mergen naar %s",
105
"mr.emptyCompare": "Kies twee verschillende branches",
106
"mr.commented": "reageerde",
107
"mr.pipeEvent": "Pipeline #%d is %s",
108
"err.branchName": "Branchnaam %s is niet toegestaan",
109
"err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",
110
"err.branchConfirm": "Typ de branchnaam ter bevestiging.",
111
"err.noteParent": "Die reactie bestaat niet",
112
"flash.branchCreated": "Branch aangemaakt",
113
"flash.branchDeleted": "Branch verwijderd",
114
"flash.branchRenamed": "Branch hernoemd",
115
"flash.mrUpdated": "Merge request bijgewerkt",
116
}
117
118
var branchDE = map[string]string{
119
"branch.search": "Branches suchen",
120
"branch.default": "Standard",
121
"branch.create": "Neuer Branch",
122
"branch.name": "Branchname",
123
"branch.from": "Erstellen von",
124
"branch.delete": "Löschen",
125
"branch.rename": "Umbenennen",
126
"branch.deleteAsk": "Branch %s löschen?",
127
"branch.renameAsk": "Branch %s umbenennen?",
128
"branch.confirm": "Branchname zur Bestätigung eingeben",
129
"branch.compare": "Vergleichen",
130
"branch.newMR": "Merge Request erstellen",
131
"branch.last": "Letzter Commit",
132
"branch.ahead": "%d voraus",
133
"branch.behind": "%d zurück",
134
"branch.even": "Aktuell",
135
"branch.actions": "Aktionen",
136
"mr.draft": "Entwurf",
137
"mr.markDraft": "Als Entwurf markieren",
138
"mr.block.draft": "Dieser Merge Request ist ein Entwurf.",
139
"mr.preview": "Vorschau",
140
"mr.write": "Schreiben",
141
"mr.overview": "Übersicht",
142
"mr.pipelines": "Pipelines",
143
"mr.labels": "Labels",
144
"mr.labelsHint": "Labels, durch Kommas getrennt",
145
"mr.timeline": "Aktivität",
146
"mr.opened": "hat diesen Merge Request geöffnet",
147
"mr.pushed": "hat gepusht",
148
"mr.retitled": "hat den Titel geändert",
149
"mr.relabeled": "hat die Labels geändert",
150
"mr.mergedEvent": "hat diesen Merge Request gemergt",
151
"mr.closedEvent": "hat diesen Merge Request geschlossen",
152
"mr.reopenedEvent": "hat diesen Merge Request wieder geöffnet",
153
"mr.reply": "Antworten",
154
"mr.replying": "Antwort auf %s",
155
"mr.create": "Merge Request erstellen",
156
"mr.edit": "Bearbeiten",
157
"mr.save": "Änderungen speichern",
158
"mr.mergeTitle": "%s nach %s mergen",
159
"mr.emptyCompare": "Zwei verschiedene Branches wählen",
160
"mr.commented": "kommentierte",
161
"mr.pipeEvent": "Pipeline #%d ist %s",
162
"err.branchName": "Branchname %s ist nicht erlaubt",
163
"err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",
164
"err.branchConfirm": "Branchname zur Bestätigung eingeben.",
165
"err.noteParent": "Dieser Kommentar existiert nicht",
166
"flash.branchCreated": "Branch erstellt",
167
"flash.branchDeleted": "Branch gelöscht",
168
"flash.branchRenamed": "Branch umbenannt",
169
"flash.mrUpdated": "Merge Request aktualisiert",
170
}
171
172
var branchFR = map[string]string{
173
"branch.search": "Chercher des branches",
174
"branch.default": "par défaut",
175
"branch.create": "Nouvelle branche",
176
"branch.name": "Nom de la branche",
177
"branch.from": "Créer depuis",
178
"branch.delete": "Supprimer",
179
"branch.rename": "Renommer",
180
"branch.deleteAsk": "Supprimer la branche %s ?",
181
"branch.renameAsk": "Renommer la branche %s ?",
182
"branch.confirm": "Saisir le nom de la branche pour confirmer",
183
"branch.compare": "Comparer",
184
"branch.newMR": "Créer une merge request",
185
"branch.last": "Dernier commit",
186
"branch.ahead": "%d en avance",
187
"branch.behind": "%d en retard",
188
"branch.even": "À jour",
189
"branch.actions": "Actions",
190
"mr.draft": "Brouillon",
191
"mr.markDraft": "Marquer comme brouillon",
192
"mr.block.draft": "Cette merge request est un brouillon.",
193
"mr.preview": "Aperçu",
194
"mr.write": "Écrire",
195
"mr.overview": "Aperçu général",
196
"mr.pipelines": "Pipelines",
197
"mr.labels": "Labels",
198
"mr.labelsHint": "Labels séparés par des virgules",
199
"mr.timeline": "Activité",
200
"mr.opened": "a ouvert cette merge request",
201
"mr.pushed": "a poussé",
202
"mr.retitled": "a changé le titre",
203
"mr.relabeled": "a changé les labels",
204
"mr.mergedEvent": "a fusionné cette merge request",
205
"mr.closedEvent": "a fermé cette merge request",
206
"mr.reopenedEvent": "a rouvert cette merge request",
207
"mr.reply": "Répondre",
208
"mr.replying": "Réponse à %s",
209
"mr.create": "Créer une merge request",
210
"mr.edit": "Modifier",
211
"mr.save": "Enregistrer",
212
"mr.mergeTitle": "Fusionner %s dans %s",
213
"mr.emptyCompare": "Choisissez deux branches différentes",
214
"mr.commented": "a commenté",
215
"mr.pipeEvent": "Le pipeline #%d est %s",
216
"err.branchName": "Le nom de branche %s n'est pas permis",
217
"err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",
218
"err.branchConfirm": "Saisir le nom de la branche pour confirmer.",
219
"err.noteParent": "Ce commentaire n'existe pas",
220
"flash.branchCreated": "Branche créée",
221
"flash.branchDeleted": "Branche supprimée",
222
"flash.branchRenamed": "Branche renommée",
223
"flash.mrUpdated": "Merge request mise à jour",
224
}
@@ -0,0 +1,224 @@1
package i18n2
3
func init() {4
addCatalog(en, branchEN)5
addCatalog(nl, branchNL)6
addCatalog(de, branchDE)7
addCatalog(fr, branchFR)8
}9
10
var branchEN = map[string]string{11
"branch.search": "Search branches",12
"branch.default": "default",13
"branch.create": "New branch",14
"branch.name": "Branch name",15
"branch.from": "Create from",16
"branch.delete": "Delete",17
"branch.rename": "Rename",18
"branch.deleteAsk": "Delete branch %s?",19
"branch.renameAsk": "Rename branch %s?",20
"branch.confirm": "Type the branch name to confirm",21
"branch.compare": "Compare",22
"branch.newMR": "Create merge request",23
"branch.last": "Last commit",24
"branch.ahead": "%d ahead",25
"branch.behind": "%d behind",26
"branch.even": "Up to date",27
"branch.actions": "Actions",28
"mr.draft": "Draft",29
"mr.markDraft": "Mark as draft",30
"mr.block.draft": "This merge request is a draft.",31
"mr.preview": "Preview",32
"mr.write": "Write",33
"mr.overview": "Overview",34
"mr.pipelines": "Pipelines",35
"mr.labels": "Labels",36
"mr.labelsHint": "Comma-separated labels",37
"mr.timeline": "Activity",38
"mr.opened": "opened this merge request",39
"mr.pushed": "pushed",40
"mr.retitled": "changed the title",41
"mr.relabeled": "changed the labels",42
"mr.mergedEvent": "merged this merge request",43
"mr.closedEvent": "closed this merge request",44
"mr.reopenedEvent": "reopened this merge request",45
"mr.reply": "Reply",46
"mr.replying": "Reply to %s",47
"mr.create": "Create merge request",48
"mr.edit": "Edit",49
"mr.save": "Save changes",50
"mr.mergeTitle": "Merge %s into %s",51
"mr.emptyCompare": "Choose two different branches",52
"mr.commented": "commented",53
"mr.pipeEvent": "Pipeline #%d is %s",54
"err.branchName": "Branch name %s is not allowed",55
"err.branchLocked": "Branch %s cannot be renamed or deleted",56
"err.branchConfirm": "Type the branch name to confirm.",57
"err.noteParent": "That comment does not exist",58
"flash.branchCreated": "Branch created",59
"flash.branchDeleted": "Branch deleted",60
"flash.branchRenamed": "Branch renamed",61
"flash.mrUpdated": "Merge request updated",62
}63
64
var branchNL = map[string]string{65
"branch.search": "Zoek branches",66
"branch.default": "standaard",67
"branch.create": "Nieuwe branch",68
"branch.name": "Branchnaam",69
"branch.from": "Aanmaken vanaf",70
"branch.delete": "Verwijderen",71
"branch.rename": "Hernoemen",72
"branch.deleteAsk": "Branch %s verwijderen?",73
"branch.renameAsk": "Branch %s hernoemen?",74
"branch.confirm": "Typ de branchnaam ter bevestiging",75
"branch.compare": "Vergelijken",76
"branch.newMR": "Merge request maken",77
"branch.last": "Laatste commit",78
"branch.ahead": "%d voor",79
"branch.behind": "%d achter",80
"branch.even": "Bijgewerkt",81
"branch.actions": "Acties",82
"mr.draft": "Concept",83
"mr.markDraft": "Als concept markeren",84
"mr.block.draft": "Deze merge request is een concept.",85
"mr.preview": "Voorbeeld",86
"mr.write": "Schrijven",87
"mr.overview": "Overzicht",88
"mr.pipelines": "Pipelines",89
"mr.labels": "Labels",90
"mr.labelsHint": "Labels, gescheiden door komma's",91
"mr.timeline": "Activiteit",92
"mr.opened": "heeft deze merge request geopend",93
"mr.pushed": "heeft gepusht",94
"mr.retitled": "heeft de titel gewijzigd",95
"mr.relabeled": "heeft de labels gewijzigd",96
"mr.mergedEvent": "heeft deze merge request gemerged",97
"mr.closedEvent": "heeft deze merge request gesloten",98
"mr.reopenedEvent": "heeft deze merge request heropend",99
"mr.reply": "Antwoorden",100
"mr.replying": "Antwoord op %s",101
"mr.create": "Merge request maken",102
"mr.edit": "Bewerken",103
"mr.save": "Wijzigingen opslaan",104
"mr.mergeTitle": "%s mergen naar %s",105
"mr.emptyCompare": "Kies twee verschillende branches",106
"mr.commented": "reageerde",107
"mr.pipeEvent": "Pipeline #%d is %s",108
"err.branchName": "Branchnaam %s is niet toegestaan",109
"err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",110
"err.branchConfirm": "Typ de branchnaam ter bevestiging.",111
"err.noteParent": "Die reactie bestaat niet",112
"flash.branchCreated": "Branch aangemaakt",113
"flash.branchDeleted": "Branch verwijderd",114
"flash.branchRenamed": "Branch hernoemd",115
"flash.mrUpdated": "Merge request bijgewerkt",116
}117
118
var branchDE = map[string]string{119
"branch.search": "Branches suchen",120
"branch.default": "Standard",121
"branch.create": "Neuer Branch",122
"branch.name": "Branchname",123
"branch.from": "Erstellen von",124
"branch.delete": "Löschen",125
"branch.rename": "Umbenennen",126
"branch.deleteAsk": "Branch %s löschen?",127
"branch.renameAsk": "Branch %s umbenennen?",128
"branch.confirm": "Branchname zur Bestätigung eingeben",129
"branch.compare": "Vergleichen",130
"branch.newMR": "Merge Request erstellen",131
"branch.last": "Letzter Commit",132
"branch.ahead": "%d voraus",133
"branch.behind": "%d zurück",134
"branch.even": "Aktuell",135
"branch.actions": "Aktionen",136
"mr.draft": "Entwurf",137
"mr.markDraft": "Als Entwurf markieren",138
"mr.block.draft": "Dieser Merge Request ist ein Entwurf.",139
"mr.preview": "Vorschau",140
"mr.write": "Schreiben",141
"mr.overview": "Übersicht",142
"mr.pipelines": "Pipelines",143
"mr.labels": "Labels",144
"mr.labelsHint": "Labels, durch Kommas getrennt",145
"mr.timeline": "Aktivität",146
"mr.opened": "hat diesen Merge Request geöffnet",147
"mr.pushed": "hat gepusht",148
"mr.retitled": "hat den Titel geändert",149
"mr.relabeled": "hat die Labels geändert",150
"mr.mergedEvent": "hat diesen Merge Request gemergt",151
"mr.closedEvent": "hat diesen Merge Request geschlossen",152
"mr.reopenedEvent": "hat diesen Merge Request wieder geöffnet",153
"mr.reply": "Antworten",154
"mr.replying": "Antwort auf %s",155
"mr.create": "Merge Request erstellen",156
"mr.edit": "Bearbeiten",157
"mr.save": "Änderungen speichern",158
"mr.mergeTitle": "%s nach %s mergen",159
"mr.emptyCompare": "Zwei verschiedene Branches wählen",160
"mr.commented": "kommentierte",161
"mr.pipeEvent": "Pipeline #%d ist %s",162
"err.branchName": "Branchname %s ist nicht erlaubt",163
"err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",164
"err.branchConfirm": "Branchname zur Bestätigung eingeben.",165
"err.noteParent": "Dieser Kommentar existiert nicht",166
"flash.branchCreated": "Branch erstellt",167
"flash.branchDeleted": "Branch gelöscht",168
"flash.branchRenamed": "Branch umbenannt",169
"flash.mrUpdated": "Merge Request aktualisiert",170
}171
172
var branchFR = map[string]string{173
"branch.search": "Chercher des branches",174
"branch.default": "par défaut",175
"branch.create": "Nouvelle branche",176
"branch.name": "Nom de la branche",177
"branch.from": "Créer depuis",178
"branch.delete": "Supprimer",179
"branch.rename": "Renommer",180
"branch.deleteAsk": "Supprimer la branche %s ?",181
"branch.renameAsk": "Renommer la branche %s ?",182
"branch.confirm": "Saisir le nom de la branche pour confirmer",183
"branch.compare": "Comparer",184
"branch.newMR": "Créer une merge request",185
"branch.last": "Dernier commit",186
"branch.ahead": "%d en avance",187
"branch.behind": "%d en retard",188
"branch.even": "À jour",189
"branch.actions": "Actions",190
"mr.draft": "Brouillon",191
"mr.markDraft": "Marquer comme brouillon",192
"mr.block.draft": "Cette merge request est un brouillon.",193
"mr.preview": "Aperçu",194
"mr.write": "Écrire",195
"mr.overview": "Aperçu général",196
"mr.pipelines": "Pipelines",197
"mr.labels": "Labels",198
"mr.labelsHint": "Labels séparés par des virgules",199
"mr.timeline": "Activité",200
"mr.opened": "a ouvert cette merge request",201
"mr.pushed": "a poussé",202
"mr.retitled": "a changé le titre",203
"mr.relabeled": "a changé les labels",204
"mr.mergedEvent": "a fusionné cette merge request",205
"mr.closedEvent": "a fermé cette merge request",206
"mr.reopenedEvent": "a rouvert cette merge request",207
"mr.reply": "Répondre",208
"mr.replying": "Réponse à %s",209
"mr.create": "Créer une merge request",210
"mr.edit": "Modifier",211
"mr.save": "Enregistrer",212
"mr.mergeTitle": "Fusionner %s dans %s",213
"mr.emptyCompare": "Choisissez deux branches différentes",214
"mr.commented": "a commenté",215
"mr.pipeEvent": "Le pipeline #%d est %s",216
"err.branchName": "Le nom de branche %s n'est pas permis",217
"err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",218
"err.branchConfirm": "Saisir le nom de la branche pour confirmer.",219
"err.noteParent": "Ce commentaire n'existe pas",220
"flash.branchCreated": "Branche créée",221
"flash.branchDeleted": "Branche supprimée",222
"flash.branchRenamed": "Branche renommée",223
"flash.mrUpdated": "Merge request mise à jour",224
}@@ -0,0 +1,92 @@
1
package i18n
2
3
func init() {
4
addCatalog(en, commitEN)
5
addCatalog(nl, commitNL)
6
addCatalog(de, commitDE)
7
addCatalog(fr, commitFR)
8
}
9
10
var commitEN = map[string]string{
11
"commit.authored": "Authored",
12
"commit.sha": "Hash",
13
"commit.parent": "Parent",
14
"commit.parents": "Parents",
15
"commit.changed": "Changed files",
16
"commit.file.one": "%d file changed",
17
"commit.file.many": "%d files changed",
18
"commit.added": "added",
19
"commit.deleted": "deleted",
20
"commit.renamed": "renamed",
21
"commit.binary": "Binary file",
22
"commit.binaryHint": "The contents of this binary file are not shown.",
23
"commit.show": "Show diff",
24
"commit.hide": "Hide diff",
25
"commit.inline": "Inline",
26
"commit.side": "Side-by-side",
27
"commit.empty": "This commit does not change any files.",
28
"commit.view": "Diff view",
29
}
30
31
var commitNL = map[string]string{
32
"commit.authored": "Geschreven",
33
"commit.sha": "Hash",
34
"commit.parent": "Bovenliggende commit",
35
"commit.parents": "Bovenliggende commits",
36
"commit.changed": "Gewijzigde bestanden",
37
"commit.file.one": "%d bestand gewijzigd",
38
"commit.file.many": "%d bestanden gewijzigd",
39
"commit.added": "toegevoegd",
40
"commit.deleted": "verwijderd",
41
"commit.renamed": "hernoemd",
42
"commit.binary": "Binair bestand",
43
"commit.binaryHint": "De inhoud van dit binaire bestand wordt niet getoond.",
44
"commit.show": "Toon diff",
45
"commit.hide": "Verberg diff",
46
"commit.inline": "Onder elkaar",
47
"commit.side": "Naast elkaar",
48
"commit.empty": "Deze commit wijzigt geen bestanden.",
49
"commit.view": "Diffweergave",
50
}
51
52
var commitDE = map[string]string{
53
"commit.authored": "Verfasst",
54
"commit.sha": "Hash",
55
"commit.parent": "Übergeordneter Commit",
56
"commit.parents": "Übergeordnete Commits",
57
"commit.changed": "Geänderte Dateien",
58
"commit.file.one": "%d Datei geändert",
59
"commit.file.many": "%d Dateien geändert",
60
"commit.added": "hinzugefügt",
61
"commit.deleted": "gelöscht",
62
"commit.renamed": "umbenannt",
63
"commit.binary": "Binärdatei",
64
"commit.binaryHint": "Der Inhalt dieser Binärdatei wird nicht angezeigt.",
65
"commit.show": "Diff anzeigen",
66
"commit.hide": "Diff verbergen",
67
"commit.inline": "Untereinander",
68
"commit.side": "Nebeneinander",
69
"commit.empty": "Dieser Commit ändert keine Dateien.",
70
"commit.view": "Diff-Ansicht",
71
}
72
73
var commitFR = map[string]string{
74
"commit.authored": "Rédigé",
75
"commit.sha": "Empreinte",
76
"commit.parent": "Parent",
77
"commit.parents": "Parents",
78
"commit.changed": "Fichiers modifiés",
79
"commit.file.one": "%d fichier modifié",
80
"commit.file.many": "%d fichiers modifiés",
81
"commit.added": "ajouté",
82
"commit.deleted": "supprimé",
83
"commit.renamed": "renommé",
84
"commit.binary": "Fichier binaire",
85
"commit.binaryHint": "Le contenu de ce fichier binaire n'est pas affiché.",
86
"commit.show": "Afficher le diff",
87
"commit.hide": "Masquer le diff",
88
"commit.inline": "En ligne",
89
"commit.side": "Côte à côte",
90
"commit.empty": "Ce commit ne modifie aucun fichier.",
91
"commit.view": "Affichage du diff",
92
}
@@ -0,0 +1,92 @@1
package i18n2
3
func init() {4
addCatalog(en, commitEN)5
addCatalog(nl, commitNL)6
addCatalog(de, commitDE)7
addCatalog(fr, commitFR)8
}9
10
var commitEN = map[string]string{11
"commit.authored": "Authored",12
"commit.sha": "Hash",13
"commit.parent": "Parent",14
"commit.parents": "Parents",15
"commit.changed": "Changed files",16
"commit.file.one": "%d file changed",17
"commit.file.many": "%d files changed",18
"commit.added": "added",19
"commit.deleted": "deleted",20
"commit.renamed": "renamed",21
"commit.binary": "Binary file",22
"commit.binaryHint": "The contents of this binary file are not shown.",23
"commit.show": "Show diff",24
"commit.hide": "Hide diff",25
"commit.inline": "Inline",26
"commit.side": "Side-by-side",27
"commit.empty": "This commit does not change any files.",28
"commit.view": "Diff view",29
}30
31
var commitNL = map[string]string{32
"commit.authored": "Geschreven",33
"commit.sha": "Hash",34
"commit.parent": "Bovenliggende commit",35
"commit.parents": "Bovenliggende commits",36
"commit.changed": "Gewijzigde bestanden",37
"commit.file.one": "%d bestand gewijzigd",38
"commit.file.many": "%d bestanden gewijzigd",39
"commit.added": "toegevoegd",40
"commit.deleted": "verwijderd",41
"commit.renamed": "hernoemd",42
"commit.binary": "Binair bestand",43
"commit.binaryHint": "De inhoud van dit binaire bestand wordt niet getoond.",44
"commit.show": "Toon diff",45
"commit.hide": "Verberg diff",46
"commit.inline": "Onder elkaar",47
"commit.side": "Naast elkaar",48
"commit.empty": "Deze commit wijzigt geen bestanden.",49
"commit.view": "Diffweergave",50
}51
52
var commitDE = map[string]string{53
"commit.authored": "Verfasst",54
"commit.sha": "Hash",55
"commit.parent": "Übergeordneter Commit",56
"commit.parents": "Übergeordnete Commits",57
"commit.changed": "Geänderte Dateien",58
"commit.file.one": "%d Datei geändert",59
"commit.file.many": "%d Dateien geändert",60
"commit.added": "hinzugefügt",61
"commit.deleted": "gelöscht",62
"commit.renamed": "umbenannt",63
"commit.binary": "Binärdatei",64
"commit.binaryHint": "Der Inhalt dieser Binärdatei wird nicht angezeigt.",65
"commit.show": "Diff anzeigen",66
"commit.hide": "Diff verbergen",67
"commit.inline": "Untereinander",68
"commit.side": "Nebeneinander",69
"commit.empty": "Dieser Commit ändert keine Dateien.",70
"commit.view": "Diff-Ansicht",71
}72
73
var commitFR = map[string]string{74
"commit.authored": "Rédigé",75
"commit.sha": "Empreinte",76
"commit.parent": "Parent",77
"commit.parents": "Parents",78
"commit.changed": "Fichiers modifiés",79
"commit.file.one": "%d fichier modifié",80
"commit.file.many": "%d fichiers modifiés",81
"commit.added": "ajouté",82
"commit.deleted": "supprimé",83
"commit.renamed": "renommé",84
"commit.binary": "Fichier binaire",85
"commit.binaryHint": "Le contenu de ce fichier binaire n'est pas affiché.",86
"commit.show": "Afficher le diff",87
"commit.hide": "Masquer le diff",88
"commit.inline": "En ligne",89
"commit.side": "Côte à côte",90
"commit.empty": "Ce commit ne modifie aucun fichier.",91
"commit.view": "Affichage du diff",92
}@@ -0,0 +1,467 @@
1
package i18n
2
3
// De infopagina staat apart, zodat de grote catalogi niet opnieuw uitgelijnd worden.
4
func init() {
5
addCatalog(en, infoEN)
6
addCatalog(nl, infoNL)
7
addCatalog(de, infoDE)
8
addCatalog(fr, infoFR)
9
}
10
11
func addCatalog(dst, src map[string]string) {
12
for k, v := range src {
13
dst[k] = v
14
}
15
}
16
17
var infoEN = map[string]string{
18
"nav.info": "Info",
19
"title.info": "CI/CD",
20
"info.lead": "Reference for blue-ci-cd.yml and the image presets Steve builds.",
21
22
"info.col.keyword": "Keyword",
23
"info.col.meaning": "Meaning",
24
"info.col.name": "Preset",
25
"info.col.base": "Image",
26
"info.col.tools": "Contents",
27
"info.col.where": "Available",
28
29
"info.sec.pipeline": "Pipeline",
30
"info.sec.job": "Jobs",
31
"info.sec.rules": "Rules",
32
"info.sec.variables": "Variables",
33
"info.sec.diff": "Differences with GitLab",
34
"info.sec.presets": "Image presets",
35
36
"info.where.both": "Rules and container",
37
"info.where.container": "Container only",
38
"info.where.mr": "Merge request",
39
40
"info.rules.intro": "The first matching rule wins. && binds more tightly than ||. Parentheses group an expression. An empty variable is null. == and != compare. =~ and !~ match a RE2 pattern. A slash in a pattern is escaped with a backslash. The flag i sits right after the closing slash. A pattern stored in a variable must be valid when the rule runs.",
41
"info.presets.intro": "A job picks a preset with its image keyword. Steve builds that Dockerfile on first use and reuses the result. Any other name, such as node:22, stays a normal Docker image.",
42
"info.presets.config": "Add or replace a preset under ci.presets in config.yml with image, dockerfile or from.",
43
"info.presets.mapped": "Uses this image as it is.",
44
45
"info.kw.stages": "Stage order. When omitted, stages follow the order in which jobs name them. A job without a stage uses test.",
46
"info.kw.variables": "A string, or a value field. A job overrides the same name. Available in rules and in the container.",
47
"info.kw.image": "Default image, as text or as a name field. default.image wins when that is set. A preset such as bluegit/base is allowed.",
48
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry and interruptible for jobs that do not set them.",
49
"info.kw.include": "Only a local path. A job with the same name is merged and the outer file wins each field.",
50
"info.kw.before_script": "Shell lines that run before script.",
51
"info.kw.after_script": "Shell lines that run after script, also when script fails.",
52
"info.kw.cache": "paths and a text key. Kept on this machine for one repository.",
53
"info.kw.workflow": "rules, like a job. No match, or when never, creates no pipeline.",
54
"info.kw.jobs": "Optional older map of jobs. Jobs may also sit at the top level, but not in both places.",
55
"info.kw.stage": "Stage name. Omitted means test.",
56
"info.kw.script": "Shell lines. The job fails when a line fails.",
57
"info.kw.needs": "Job names, or job and optional. An empty list starts at once. Omitted, the job waits for earlier stages. A need on a parallel job waits for every copy.",
58
"info.kw.rules": "The first match wins. Fields are if, changes, exists and when. Without rules, only and except decide.",
59
"info.kw.only": "A branch name, branches, tags, merge_requests, or a regex between slashes.",
60
"info.kw.except": "The opposite of only.",
61
"info.kw.when": "on_success is the default, also on_failure, always and manual. A rule may say never.",
62
"info.kw.allow_failure": "A failure does not stop the rest. The job itself becomes a warning.",
63
"info.kw.artifacts": "paths and expire_in. Units are seconds, minutes, hours, days, weeks, or never.",
64
"info.kw.resource_group": "Jobs that share this name in one repository do not run at the same time.",
65
"info.kw.timeout": "Replaces the server timeout for this job. The runner stops the container when the time is up.",
66
"info.kw.retry": "A number, or max and when. max runs from 0 to 2 and a higher number is cut off. when names script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure or always.",
67
"info.kw.parallel": "A number up to 50, or a matrix. Numbered jobs are called name 1/N and receive CI_NODE_INDEX and CI_NODE_TOTAL. A matrix is the product of each list, then those products joined. Keys become variables.",
68
"info.kw.services": "Sidecar containers on one network with the job. Text, or name, alias, command, entrypoint and variables. Without an alias the name drops the registry and the tag. There is no health check beyond a started container.",
69
"info.kw.environment": "A name, or name and url. Sets the environment variables. There is no deployment and no stop job.",
70
"info.kw.interruptible": "Off by default. A newer pipeline on the same ref cancels older jobs that set this and are still queued or running.",
71
"info.kw.tags": "Stored on the job. Steve runs every job. Tags do not choose a runner.",
72
"info.kw.extends": "One name or a list. A job whose name starts with a dot is a template and does not run.",
73
"info.kw.if": "An expression. The first rule whose if, changes and exists all match is the winner.",
74
"info.kw.changes": "Paths in the push diff. When that diff cannot be known, the condition matches.",
75
"info.kw.exists": "Every listed path must be in the commit. When the tree is unknown, the condition matches.",
76
77
"info.var.CI": "Always true.",
78
"info.var.CI_CONFIG_PATH": "Path of the pipeline file.",
79
"info.var.CI_SERVER_NAME": "Always BlueGit.",
80
"info.var.CI_COMMIT_SHA": "Full commit id.",
81
"info.var.CI_COMMIT_SHORT_SHA": "First eight characters of the commit id.",
82
"info.var.CI_COMMIT_REF": "Full git ref.",
83
"info.var.CI_COMMIT_REF_NAME": "Branch or tag name.",
84
"info.var.CI_COMMIT_REF_SLUG": "Ref name made safe for a URL.",
85
"info.var.CI_COMMIT_TITLE": "Commit subject.",
86
"info.var.CI_COMMIT_BRANCH": "Branch name. Empty on a tag.",
87
"info.var.CI_COMMIT_TAG": "Tag name. Empty on a branch.",
88
"info.var.CI_DEFAULT_BRANCH": "Default branch of the repository.",
89
"info.var.CI_PIPELINE_ID": "Pipeline number. Zero while rules are evaluated.",
90
"info.var.CI_PIPELINE_SOURCE": "push, web, or merge_request_event.",
91
"info.var.CI_PIPELINE_URL": "Link to the pipeline.",
92
"info.var.CI_PROJECT_PATH": "Owner and repository.",
93
"info.var.CI_PROJECT_NAME": "Repository name.",
94
"info.var.CI_PROJECT_NAMESPACE": "Owner path.",
95
"info.var.CI_PROJECT_URL": "Link to the repository.",
96
"info.var.CI_API_URL": "Root of the API.",
97
"info.var.CI_JOB_ID": "Job number.",
98
"info.var.CI_JOB_NAME": "Job name.",
99
"info.var.CI_JOB_STAGE": "Stage name.",
100
"info.var.CI_JOB_URL": "Link to the job.",
101
"info.var.CI_JOB_TOKEN": "Token for this job. It is masked in the log.",
102
"info.var.CI_NODE_INDEX": "Index of this parallel or matrix job.",
103
"info.var.CI_NODE_TOTAL": "How many parallel or matrix jobs there are.",
104
"info.var.CI_ENVIRONMENT_NAME": "Environment name.",
105
"info.var.CI_ENVIRONMENT_URL": "Environment address.",
106
"info.var.CI_MERGE_REQUEST_ID": "Internal id of the merge request.",
107
"info.var.CI_MERGE_REQUEST_IID": "Number of the merge request in the project.",
108
"info.var.CI_MERGE_REQUEST_TITLE": "Title of the merge request.",
109
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Source branch.",
110
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit of the source branch.",
111
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Target branch.",
112
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Tip of the target branch.",
113
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Project path of the merge request.",
114
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Link to that project.",
115
116
"info.diff.file": "The file is blue-ci-cd.yml, not the GitLab filename.",
117
"info.diff.runner": "There is one runner. Its name is runner.name and the default is Steve. tags do not select another runner.",
118
"info.diff.include": "include only reads a local file. A project, remote or template include is ignored.",
119
"info.diff.unsupported": "pages, spec, trigger pipelines, child pipelines, coverage, id_tokens, inherit and hooks are ignored with a warning.",
120
"info.diff.services": "services at the top level is ignored. Job services share a network and have no health check beyond a started container.",
121
"info.diff.env": "environment only sets variables. There is no deployment and no stop job.",
122
"info.diff.retry": "retry max is capped at 2.",
123
"info.diff.parallel": "parallel is capped at 50.",
124
"info.diff.rules": "The pipeline number is zero while rules run. Job, node and environment variables exist only in the container.",
125
"info.diff.mr": "A merge request pipeline runs on the source commit, not a merged tree. It starts when the request opens, on every push to the source, and again when someone pushes the target.",
126
"info.diff.cache": "cache stays on this machine and is not shared.",
127
"info.diff.images": "An image name that matches a preset is built locally. Every other name is a normal Docker image.",
128
}
129
130
var infoNL = map[string]string{
131
"nav.info": "Info",
132
"title.info": "CI/CD",
133
"info.lead": "Naslag voor blue-ci-cd.yml en de image-presets die Steve bouwt.",
134
135
"info.col.keyword": "Sleutelwoord",
136
"info.col.meaning": "Betekenis",
137
"info.col.name": "Preset",
138
"info.col.base": "Image",
139
"info.col.tools": "Inhoud",
140
"info.col.where": "Beschikbaar",
141
142
"info.sec.pipeline": "Pipeline",
143
"info.sec.job": "Jobs",
144
"info.sec.rules": "Rules",
145
"info.sec.variables": "Variabelen",
146
"info.sec.diff": "Verschillen met GitLab",
147
"info.sec.presets": "Image-presets",
148
149
"info.where.both": "Rules en container",
150
"info.where.container": "Alleen in de container",
151
"info.where.mr": "Merge request",
152
153
"info.rules.intro": "De eerste rule die klopt wint. && bindt sterker dan ||. Haakjes groeperen. Een lege variabele is null. == en != vergelijken. =~ en !~ passen op een RE2-patroon. Een slash in een patroon schrijf je met een backslash. De vlag i staat direct achter de sluithaak. Een patroon in een variabele moet geldig zijn op het moment dat de rule draait.",
154
"info.presets.intro": "Een job kiest een preset met het sleutelwoord image. Steve bouwt die Dockerfile bij het eerste gebruik en hergebruikt het resultaat. Elke andere naam, zoals node:22, blijft een gewoon Docker-image.",
155
"info.presets.config": "Een preset toevoegen of vervangen doe je onder ci.presets in config.yml, met image, dockerfile of from.",
156
"info.presets.mapped": "Gebruikt dit image zoals het is.",
157
158
"info.kw.stages": "Volgorde van de stages. Weggelaten volgen de stages de volgorde waarin jobs ze noemen. Een job zonder stage gebruikt test.",
159
"info.kw.variables": "Een tekst, of een veld value. Een job overschrijft dezelfde naam. Beschikbaar in rules en in de container.",
160
"info.kw.image": "Standaardimage, als tekst of als veld name. default.image wint als dat gezet is. Een preset zoals bluegit/base mag.",
161
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry en interruptible voor jobs die ze zelf niet zetten.",
162
"info.kw.include": "Alleen een lokaal pad. Een job met dezelfde naam wordt samengevoegd en het buitenste bestand wint per veld.",
163
"info.kw.before_script": "Shellregels die voor script draaien.",
164
"info.kw.after_script": "Shellregels die na script draaien, ook als script mislukt.",
165
"info.kw.cache": "paths en een tekstuele key. Blijft op deze machine voor één repository.",
166
"info.kw.workflow": "rules, zoals bij een job. Geen treffer, of when never, maakt geen pipeline.",
167
"info.kw.jobs": "Optionele oudere map van jobs. Jobs mogen ook op het hoogste niveau staan, maar niet op beide plekken.",
168
"info.kw.stage": "Naam van de stage. Weggelaten betekent test.",
169
"info.kw.script": "Shellregels. De job faalt als een regel faalt.",
170
"info.kw.needs": "Jobnamen, of job en optional. Een lege lijst start meteen. Weggelaten wacht de job op eerdere stages. Een need op een parallel-job wacht op elk exemplaar.",
171
"info.kw.rules": "De eerste treffer wint. Velden zijn if, changes, exists en when. Zonder rules beslissen only en except.",
172
"info.kw.only": "Een taknaam, branches, tags, merge_requests, of een regex tussen slashes.",
173
"info.kw.except": "Het omgekeerde van only.",
174
"info.kw.when": "on_success is de standaard, verder on_failure, always en manual. Een rule mag never zeggen.",
175
"info.kw.allow_failure": "Een mislukking stopt de rest niet. De job zelf wordt een waarschuwing.",
176
"info.kw.artifacts": "paths en expire_in. Eenheden zijn seconden, minuten, uren, dagen, weken, of never.",
177
"info.kw.resource_group": "Jobs met deze naam in één repository draaien niet tegelijk.",
178
"info.kw.timeout": "Vervangt de servertime-out voor deze job. De runner stopt de container als de tijd om is.",
179
"info.kw.retry": "Een getal, of max en when. max loopt van 0 tot 2 en een hoger getal wordt afgekapt. when noemt script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure of always.",
180
"info.kw.parallel": "Een getal tot 50, of een matrix. Genummerde jobs heten naam 1/N en krijgen CI_NODE_INDEX en CI_NODE_TOTAL. Een matrix is het product van elke lijst, en die producten achter elkaar. Sleutels worden variabelen.",
181
"info.kw.services": "Sidecar-containers op één netwerk met de job. Tekst, of name, alias, command, entrypoint en variables. Zonder alias vervalt de registry en de tag. Er is geen healthcheck verder dan een gestarte container.",
182
"info.kw.environment": "Een naam, of name en url. Zet de omgevingsvariabelen. Er is geen deployment en geen stop-job.",
183
"info.kw.interruptible": "Standaard uit. Een nieuwere pipeline op dezelfde ref annuleert oudere jobs die dit aan hebben en nog in de wachtrij staan of lopen.",
184
"info.kw.tags": "Bewaard bij de job. Steve draait elke job. Tags kiezen geen runner.",
185
"info.kw.extends": "Eén naam of een lijst. Een job waarvan de naam met een punt begint is een sjabloon en draait niet.",
186
"info.kw.if": "Een expressie. De eerste rule waarvan if, changes en exists allemaal kloppen wint.",
187
"info.kw.changes": "Paden in de diff van de push. Is die diff niet te bepalen, dan klopt de voorwaarde.",
188
"info.kw.exists": "Elk genoemd pad moet in de commit staan. Is de boom onbekend, dan klopt de voorwaarde.",
189
190
"info.var.CI": "Altijd waar.",
191
"info.var.CI_CONFIG_PATH": "Pad van het pipelinebestand.",
192
"info.var.CI_SERVER_NAME": "Altijd BlueGit.",
193
"info.var.CI_COMMIT_SHA": "Volledige commit-id.",
194
"info.var.CI_COMMIT_SHORT_SHA": "Eerste acht tekens van de commit-id.",
195
"info.var.CI_COMMIT_REF": "Volledige git-ref.",
196
"info.var.CI_COMMIT_REF_NAME": "Naam van de tak of de tag.",
197
"info.var.CI_COMMIT_REF_SLUG": "Ref-naam die veilig is in een URL.",
198
"info.var.CI_COMMIT_TITLE": "Onderwerp van de commit.",
199
"info.var.CI_COMMIT_BRANCH": "Taknaam. Leeg op een tag.",
200
"info.var.CI_COMMIT_TAG": "Tagnaam. Leeg op een tak.",
201
"info.var.CI_DEFAULT_BRANCH": "Standaardtak van de repository.",
202
"info.var.CI_PIPELINE_ID": "Pipelinenummer. Nul zolang rules worden beoordeeld.",
203
"info.var.CI_PIPELINE_SOURCE": "push, web, of merge_request_event.",
204
"info.var.CI_PIPELINE_URL": "Link naar de pipeline.",
205
"info.var.CI_PROJECT_PATH": "Eigenaar en repository.",
206
"info.var.CI_PROJECT_NAME": "Naam van de repository.",
207
"info.var.CI_PROJECT_NAMESPACE": "Pad van de eigenaar.",
208
"info.var.CI_PROJECT_URL": "Link naar de repository.",
209
"info.var.CI_API_URL": "Wortel van de API.",
210
"info.var.CI_JOB_ID": "Jobnummer.",
211
"info.var.CI_JOB_NAME": "Naam van de job.",
212
"info.var.CI_JOB_STAGE": "Naam van de stage.",
213
"info.var.CI_JOB_URL": "Link naar de job.",
214
"info.var.CI_JOB_TOKEN": "Token van deze job. In het log staat een masker.",
215
"info.var.CI_NODE_INDEX": "Index van deze parallel- of matrixjob.",
216
"info.var.CI_NODE_TOTAL": "Aantal parallel- of matrixjobs.",
217
"info.var.CI_ENVIRONMENT_NAME": "Naam van de omgeving.",
218
"info.var.CI_ENVIRONMENT_URL": "Adres van de omgeving.",
219
"info.var.CI_MERGE_REQUEST_ID": "Interne id van de merge request.",
220
"info.var.CI_MERGE_REQUEST_IID": "Nummer van de merge request in het project.",
221
"info.var.CI_MERGE_REQUEST_TITLE": "Titel van de merge request.",
222
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Brontak.",
223
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit van de brontak.",
224
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Doeltak.",
225
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Punt van de doeltak.",
226
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Projectpad van de merge request.",
227
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Link naar dat project.",
228
229
"info.diff.file": "Het bestand heet blue-ci-cd.yml, niet de GitLab-bestandsnaam.",
230
"info.diff.runner": "Er is één runner. De naam staat in runner.name en is standaard Steve. tags kiezen geen andere runner.",
231
"info.diff.include": "include leest alleen een lokaal bestand. Een include van een project, een URL of een template wordt genegeerd.",
232
"info.diff.unsupported": "pages, spec, trigger-pipelines, child-pipelines, coverage, id_tokens, inherit en hooks worden genegeerd met een waarschuwing.",
233
"info.diff.services": "services op het hoogste niveau wordt genegeerd. Job-services delen een netwerk en hebben geen healthcheck verder dan een gestarte container.",
234
"info.diff.env": "environment zet alleen variabelen. Er is geen deployment en geen stop-job.",
235
"info.diff.retry": "retry max is hoogstens 2.",
236
"info.diff.parallel": "parallel is hoogstens 50.",
237
"info.diff.rules": "Het pipelinenummer is nul zolang rules draaien. Job-, node- en omgevingsvariabelen bestaan alleen in de container.",
238
"info.diff.mr": "Een merge-request-pipeline draait op de commit van de bron, niet op een samengevoegde boom. Hij start bij het openen, bij elke push naar de bron, en opnieuw als iemand naar de doeltak pusht.",
239
"info.diff.cache": "cache blijft op deze machine en wordt niet gedeeld.",
240
"info.diff.images": "Een imagenaam die een preset is wordt lokaal gebouwd. Elke andere naam is een gewoon Docker-image.",
241
}
242
243
var infoDE = map[string]string{
244
"nav.info": "Info",
245
"title.info": "CI/CD",
246
"info.lead": "Nachschlagewerk für blue-ci-cd.yml und die Image-Presets, die Steve baut.",
247
248
"info.col.keyword": "Schlüsselwort",
249
"info.col.meaning": "Bedeutung",
250
"info.col.name": "Preset",
251
"info.col.base": "Image",
252
"info.col.tools": "Inhalt",
253
"info.col.where": "Verfügbar",
254
255
"info.sec.pipeline": "Pipeline",
256
"info.sec.job": "Jobs",
257
"info.sec.rules": "Regeln",
258
"info.sec.variables": "Variablen",
259
"info.sec.diff": "Unterschiede zu GitLab",
260
"info.sec.presets": "Image-Presets",
261
262
"info.where.both": "Regeln und Container",
263
"info.where.container": "Nur im Container",
264
"info.where.mr": "Merge Request",
265
266
"info.rules.intro": "Die erste passende Regel gewinnt. && bindet stärker als ||. Klammern gruppieren. Eine leere Variable ist null. == und != vergleichen. =~ und !~ prüfen ein RE2-Muster. Ein Schrägstrich im Muster wird mit einem Backslash geschrieben. Die Flagge i steht direkt hinter der schließenden Klammer. Ein Muster in einer Variable muss gültig sein, wenn die Regel läuft.",
267
"info.presets.intro": "Ein Job wählt ein Preset mit dem Schlüsselwort image. Steve baut das Dockerfile beim ersten Gebrauch und verwendet das Ergebnis wieder. Jeder andere Name, etwa node:22, bleibt ein normales Docker-Image.",
268
"info.presets.config": "Ein Preset ergänzt oder ersetzt man unter ci.presets in config.yml, mit image, dockerfile oder from.",
269
"info.presets.mapped": "Verwendet dieses Image unverändert.",
270
271
"info.kw.stages": "Reihenfolge der Stages. Fehlt sie, folgen die Stages der Reihenfolge, in der Jobs sie nennen. Ein Job ohne Stage nutzt test.",
272
"info.kw.variables": "Ein Text oder ein Feld value. Ein Job überschreibt denselben Namen. Verfügbar in Regeln und im Container.",
273
"info.kw.image": "Standardimage, als Text oder als Feld name. default.image gewinnt, wenn es gesetzt ist. Ein Preset wie bluegit/base ist erlaubt.",
274
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry und interruptible für Jobs, die sie nicht selbst setzen.",
275
"info.kw.include": "Nur ein lokaler Pfad. Ein Job mit demselben Namen wird zusammengeführt und die äußere Datei gewinnt je Feld.",
276
"info.kw.before_script": "Shell-Zeilen, die vor script laufen.",
277
"info.kw.after_script": "Shell-Zeilen, die nach script laufen, auch wenn script scheitert.",
278
"info.kw.cache": "paths und ein Textschlüssel. Bleibt auf diesem Rechner für ein Repository.",
279
"info.kw.workflow": "rules wie bei einem Job. Kein Treffer oder when never erzeugt keine Pipeline.",
280
"info.kw.jobs": "Optionale ältere Map von Jobs. Jobs dürfen auch auf der obersten Ebene stehen, aber nicht an beiden Stellen.",
281
"info.kw.stage": "Name der Stage. Weggelassen bedeutet test.",
282
"info.kw.script": "Shell-Zeilen. Der Job scheitert, wenn eine Zeile scheitert.",
283
"info.kw.needs": "Jobnamen oder job und optional. Eine leere Liste startet sofort. Weggelassen wartet der Job auf frühere Stages. Ein need auf einen Parallel-Job wartet auf jede Kopie.",
284
"info.kw.rules": "Der erste Treffer gewinnt. Felder sind if, changes, exists und when. Ohne rules entscheiden only und except.",
285
"info.kw.only": "Ein Branchname, branches, tags, merge_requests oder ein Regex zwischen Schrägstrichen.",
286
"info.kw.except": "Das Gegenteil von only.",
287
"info.kw.when": "on_success ist der Standard, außerdem on_failure, always und manual. Eine Regel darf never sagen.",
288
"info.kw.allow_failure": "Ein Fehler stoppt den Rest nicht. Der Job selbst wird eine Warnung.",
289
"info.kw.artifacts": "paths und expire_in. Einheiten sind Sekunden, Minuten, Stunden, Tage, Wochen oder never.",
290
"info.kw.resource_group": "Jobs mit diesem Namen in einem Repository laufen nicht gleichzeitig.",
291
"info.kw.timeout": "Ersetzt das Server-Timeout für diesen Job. Der Runner stoppt den Container, wenn die Zeit um ist.",
292
"info.kw.retry": "Eine Zahl oder max und when. max liegt zwischen 0 und 2, eine höhere Zahl wird gekappt. when nennt script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure oder always.",
293
"info.kw.parallel": "Eine Zahl bis 50 oder eine Matrix. Nummerierte Jobs heißen Name 1/N und erhalten CI_NODE_INDEX und CI_NODE_TOTAL. Eine Matrix ist das Produkt jeder Liste, danach aneinandergereiht. Schlüssel werden Variablen.",
294
"info.kw.services": "Sidecar-Container im selben Netz wie der Job. Text oder name, alias, command, entrypoint und variables. Ohne Alias entfallen Registry und Tag. Es gibt keine Health-Prüfung außer einem gestarteten Container.",
295
"info.kw.environment": "Ein Name oder name und url. Setzt die Umgebungsvariablen. Es gibt kein Deployment und keinen Stop-Job.",
296
"info.kw.interruptible": "Standardmäßig aus. Eine neuere Pipeline auf derselben Ref bricht ältere Jobs ab, die dies gesetzt haben und noch warten oder laufen.",
297
"info.kw.tags": "Am Job gespeichert. Steve führt jeden Job aus. Tags wählen keinen Runner.",
298
"info.kw.extends": "Ein Name oder eine Liste. Ein Job, dessen Name mit einem Punkt beginnt, ist eine Vorlage und läuft nicht.",
299
"info.kw.if": "Ein Ausdruck. Die erste Regel, deren if, changes und exists alle passen, gewinnt.",
300
"info.kw.changes": "Pfade im Diff des Push. Ist der Diff nicht bestimmbar, trifft die Bedingung zu.",
301
"info.kw.exists": "Jeder genannte Pfad muss im Commit stehen. Ist der Baum unbekannt, trifft die Bedingung zu.",
302
303
"info.var.CI": "Immer wahr.",
304
"info.var.CI_CONFIG_PATH": "Pfad der Pipeline-Datei.",
305
"info.var.CI_SERVER_NAME": "Immer BlueGit.",
306
"info.var.CI_COMMIT_SHA": "Volle Commit-Id.",
307
"info.var.CI_COMMIT_SHORT_SHA": "Die ersten acht Zeichen der Commit-Id.",
308
"info.var.CI_COMMIT_REF": "Volle Git-Ref.",
309
"info.var.CI_COMMIT_REF_NAME": "Name des Branches oder des Tags.",
310
"info.var.CI_COMMIT_REF_SLUG": "Ref-Name, der in einer URL sicher ist.",
311
"info.var.CI_COMMIT_TITLE": "Betreff des Commits.",
312
"info.var.CI_COMMIT_BRANCH": "Branchname. Leer bei einem Tag.",
313
"info.var.CI_COMMIT_TAG": "Tagname. Leer bei einem Branch.",
314
"info.var.CI_DEFAULT_BRANCH": "Standardbranch des Repositorys.",
315
"info.var.CI_PIPELINE_ID": "Pipelinenummer. Null, solange Regeln geprüft werden.",
316
"info.var.CI_PIPELINE_SOURCE": "push, web oder merge_request_event.",
317
"info.var.CI_PIPELINE_URL": "Link zur Pipeline.",
318
"info.var.CI_PROJECT_PATH": "Besitzer und Repository.",
319
"info.var.CI_PROJECT_NAME": "Name des Repositorys.",
320
"info.var.CI_PROJECT_NAMESPACE": "Pfad des Besitzers.",
321
"info.var.CI_PROJECT_URL": "Link zum Repository.",
322
"info.var.CI_API_URL": "Wurzel der API.",
323
"info.var.CI_JOB_ID": "Jobnummer.",
324
"info.var.CI_JOB_NAME": "Name des Jobs.",
325
"info.var.CI_JOB_STAGE": "Name der Stage.",
326
"info.var.CI_JOB_URL": "Link zum Job.",
327
"info.var.CI_JOB_TOKEN": "Token dieses Jobs. Im Log steht eine Maske.",
328
"info.var.CI_NODE_INDEX": "Index dieses Parallel- oder Matrix-Jobs.",
329
"info.var.CI_NODE_TOTAL": "Anzahl der Parallel- oder Matrix-Jobs.",
330
"info.var.CI_ENVIRONMENT_NAME": "Name der Umgebung.",
331
"info.var.CI_ENVIRONMENT_URL": "Adresse der Umgebung.",
332
"info.var.CI_MERGE_REQUEST_ID": "Interne Id des Merge Requests.",
333
"info.var.CI_MERGE_REQUEST_IID": "Nummer des Merge Requests im Projekt.",
334
"info.var.CI_MERGE_REQUEST_TITLE": "Titel des Merge Requests.",
335
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Quellbranch.",
336
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit des Quellbranches.",
337
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Zielbranch.",
338
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Spitze des Zielbranches.",
339
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Projektpfad des Merge Requests.",
340
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Link zu diesem Projekt.",
341
342
"info.diff.file": "Die Datei heißt blue-ci-cd.yml, nicht der GitLab-Dateiname.",
343
"info.diff.runner": "Es gibt einen Runner. Der Name steht in runner.name und ist standardmäßig Steve. tags wählen keinen anderen Runner.",
344
"info.diff.include": "include liest nur eine lokale Datei. Ein Include aus einem Projekt, einer URL oder einer Vorlage wird ignoriert.",
345
"info.diff.unsupported": "pages, spec, Trigger-Pipelines, Child-Pipelines, coverage, id_tokens, inherit und hooks werden mit einer Warnung ignoriert.",
346
"info.diff.services": "services auf der obersten Ebene wird ignoriert. Job-Services teilen ein Netz und haben keine Health-Prüfung außer einem gestarteten Container.",
347
"info.diff.env": "environment setzt nur Variablen. Es gibt kein Deployment und keinen Stop-Job.",
348
"info.diff.retry": "retry max ist höchstens 2.",
349
"info.diff.parallel": "parallel ist höchstens 50.",
350
"info.diff.rules": "Die Pipelinenummer ist null, solange Regeln laufen. Job-, Node- und Umgebungsvariablen gibt es nur im Container.",
351
"info.diff.mr": "Eine Merge-Request-Pipeline läuft auf dem Quell-Commit, nicht auf einem zusammengeführten Baum. Sie startet beim Öffnen, bei jedem Push zur Quelle und erneut, wenn jemand den Zielbranch pusht.",
352
"info.diff.cache": "cache bleibt auf diesem Rechner und wird nicht geteilt.",
353
"info.diff.images": "Ein Imagename, der ein Preset ist, wird lokal gebaut. Jeder andere Name ist ein normales Docker-Image.",
354
}
355
356
var infoFR = map[string]string{
357
"nav.info": "Info",
358
"title.info": "CI/CD",
359
"info.lead": "Référence de blue-ci-cd.yml et des presets d'image que Steve construit.",
360
361
"info.col.keyword": "Mot-clé",
362
"info.col.meaning": "Signification",
363
"info.col.name": "Preset",
364
"info.col.base": "Image",
365
"info.col.tools": "Contenu",
366
"info.col.where": "Disponible",
367
368
"info.sec.pipeline": "Pipeline",
369
"info.sec.job": "Jobs",
370
"info.sec.rules": "Règles",
371
"info.sec.variables": "Variables",
372
"info.sec.diff": "Différences avec GitLab",
373
"info.sec.presets": "Presets d'image",
374
375
"info.where.both": "Règles et conteneur",
376
"info.where.container": "Conteneur seulement",
377
"info.where.mr": "Merge request",
378
379
"info.rules.intro": "La première règle qui correspond gagne. && lie plus fort que ||. Les parenthèses groupent. Une variable vide vaut null. == et != comparent. =~ et !~ testent un motif RE2. Un slash dans un motif s'écrit avec un backslash. Le drapeau i suit juste la parenthèse fermante. Un motif dans une variable doit être valide au moment où la règle tourne.",
380
"info.presets.intro": "Un job choisit un preset avec le mot-clé image. Steve construit ce Dockerfile au premier usage et réutilise le résultat. Tout autre nom, comme node:22, reste une image Docker ordinaire.",
381
"info.presets.config": "On ajoute ou remplace un preset sous ci.presets dans config.yml, avec image, dockerfile ou from.",
382
"info.presets.mapped": "Utilise cette image telle quelle.",
383
384
"info.kw.stages": "Ordre des stages. S'il manque, les stages suivent l'ordre dans lequel les jobs les nomment. Un job sans stage utilise test.",
385
"info.kw.variables": "Un texte, ou un champ value. Un job remplace le même nom. Disponible dans les règles et dans le conteneur.",
386
"info.kw.image": "Image par défaut, en texte ou en champ name. default.image gagne s'il est posé. Un preset comme bluegit/base est permis.",
387
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry et interruptible pour les jobs qui ne les posent pas.",
388
"info.kw.include": "Seulement un chemin local. Un job du même nom est fusionné et le fichier extérieur gagne chaque champ.",
389
"info.kw.before_script": "Lignes de shell qui tournent avant script.",
390
"info.kw.after_script": "Lignes de shell qui tournent après script, même si script échoue.",
391
"info.kw.cache": "paths et une clé texte. Reste sur cette machine pour un dépôt.",
392
"info.kw.workflow": "rules, comme pour un job. Aucune correspondance, ou when never, ne crée pas de pipeline.",
393
"info.kw.jobs": "Ancienne map optionnelle de jobs. Les jobs peuvent aussi être au premier niveau, mais pas aux deux endroits.",
394
"info.kw.stage": "Nom du stage. Absent signifie test.",
395
"info.kw.script": "Lignes de shell. Le job échoue si une ligne échoue.",
396
"info.kw.needs": "Noms de jobs, ou job et optional. Une liste vide démarre tout de suite. Absente, le job attend les stages précédents. Un need sur un job parallèle attend chaque copie.",
397
"info.kw.rules": "La première correspondance gagne. Les champs sont if, changes, exists et when. Sans rules, only et except décident.",
398
"info.kw.only": "Un nom de branche, branches, tags, merge_requests, ou une regex entre des slashes.",
399
"info.kw.except": "Le contraire de only.",
400
"info.kw.when": "on_success est le défaut, aussi on_failure, always et manual. Une règle peut dire never.",
401
"info.kw.allow_failure": "Un échec n'arrête pas le reste. Le job lui-même devient un avertissement.",
402
"info.kw.artifacts": "paths et expire_in. Les unités sont secondes, minutes, heures, jours, semaines, ou never.",
403
"info.kw.resource_group": "Les jobs qui partagent ce nom dans un dépôt ne tournent pas en même temps.",
404
"info.kw.timeout": "Remplace le délai du serveur pour ce job. Le runner arrête le conteneur quand le temps est fini.",
405
"info.kw.retry": "Un nombre, ou max et when. max va de 0 à 2 et un nombre plus haut est coupé. when nomme script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure ou always.",
406
"info.kw.parallel": "Un nombre jusqu'à 50, ou une matrice. Les jobs numérotés s'appellent nom 1/N et reçoivent CI_NODE_INDEX et CI_NODE_TOTAL. Une matrice est le produit de chaque liste, puis ces produits à la suite. Les clés deviennent des variables.",
407
"info.kw.services": "Conteneurs sidecar sur un réseau avec le job. Texte, ou name, alias, command, entrypoint et variables. Sans alias, le registre et le tag tombent. Il n'y a pas de contrôle de santé au-delà d'un conteneur démarré.",
408
"info.kw.environment": "Un nom, ou name et url. Pose les variables d'environnement. Il n'y a pas de déploiement et pas de job d'arrêt.",
409
"info.kw.interruptible": "Éteint par défaut. Une pipeline plus récente sur la même ref annule les jobs plus anciens qui ont ceci et qui attendent encore ou tournent.",
410
"info.kw.tags": "Conservé sur le job. Steve exécute chaque job. Les tags ne choisissent pas un runner.",
411
"info.kw.extends": "Un nom ou une liste. Un job dont le nom commence par un point est un modèle et ne tourne pas.",
412
"info.kw.if": "Une expression. La première règle dont if, changes et exists correspondent tous gagne.",
413
"info.kw.changes": "Chemins dans le diff du push. Si ce diff est inconnu, la condition correspond.",
414
"info.kw.exists": "Chaque chemin cité doit être dans le commit. Si l'arbre est inconnu, la condition correspond.",
415
416
"info.var.CI": "Toujours vrai.",
417
"info.var.CI_CONFIG_PATH": "Chemin du fichier de pipeline.",
418
"info.var.CI_SERVER_NAME": "Toujours BlueGit.",
419
"info.var.CI_COMMIT_SHA": "Identifiant complet du commit.",
420
"info.var.CI_COMMIT_SHORT_SHA": "Huit premiers caractères de l'identifiant du commit.",
421
"info.var.CI_COMMIT_REF": "Réf git complète.",
422
"info.var.CI_COMMIT_REF_NAME": "Nom de la branche ou du tag.",
423
"info.var.CI_COMMIT_REF_SLUG": "Nom de réf sûr dans une URL.",
424
"info.var.CI_COMMIT_TITLE": "Sujet du commit.",
425
"info.var.CI_COMMIT_BRANCH": "Nom de branche. Vide sur un tag.",
426
"info.var.CI_COMMIT_TAG": "Nom du tag. Vide sur une branche.",
427
"info.var.CI_DEFAULT_BRANCH": "Branche par défaut du dépôt.",
428
"info.var.CI_PIPELINE_ID": "Numéro de pipeline. Zéro pendant l'évaluation des règles.",
429
"info.var.CI_PIPELINE_SOURCE": "push, web, ou merge_request_event.",
430
"info.var.CI_PIPELINE_URL": "Lien vers la pipeline.",
431
"info.var.CI_PROJECT_PATH": "Propriétaire et dépôt.",
432
"info.var.CI_PROJECT_NAME": "Nom du dépôt.",
433
"info.var.CI_PROJECT_NAMESPACE": "Chemin du propriétaire.",
434
"info.var.CI_PROJECT_URL": "Lien vers le dépôt.",
435
"info.var.CI_API_URL": "Racine de l'API.",
436
"info.var.CI_JOB_ID": "Numéro du job.",
437
"info.var.CI_JOB_NAME": "Nom du job.",
438
"info.var.CI_JOB_STAGE": "Nom du stage.",
439
"info.var.CI_JOB_URL": "Lien vers le job.",
440
"info.var.CI_JOB_TOKEN": "Jeton de ce job. Le journal le masque.",
441
"info.var.CI_NODE_INDEX": "Index de ce job parallèle ou de matrice.",
442
"info.var.CI_NODE_TOTAL": "Nombre de jobs parallèles ou de matrice.",
443
"info.var.CI_ENVIRONMENT_NAME": "Nom de l'environnement.",
444
"info.var.CI_ENVIRONMENT_URL": "Adresse de l'environnement.",
445
"info.var.CI_MERGE_REQUEST_ID": "Identifiant interne de la merge request.",
446
"info.var.CI_MERGE_REQUEST_IID": "Numéro de la merge request dans le projet.",
447
"info.var.CI_MERGE_REQUEST_TITLE": "Titre de la merge request.",
448
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Branche source.",
449
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit de la branche source.",
450
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Branche cible.",
451
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Pointe de la branche cible.",
452
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Chemin du projet de la merge request.",
453
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Lien vers ce projet.",
454
455
"info.diff.file": "Le fichier s'appelle blue-ci-cd.yml, pas le nom de fichier GitLab.",
456
"info.diff.runner": "Il y a un seul runner. Son nom est runner.name et vaut Steve par défaut. Les tags ne choisissent pas un autre runner.",
457
"info.diff.include": "include ne lit qu'un fichier local. Un include de projet, d'URL ou de modèle est ignoré.",
458
"info.diff.unsupported": "pages, spec, les pipelines déclenchées, les pipelines enfants, coverage, id_tokens, inherit et hooks sont ignorés avec un avertissement.",
459
"info.diff.services": "services au premier niveau est ignoré. Les services d'un job partagent un réseau et n'ont pas de contrôle de santé au-delà d'un conteneur démarré.",
460
"info.diff.env": "environment ne fait que poser des variables. Il n'y a pas de déploiement et pas de job d'arrêt.",
461
"info.diff.retry": "retry max est plafonné à 2.",
462
"info.diff.parallel": "parallel est plafonné à 50.",
463
"info.diff.rules": "Le numéro de pipeline est zéro pendant les règles. Les variables de job, de nœud et d'environnement n'existent que dans le conteneur.",
464
"info.diff.mr": "Une pipeline de merge request tourne sur le commit source, pas sur un arbre fusionné. Elle démarre à l'ouverture, à chaque push vers la source, et encore quand quelqu'un pousse la cible.",
465
"info.diff.cache": "cache reste sur cette machine et n'est pas partagé.",
466
"info.diff.images": "Un nom d'image qui est un preset est construit localement. Tout autre nom est une image Docker ordinaire.",
467
}
@@ -0,0 +1,467 @@1
package i18n2
3
// De infopagina staat apart, zodat de grote catalogi niet opnieuw uitgelijnd worden.4
func init() {5
addCatalog(en, infoEN)6
addCatalog(nl, infoNL)7
addCatalog(de, infoDE)8
addCatalog(fr, infoFR)9
}10
11
func addCatalog(dst, src map[string]string) {12
for k, v := range src {13
dst[k] = v14
}15
}16
17
var infoEN = map[string]string{18
"nav.info": "Info",19
"title.info": "CI/CD",20
"info.lead": "Reference for blue-ci-cd.yml and the image presets Steve builds.",21
22
"info.col.keyword": "Keyword",23
"info.col.meaning": "Meaning",24
"info.col.name": "Preset",25
"info.col.base": "Image",26
"info.col.tools": "Contents",27
"info.col.where": "Available",28
29
"info.sec.pipeline": "Pipeline",30
"info.sec.job": "Jobs",31
"info.sec.rules": "Rules",32
"info.sec.variables": "Variables",33
"info.sec.diff": "Differences with GitLab",34
"info.sec.presets": "Image presets",35
36
"info.where.both": "Rules and container",37
"info.where.container": "Container only",38
"info.where.mr": "Merge request",39
40
"info.rules.intro": "The first matching rule wins. && binds more tightly than ||. Parentheses group an expression. An empty variable is null. == and != compare. =~ and !~ match a RE2 pattern. A slash in a pattern is escaped with a backslash. The flag i sits right after the closing slash. A pattern stored in a variable must be valid when the rule runs.",41
"info.presets.intro": "A job picks a preset with its image keyword. Steve builds that Dockerfile on first use and reuses the result. Any other name, such as node:22, stays a normal Docker image.",42
"info.presets.config": "Add or replace a preset under ci.presets in config.yml with image, dockerfile or from.",43
"info.presets.mapped": "Uses this image as it is.",44
45
"info.kw.stages": "Stage order. When omitted, stages follow the order in which jobs name them. A job without a stage uses test.",46
"info.kw.variables": "A string, or a value field. A job overrides the same name. Available in rules and in the container.",47
"info.kw.image": "Default image, as text or as a name field. default.image wins when that is set. A preset such as bluegit/base is allowed.",48
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry and interruptible for jobs that do not set them.",49
"info.kw.include": "Only a local path. A job with the same name is merged and the outer file wins each field.",50
"info.kw.before_script": "Shell lines that run before script.",51
"info.kw.after_script": "Shell lines that run after script, also when script fails.",52
"info.kw.cache": "paths and a text key. Kept on this machine for one repository.",53
"info.kw.workflow": "rules, like a job. No match, or when never, creates no pipeline.",54
"info.kw.jobs": "Optional older map of jobs. Jobs may also sit at the top level, but not in both places.",55
"info.kw.stage": "Stage name. Omitted means test.",56
"info.kw.script": "Shell lines. The job fails when a line fails.",57
"info.kw.needs": "Job names, or job and optional. An empty list starts at once. Omitted, the job waits for earlier stages. A need on a parallel job waits for every copy.",58
"info.kw.rules": "The first match wins. Fields are if, changes, exists and when. Without rules, only and except decide.",59
"info.kw.only": "A branch name, branches, tags, merge_requests, or a regex between slashes.",60
"info.kw.except": "The opposite of only.",61
"info.kw.when": "on_success is the default, also on_failure, always and manual. A rule may say never.",62
"info.kw.allow_failure": "A failure does not stop the rest. The job itself becomes a warning.",63
"info.kw.artifacts": "paths and expire_in. Units are seconds, minutes, hours, days, weeks, or never.",64
"info.kw.resource_group": "Jobs that share this name in one repository do not run at the same time.",65
"info.kw.timeout": "Replaces the server timeout for this job. The runner stops the container when the time is up.",66
"info.kw.retry": "A number, or max and when. max runs from 0 to 2 and a higher number is cut off. when names script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure or always.",67
"info.kw.parallel": "A number up to 50, or a matrix. Numbered jobs are called name 1/N and receive CI_NODE_INDEX and CI_NODE_TOTAL. A matrix is the product of each list, then those products joined. Keys become variables.",68
"info.kw.services": "Sidecar containers on one network with the job. Text, or name, alias, command, entrypoint and variables. Without an alias the name drops the registry and the tag. There is no health check beyond a started container.",69
"info.kw.environment": "A name, or name and url. Sets the environment variables. There is no deployment and no stop job.",70
"info.kw.interruptible": "Off by default. A newer pipeline on the same ref cancels older jobs that set this and are still queued or running.",71
"info.kw.tags": "Stored on the job. Steve runs every job. Tags do not choose a runner.",72
"info.kw.extends": "One name or a list. A job whose name starts with a dot is a template and does not run.",73
"info.kw.if": "An expression. The first rule whose if, changes and exists all match is the winner.",74
"info.kw.changes": "Paths in the push diff. When that diff cannot be known, the condition matches.",75
"info.kw.exists": "Every listed path must be in the commit. When the tree is unknown, the condition matches.",76
77
"info.var.CI": "Always true.",78
"info.var.CI_CONFIG_PATH": "Path of the pipeline file.",79
"info.var.CI_SERVER_NAME": "Always BlueGit.",80
"info.var.CI_COMMIT_SHA": "Full commit id.",81
"info.var.CI_COMMIT_SHORT_SHA": "First eight characters of the commit id.",82
"info.var.CI_COMMIT_REF": "Full git ref.",83
"info.var.CI_COMMIT_REF_NAME": "Branch or tag name.",84
"info.var.CI_COMMIT_REF_SLUG": "Ref name made safe for a URL.",85
"info.var.CI_COMMIT_TITLE": "Commit subject.",86
"info.var.CI_COMMIT_BRANCH": "Branch name. Empty on a tag.",87
"info.var.CI_COMMIT_TAG": "Tag name. Empty on a branch.",88
"info.var.CI_DEFAULT_BRANCH": "Default branch of the repository.",89
"info.var.CI_PIPELINE_ID": "Pipeline number. Zero while rules are evaluated.",90
"info.var.CI_PIPELINE_SOURCE": "push, web, or merge_request_event.",91
"info.var.CI_PIPELINE_URL": "Link to the pipeline.",92
"info.var.CI_PROJECT_PATH": "Owner and repository.",93
"info.var.CI_PROJECT_NAME": "Repository name.",94
"info.var.CI_PROJECT_NAMESPACE": "Owner path.",95
"info.var.CI_PROJECT_URL": "Link to the repository.",96
"info.var.CI_API_URL": "Root of the API.",97
"info.var.CI_JOB_ID": "Job number.",98
"info.var.CI_JOB_NAME": "Job name.",99
"info.var.CI_JOB_STAGE": "Stage name.",100
"info.var.CI_JOB_URL": "Link to the job.",101
"info.var.CI_JOB_TOKEN": "Token for this job. It is masked in the log.",102
"info.var.CI_NODE_INDEX": "Index of this parallel or matrix job.",103
"info.var.CI_NODE_TOTAL": "How many parallel or matrix jobs there are.",104
"info.var.CI_ENVIRONMENT_NAME": "Environment name.",105
"info.var.CI_ENVIRONMENT_URL": "Environment address.",106
"info.var.CI_MERGE_REQUEST_ID": "Internal id of the merge request.",107
"info.var.CI_MERGE_REQUEST_IID": "Number of the merge request in the project.",108
"info.var.CI_MERGE_REQUEST_TITLE": "Title of the merge request.",109
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Source branch.",110
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit of the source branch.",111
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Target branch.",112
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Tip of the target branch.",113
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Project path of the merge request.",114
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Link to that project.",115
116
"info.diff.file": "The file is blue-ci-cd.yml, not the GitLab filename.",117
"info.diff.runner": "There is one runner. Its name is runner.name and the default is Steve. tags do not select another runner.",118
"info.diff.include": "include only reads a local file. A project, remote or template include is ignored.",119
"info.diff.unsupported": "pages, spec, trigger pipelines, child pipelines, coverage, id_tokens, inherit and hooks are ignored with a warning.",120
"info.diff.services": "services at the top level is ignored. Job services share a network and have no health check beyond a started container.",121
"info.diff.env": "environment only sets variables. There is no deployment and no stop job.",122
"info.diff.retry": "retry max is capped at 2.",123
"info.diff.parallel": "parallel is capped at 50.",124
"info.diff.rules": "The pipeline number is zero while rules run. Job, node and environment variables exist only in the container.",125
"info.diff.mr": "A merge request pipeline runs on the source commit, not a merged tree. It starts when the request opens, on every push to the source, and again when someone pushes the target.",126
"info.diff.cache": "cache stays on this machine and is not shared.",127
"info.diff.images": "An image name that matches a preset is built locally. Every other name is a normal Docker image.",128
}129
130
var infoNL = map[string]string{131
"nav.info": "Info",132
"title.info": "CI/CD",133
"info.lead": "Naslag voor blue-ci-cd.yml en de image-presets die Steve bouwt.",134
135
"info.col.keyword": "Sleutelwoord",136
"info.col.meaning": "Betekenis",137
"info.col.name": "Preset",138
"info.col.base": "Image",139
"info.col.tools": "Inhoud",140
"info.col.where": "Beschikbaar",141
142
"info.sec.pipeline": "Pipeline",143
"info.sec.job": "Jobs",144
"info.sec.rules": "Rules",145
"info.sec.variables": "Variabelen",146
"info.sec.diff": "Verschillen met GitLab",147
"info.sec.presets": "Image-presets",148
149
"info.where.both": "Rules en container",150
"info.where.container": "Alleen in de container",151
"info.where.mr": "Merge request",152
153
"info.rules.intro": "De eerste rule die klopt wint. && bindt sterker dan ||. Haakjes groeperen. Een lege variabele is null. == en != vergelijken. =~ en !~ passen op een RE2-patroon. Een slash in een patroon schrijf je met een backslash. De vlag i staat direct achter de sluithaak. Een patroon in een variabele moet geldig zijn op het moment dat de rule draait.",154
"info.presets.intro": "Een job kiest een preset met het sleutelwoord image. Steve bouwt die Dockerfile bij het eerste gebruik en hergebruikt het resultaat. Elke andere naam, zoals node:22, blijft een gewoon Docker-image.",155
"info.presets.config": "Een preset toevoegen of vervangen doe je onder ci.presets in config.yml, met image, dockerfile of from.",156
"info.presets.mapped": "Gebruikt dit image zoals het is.",157
158
"info.kw.stages": "Volgorde van de stages. Weggelaten volgen de stages de volgorde waarin jobs ze noemen. Een job zonder stage gebruikt test.",159
"info.kw.variables": "Een tekst, of een veld value. Een job overschrijft dezelfde naam. Beschikbaar in rules en in de container.",160
"info.kw.image": "Standaardimage, als tekst of als veld name. default.image wint als dat gezet is. Een preset zoals bluegit/base mag.",161
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry en interruptible voor jobs die ze zelf niet zetten.",162
"info.kw.include": "Alleen een lokaal pad. Een job met dezelfde naam wordt samengevoegd en het buitenste bestand wint per veld.",163
"info.kw.before_script": "Shellregels die voor script draaien.",164
"info.kw.after_script": "Shellregels die na script draaien, ook als script mislukt.",165
"info.kw.cache": "paths en een tekstuele key. Blijft op deze machine voor één repository.",166
"info.kw.workflow": "rules, zoals bij een job. Geen treffer, of when never, maakt geen pipeline.",167
"info.kw.jobs": "Optionele oudere map van jobs. Jobs mogen ook op het hoogste niveau staan, maar niet op beide plekken.",168
"info.kw.stage": "Naam van de stage. Weggelaten betekent test.",169
"info.kw.script": "Shellregels. De job faalt als een regel faalt.",170
"info.kw.needs": "Jobnamen, of job en optional. Een lege lijst start meteen. Weggelaten wacht de job op eerdere stages. Een need op een parallel-job wacht op elk exemplaar.",171
"info.kw.rules": "De eerste treffer wint. Velden zijn if, changes, exists en when. Zonder rules beslissen only en except.",172
"info.kw.only": "Een taknaam, branches, tags, merge_requests, of een regex tussen slashes.",173
"info.kw.except": "Het omgekeerde van only.",174
"info.kw.when": "on_success is de standaard, verder on_failure, always en manual. Een rule mag never zeggen.",175
"info.kw.allow_failure": "Een mislukking stopt de rest niet. De job zelf wordt een waarschuwing.",176
"info.kw.artifacts": "paths en expire_in. Eenheden zijn seconden, minuten, uren, dagen, weken, of never.",177
"info.kw.resource_group": "Jobs met deze naam in één repository draaien niet tegelijk.",178
"info.kw.timeout": "Vervangt de servertime-out voor deze job. De runner stopt de container als de tijd om is.",179
"info.kw.retry": "Een getal, of max en when. max loopt van 0 tot 2 en een hoger getal wordt afgekapt. when noemt script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure of always.",180
"info.kw.parallel": "Een getal tot 50, of een matrix. Genummerde jobs heten naam 1/N en krijgen CI_NODE_INDEX en CI_NODE_TOTAL. Een matrix is het product van elke lijst, en die producten achter elkaar. Sleutels worden variabelen.",181
"info.kw.services": "Sidecar-containers op één netwerk met de job. Tekst, of name, alias, command, entrypoint en variables. Zonder alias vervalt de registry en de tag. Er is geen healthcheck verder dan een gestarte container.",182
"info.kw.environment": "Een naam, of name en url. Zet de omgevingsvariabelen. Er is geen deployment en geen stop-job.",183
"info.kw.interruptible": "Standaard uit. Een nieuwere pipeline op dezelfde ref annuleert oudere jobs die dit aan hebben en nog in de wachtrij staan of lopen.",184
"info.kw.tags": "Bewaard bij de job. Steve draait elke job. Tags kiezen geen runner.",185
"info.kw.extends": "Eén naam of een lijst. Een job waarvan de naam met een punt begint is een sjabloon en draait niet.",186
"info.kw.if": "Een expressie. De eerste rule waarvan if, changes en exists allemaal kloppen wint.",187
"info.kw.changes": "Paden in de diff van de push. Is die diff niet te bepalen, dan klopt de voorwaarde.",188
"info.kw.exists": "Elk genoemd pad moet in de commit staan. Is de boom onbekend, dan klopt de voorwaarde.",189
190
"info.var.CI": "Altijd waar.",191
"info.var.CI_CONFIG_PATH": "Pad van het pipelinebestand.",192
"info.var.CI_SERVER_NAME": "Altijd BlueGit.",193
"info.var.CI_COMMIT_SHA": "Volledige commit-id.",194
"info.var.CI_COMMIT_SHORT_SHA": "Eerste acht tekens van de commit-id.",195
"info.var.CI_COMMIT_REF": "Volledige git-ref.",196
"info.var.CI_COMMIT_REF_NAME": "Naam van de tak of de tag.",197
"info.var.CI_COMMIT_REF_SLUG": "Ref-naam die veilig is in een URL.",198
"info.var.CI_COMMIT_TITLE": "Onderwerp van de commit.",199
"info.var.CI_COMMIT_BRANCH": "Taknaam. Leeg op een tag.",200
"info.var.CI_COMMIT_TAG": "Tagnaam. Leeg op een tak.",201
"info.var.CI_DEFAULT_BRANCH": "Standaardtak van de repository.",202
"info.var.CI_PIPELINE_ID": "Pipelinenummer. Nul zolang rules worden beoordeeld.",203
"info.var.CI_PIPELINE_SOURCE": "push, web, of merge_request_event.",204
"info.var.CI_PIPELINE_URL": "Link naar de pipeline.",205
"info.var.CI_PROJECT_PATH": "Eigenaar en repository.",206
"info.var.CI_PROJECT_NAME": "Naam van de repository.",207
"info.var.CI_PROJECT_NAMESPACE": "Pad van de eigenaar.",208
"info.var.CI_PROJECT_URL": "Link naar de repository.",209
"info.var.CI_API_URL": "Wortel van de API.",210
"info.var.CI_JOB_ID": "Jobnummer.",211
"info.var.CI_JOB_NAME": "Naam van de job.",212
"info.var.CI_JOB_STAGE": "Naam van de stage.",213
"info.var.CI_JOB_URL": "Link naar de job.",214
"info.var.CI_JOB_TOKEN": "Token van deze job. In het log staat een masker.",215
"info.var.CI_NODE_INDEX": "Index van deze parallel- of matrixjob.",216
"info.var.CI_NODE_TOTAL": "Aantal parallel- of matrixjobs.",217
"info.var.CI_ENVIRONMENT_NAME": "Naam van de omgeving.",218
"info.var.CI_ENVIRONMENT_URL": "Adres van de omgeving.",219
"info.var.CI_MERGE_REQUEST_ID": "Interne id van de merge request.",220
"info.var.CI_MERGE_REQUEST_IID": "Nummer van de merge request in het project.",221
"info.var.CI_MERGE_REQUEST_TITLE": "Titel van de merge request.",222
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Brontak.",223
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit van de brontak.",224
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Doeltak.",225
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Punt van de doeltak.",226
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Projectpad van de merge request.",227
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Link naar dat project.",228
229
"info.diff.file": "Het bestand heet blue-ci-cd.yml, niet de GitLab-bestandsnaam.",230
"info.diff.runner": "Er is één runner. De naam staat in runner.name en is standaard Steve. tags kiezen geen andere runner.",231
"info.diff.include": "include leest alleen een lokaal bestand. Een include van een project, een URL of een template wordt genegeerd.",232
"info.diff.unsupported": "pages, spec, trigger-pipelines, child-pipelines, coverage, id_tokens, inherit en hooks worden genegeerd met een waarschuwing.",233
"info.diff.services": "services op het hoogste niveau wordt genegeerd. Job-services delen een netwerk en hebben geen healthcheck verder dan een gestarte container.",234
"info.diff.env": "environment zet alleen variabelen. Er is geen deployment en geen stop-job.",235
"info.diff.retry": "retry max is hoogstens 2.",236
"info.diff.parallel": "parallel is hoogstens 50.",237
"info.diff.rules": "Het pipelinenummer is nul zolang rules draaien. Job-, node- en omgevingsvariabelen bestaan alleen in de container.",238
"info.diff.mr": "Een merge-request-pipeline draait op de commit van de bron, niet op een samengevoegde boom. Hij start bij het openen, bij elke push naar de bron, en opnieuw als iemand naar de doeltak pusht.",239
"info.diff.cache": "cache blijft op deze machine en wordt niet gedeeld.",240
"info.diff.images": "Een imagenaam die een preset is wordt lokaal gebouwd. Elke andere naam is een gewoon Docker-image.",241
}242
243
var infoDE = map[string]string{244
"nav.info": "Info",245
"title.info": "CI/CD",246
"info.lead": "Nachschlagewerk für blue-ci-cd.yml und die Image-Presets, die Steve baut.",247
248
"info.col.keyword": "Schlüsselwort",249
"info.col.meaning": "Bedeutung",250
"info.col.name": "Preset",251
"info.col.base": "Image",252
"info.col.tools": "Inhalt",253
"info.col.where": "Verfügbar",254
255
"info.sec.pipeline": "Pipeline",256
"info.sec.job": "Jobs",257
"info.sec.rules": "Regeln",258
"info.sec.variables": "Variablen",259
"info.sec.diff": "Unterschiede zu GitLab",260
"info.sec.presets": "Image-Presets",261
262
"info.where.both": "Regeln und Container",263
"info.where.container": "Nur im Container",264
"info.where.mr": "Merge Request",265
266
"info.rules.intro": "Die erste passende Regel gewinnt. && bindet stärker als ||. Klammern gruppieren. Eine leere Variable ist null. == und != vergleichen. =~ und !~ prüfen ein RE2-Muster. Ein Schrägstrich im Muster wird mit einem Backslash geschrieben. Die Flagge i steht direkt hinter der schließenden Klammer. Ein Muster in einer Variable muss gültig sein, wenn die Regel läuft.",267
"info.presets.intro": "Ein Job wählt ein Preset mit dem Schlüsselwort image. Steve baut das Dockerfile beim ersten Gebrauch und verwendet das Ergebnis wieder. Jeder andere Name, etwa node:22, bleibt ein normales Docker-Image.",268
"info.presets.config": "Ein Preset ergänzt oder ersetzt man unter ci.presets in config.yml, mit image, dockerfile oder from.",269
"info.presets.mapped": "Verwendet dieses Image unverändert.",270
271
"info.kw.stages": "Reihenfolge der Stages. Fehlt sie, folgen die Stages der Reihenfolge, in der Jobs sie nennen. Ein Job ohne Stage nutzt test.",272
"info.kw.variables": "Ein Text oder ein Feld value. Ein Job überschreibt denselben Namen. Verfügbar in Regeln und im Container.",273
"info.kw.image": "Standardimage, als Text oder als Feld name. default.image gewinnt, wenn es gesetzt ist. Ein Preset wie bluegit/base ist erlaubt.",274
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry und interruptible für Jobs, die sie nicht selbst setzen.",275
"info.kw.include": "Nur ein lokaler Pfad. Ein Job mit demselben Namen wird zusammengeführt und die äußere Datei gewinnt je Feld.",276
"info.kw.before_script": "Shell-Zeilen, die vor script laufen.",277
"info.kw.after_script": "Shell-Zeilen, die nach script laufen, auch wenn script scheitert.",278
"info.kw.cache": "paths und ein Textschlüssel. Bleibt auf diesem Rechner für ein Repository.",279
"info.kw.workflow": "rules wie bei einem Job. Kein Treffer oder when never erzeugt keine Pipeline.",280
"info.kw.jobs": "Optionale ältere Map von Jobs. Jobs dürfen auch auf der obersten Ebene stehen, aber nicht an beiden Stellen.",281
"info.kw.stage": "Name der Stage. Weggelassen bedeutet test.",282
"info.kw.script": "Shell-Zeilen. Der Job scheitert, wenn eine Zeile scheitert.",283
"info.kw.needs": "Jobnamen oder job und optional. Eine leere Liste startet sofort. Weggelassen wartet der Job auf frühere Stages. Ein need auf einen Parallel-Job wartet auf jede Kopie.",284
"info.kw.rules": "Der erste Treffer gewinnt. Felder sind if, changes, exists und when. Ohne rules entscheiden only und except.",285
"info.kw.only": "Ein Branchname, branches, tags, merge_requests oder ein Regex zwischen Schrägstrichen.",286
"info.kw.except": "Das Gegenteil von only.",287
"info.kw.when": "on_success ist der Standard, außerdem on_failure, always und manual. Eine Regel darf never sagen.",288
"info.kw.allow_failure": "Ein Fehler stoppt den Rest nicht. Der Job selbst wird eine Warnung.",289
"info.kw.artifacts": "paths und expire_in. Einheiten sind Sekunden, Minuten, Stunden, Tage, Wochen oder never.",290
"info.kw.resource_group": "Jobs mit diesem Namen in einem Repository laufen nicht gleichzeitig.",291
"info.kw.timeout": "Ersetzt das Server-Timeout für diesen Job. Der Runner stoppt den Container, wenn die Zeit um ist.",292
"info.kw.retry": "Eine Zahl oder max und when. max liegt zwischen 0 und 2, eine höhere Zahl wird gekappt. when nennt script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure oder always.",293
"info.kw.parallel": "Eine Zahl bis 50 oder eine Matrix. Nummerierte Jobs heißen Name 1/N und erhalten CI_NODE_INDEX und CI_NODE_TOTAL. Eine Matrix ist das Produkt jeder Liste, danach aneinandergereiht. Schlüssel werden Variablen.",294
"info.kw.services": "Sidecar-Container im selben Netz wie der Job. Text oder name, alias, command, entrypoint und variables. Ohne Alias entfallen Registry und Tag. Es gibt keine Health-Prüfung außer einem gestarteten Container.",295
"info.kw.environment": "Ein Name oder name und url. Setzt die Umgebungsvariablen. Es gibt kein Deployment und keinen Stop-Job.",296
"info.kw.interruptible": "Standardmäßig aus. Eine neuere Pipeline auf derselben Ref bricht ältere Jobs ab, die dies gesetzt haben und noch warten oder laufen.",297
"info.kw.tags": "Am Job gespeichert. Steve führt jeden Job aus. Tags wählen keinen Runner.",298
"info.kw.extends": "Ein Name oder eine Liste. Ein Job, dessen Name mit einem Punkt beginnt, ist eine Vorlage und läuft nicht.",299
"info.kw.if": "Ein Ausdruck. Die erste Regel, deren if, changes und exists alle passen, gewinnt.",300
"info.kw.changes": "Pfade im Diff des Push. Ist der Diff nicht bestimmbar, trifft die Bedingung zu.",301
"info.kw.exists": "Jeder genannte Pfad muss im Commit stehen. Ist der Baum unbekannt, trifft die Bedingung zu.",302
303
"info.var.CI": "Immer wahr.",304
"info.var.CI_CONFIG_PATH": "Pfad der Pipeline-Datei.",305
"info.var.CI_SERVER_NAME": "Immer BlueGit.",306
"info.var.CI_COMMIT_SHA": "Volle Commit-Id.",307
"info.var.CI_COMMIT_SHORT_SHA": "Die ersten acht Zeichen der Commit-Id.",308
"info.var.CI_COMMIT_REF": "Volle Git-Ref.",309
"info.var.CI_COMMIT_REF_NAME": "Name des Branches oder des Tags.",310
"info.var.CI_COMMIT_REF_SLUG": "Ref-Name, der in einer URL sicher ist.",311
"info.var.CI_COMMIT_TITLE": "Betreff des Commits.",312
"info.var.CI_COMMIT_BRANCH": "Branchname. Leer bei einem Tag.",313
"info.var.CI_COMMIT_TAG": "Tagname. Leer bei einem Branch.",314
"info.var.CI_DEFAULT_BRANCH": "Standardbranch des Repositorys.",315
"info.var.CI_PIPELINE_ID": "Pipelinenummer. Null, solange Regeln geprüft werden.",316
"info.var.CI_PIPELINE_SOURCE": "push, web oder merge_request_event.",317
"info.var.CI_PIPELINE_URL": "Link zur Pipeline.",318
"info.var.CI_PROJECT_PATH": "Besitzer und Repository.",319
"info.var.CI_PROJECT_NAME": "Name des Repositorys.",320
"info.var.CI_PROJECT_NAMESPACE": "Pfad des Besitzers.",321
"info.var.CI_PROJECT_URL": "Link zum Repository.",322
"info.var.CI_API_URL": "Wurzel der API.",323
"info.var.CI_JOB_ID": "Jobnummer.",324
"info.var.CI_JOB_NAME": "Name des Jobs.",325
"info.var.CI_JOB_STAGE": "Name der Stage.",326
"info.var.CI_JOB_URL": "Link zum Job.",327
"info.var.CI_JOB_TOKEN": "Token dieses Jobs. Im Log steht eine Maske.",328
"info.var.CI_NODE_INDEX": "Index dieses Parallel- oder Matrix-Jobs.",329
"info.var.CI_NODE_TOTAL": "Anzahl der Parallel- oder Matrix-Jobs.",330
"info.var.CI_ENVIRONMENT_NAME": "Name der Umgebung.",331
"info.var.CI_ENVIRONMENT_URL": "Adresse der Umgebung.",332
"info.var.CI_MERGE_REQUEST_ID": "Interne Id des Merge Requests.",333
"info.var.CI_MERGE_REQUEST_IID": "Nummer des Merge Requests im Projekt.",334
"info.var.CI_MERGE_REQUEST_TITLE": "Titel des Merge Requests.",335
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Quellbranch.",336
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit des Quellbranches.",337
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Zielbranch.",338
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Spitze des Zielbranches.",339
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Projektpfad des Merge Requests.",340
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Link zu diesem Projekt.",341
342
"info.diff.file": "Die Datei heißt blue-ci-cd.yml, nicht der GitLab-Dateiname.",343
"info.diff.runner": "Es gibt einen Runner. Der Name steht in runner.name und ist standardmäßig Steve. tags wählen keinen anderen Runner.",344
"info.diff.include": "include liest nur eine lokale Datei. Ein Include aus einem Projekt, einer URL oder einer Vorlage wird ignoriert.",345
"info.diff.unsupported": "pages, spec, Trigger-Pipelines, Child-Pipelines, coverage, id_tokens, inherit und hooks werden mit einer Warnung ignoriert.",346
"info.diff.services": "services auf der obersten Ebene wird ignoriert. Job-Services teilen ein Netz und haben keine Health-Prüfung außer einem gestarteten Container.",347
"info.diff.env": "environment setzt nur Variablen. Es gibt kein Deployment und keinen Stop-Job.",348
"info.diff.retry": "retry max ist höchstens 2.",349
"info.diff.parallel": "parallel ist höchstens 50.",350
"info.diff.rules": "Die Pipelinenummer ist null, solange Regeln laufen. Job-, Node- und Umgebungsvariablen gibt es nur im Container.",351
"info.diff.mr": "Eine Merge-Request-Pipeline läuft auf dem Quell-Commit, nicht auf einem zusammengeführten Baum. Sie startet beim Öffnen, bei jedem Push zur Quelle und erneut, wenn jemand den Zielbranch pusht.",352
"info.diff.cache": "cache bleibt auf diesem Rechner und wird nicht geteilt.",353
"info.diff.images": "Ein Imagename, der ein Preset ist, wird lokal gebaut. Jeder andere Name ist ein normales Docker-Image.",354
}355
356
var infoFR = map[string]string{357
"nav.info": "Info",358
"title.info": "CI/CD",359
"info.lead": "Référence de blue-ci-cd.yml et des presets d'image que Steve construit.",360
361
"info.col.keyword": "Mot-clé",362
"info.col.meaning": "Signification",363
"info.col.name": "Preset",364
"info.col.base": "Image",365
"info.col.tools": "Contenu",366
"info.col.where": "Disponible",367
368
"info.sec.pipeline": "Pipeline",369
"info.sec.job": "Jobs",370
"info.sec.rules": "Règles",371
"info.sec.variables": "Variables",372
"info.sec.diff": "Différences avec GitLab",373
"info.sec.presets": "Presets d'image",374
375
"info.where.both": "Règles et conteneur",376
"info.where.container": "Conteneur seulement",377
"info.where.mr": "Merge request",378
379
"info.rules.intro": "La première règle qui correspond gagne. && lie plus fort que ||. Les parenthèses groupent. Une variable vide vaut null. == et != comparent. =~ et !~ testent un motif RE2. Un slash dans un motif s'écrit avec un backslash. Le drapeau i suit juste la parenthèse fermante. Un motif dans une variable doit être valide au moment où la règle tourne.",380
"info.presets.intro": "Un job choisit un preset avec le mot-clé image. Steve construit ce Dockerfile au premier usage et réutilise le résultat. Tout autre nom, comme node:22, reste une image Docker ordinaire.",381
"info.presets.config": "On ajoute ou remplace un preset sous ci.presets dans config.yml, avec image, dockerfile ou from.",382
"info.presets.mapped": "Utilise cette image telle quelle.",383
384
"info.kw.stages": "Ordre des stages. S'il manque, les stages suivent l'ordre dans lequel les jobs les nomment. Un job sans stage utilise test.",385
"info.kw.variables": "Un texte, ou un champ value. Un job remplace le même nom. Disponible dans les règles et dans le conteneur.",386
"info.kw.image": "Image par défaut, en texte ou en champ name. default.image gagne s'il est posé. Un preset comme bluegit/base est permis.",387
"info.kw.default": "image, before_script, after_script, tags, timeout, cache, retry et interruptible pour les jobs qui ne les posent pas.",388
"info.kw.include": "Seulement un chemin local. Un job du même nom est fusionné et le fichier extérieur gagne chaque champ.",389
"info.kw.before_script": "Lignes de shell qui tournent avant script.",390
"info.kw.after_script": "Lignes de shell qui tournent après script, même si script échoue.",391
"info.kw.cache": "paths et une clé texte. Reste sur cette machine pour un dépôt.",392
"info.kw.workflow": "rules, comme pour un job. Aucune correspondance, ou when never, ne crée pas de pipeline.",393
"info.kw.jobs": "Ancienne map optionnelle de jobs. Les jobs peuvent aussi être au premier niveau, mais pas aux deux endroits.",394
"info.kw.stage": "Nom du stage. Absent signifie test.",395
"info.kw.script": "Lignes de shell. Le job échoue si une ligne échoue.",396
"info.kw.needs": "Noms de jobs, ou job et optional. Une liste vide démarre tout de suite. Absente, le job attend les stages précédents. Un need sur un job parallèle attend chaque copie.",397
"info.kw.rules": "La première correspondance gagne. Les champs sont if, changes, exists et when. Sans rules, only et except décident.",398
"info.kw.only": "Un nom de branche, branches, tags, merge_requests, ou une regex entre des slashes.",399
"info.kw.except": "Le contraire de only.",400
"info.kw.when": "on_success est le défaut, aussi on_failure, always et manual. Une règle peut dire never.",401
"info.kw.allow_failure": "Un échec n'arrête pas le reste. Le job lui-même devient un avertissement.",402
"info.kw.artifacts": "paths et expire_in. Les unités sont secondes, minutes, heures, jours, semaines, ou never.",403
"info.kw.resource_group": "Les jobs qui partagent ce nom dans un dépôt ne tournent pas en même temps.",404
"info.kw.timeout": "Remplace le délai du serveur pour ce job. Le runner arrête le conteneur quand le temps est fini.",405
"info.kw.retry": "Un nombre, ou max et when. max va de 0 à 2 et un nombre plus haut est coupé. when nomme script_failure, runner_system_failure, job_execution_timeout, stuck_or_timeout_failure ou always.",406
"info.kw.parallel": "Un nombre jusqu'à 50, ou une matrice. Les jobs numérotés s'appellent nom 1/N et reçoivent CI_NODE_INDEX et CI_NODE_TOTAL. Une matrice est le produit de chaque liste, puis ces produits à la suite. Les clés deviennent des variables.",407
"info.kw.services": "Conteneurs sidecar sur un réseau avec le job. Texte, ou name, alias, command, entrypoint et variables. Sans alias, le registre et le tag tombent. Il n'y a pas de contrôle de santé au-delà d'un conteneur démarré.",408
"info.kw.environment": "Un nom, ou name et url. Pose les variables d'environnement. Il n'y a pas de déploiement et pas de job d'arrêt.",409
"info.kw.interruptible": "Éteint par défaut. Une pipeline plus récente sur la même ref annule les jobs plus anciens qui ont ceci et qui attendent encore ou tournent.",410
"info.kw.tags": "Conservé sur le job. Steve exécute chaque job. Les tags ne choisissent pas un runner.",411
"info.kw.extends": "Un nom ou une liste. Un job dont le nom commence par un point est un modèle et ne tourne pas.",412
"info.kw.if": "Une expression. La première règle dont if, changes et exists correspondent tous gagne.",413
"info.kw.changes": "Chemins dans le diff du push. Si ce diff est inconnu, la condition correspond.",414
"info.kw.exists": "Chaque chemin cité doit être dans le commit. Si l'arbre est inconnu, la condition correspond.",415
416
"info.var.CI": "Toujours vrai.",417
"info.var.CI_CONFIG_PATH": "Chemin du fichier de pipeline.",418
"info.var.CI_SERVER_NAME": "Toujours BlueGit.",419
"info.var.CI_COMMIT_SHA": "Identifiant complet du commit.",420
"info.var.CI_COMMIT_SHORT_SHA": "Huit premiers caractères de l'identifiant du commit.",421
"info.var.CI_COMMIT_REF": "Réf git complète.",422
"info.var.CI_COMMIT_REF_NAME": "Nom de la branche ou du tag.",423
"info.var.CI_COMMIT_REF_SLUG": "Nom de réf sûr dans une URL.",424
"info.var.CI_COMMIT_TITLE": "Sujet du commit.",425
"info.var.CI_COMMIT_BRANCH": "Nom de branche. Vide sur un tag.",426
"info.var.CI_COMMIT_TAG": "Nom du tag. Vide sur une branche.",427
"info.var.CI_DEFAULT_BRANCH": "Branche par défaut du dépôt.",428
"info.var.CI_PIPELINE_ID": "Numéro de pipeline. Zéro pendant l'évaluation des règles.",429
"info.var.CI_PIPELINE_SOURCE": "push, web, ou merge_request_event.",430
"info.var.CI_PIPELINE_URL": "Lien vers la pipeline.",431
"info.var.CI_PROJECT_PATH": "Propriétaire et dépôt.",432
"info.var.CI_PROJECT_NAME": "Nom du dépôt.",433
"info.var.CI_PROJECT_NAMESPACE": "Chemin du propriétaire.",434
"info.var.CI_PROJECT_URL": "Lien vers le dépôt.",435
"info.var.CI_API_URL": "Racine de l'API.",436
"info.var.CI_JOB_ID": "Numéro du job.",437
"info.var.CI_JOB_NAME": "Nom du job.",438
"info.var.CI_JOB_STAGE": "Nom du stage.",439
"info.var.CI_JOB_URL": "Lien vers le job.",440
"info.var.CI_JOB_TOKEN": "Jeton de ce job. Le journal le masque.",441
"info.var.CI_NODE_INDEX": "Index de ce job parallèle ou de matrice.",442
"info.var.CI_NODE_TOTAL": "Nombre de jobs parallèles ou de matrice.",443
"info.var.CI_ENVIRONMENT_NAME": "Nom de l'environnement.",444
"info.var.CI_ENVIRONMENT_URL": "Adresse de l'environnement.",445
"info.var.CI_MERGE_REQUEST_ID": "Identifiant interne de la merge request.",446
"info.var.CI_MERGE_REQUEST_IID": "Numéro de la merge request dans le projet.",447
"info.var.CI_MERGE_REQUEST_TITLE": "Titre de la merge request.",448
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME": "Branche source.",449
"info.var.CI_MERGE_REQUEST_SOURCE_BRANCH_SHA": "Commit de la branche source.",450
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_NAME": "Branche cible.",451
"info.var.CI_MERGE_REQUEST_TARGET_BRANCH_SHA": "Pointe de la branche cible.",452
"info.var.CI_MERGE_REQUEST_PROJECT_PATH": "Chemin du projet de la merge request.",453
"info.var.CI_MERGE_REQUEST_PROJECT_URL": "Lien vers ce projet.",454
455
"info.diff.file": "Le fichier s'appelle blue-ci-cd.yml, pas le nom de fichier GitLab.",456
"info.diff.runner": "Il y a un seul runner. Son nom est runner.name et vaut Steve par défaut. Les tags ne choisissent pas un autre runner.",457
"info.diff.include": "include ne lit qu'un fichier local. Un include de projet, d'URL ou de modèle est ignoré.",458
"info.diff.unsupported": "pages, spec, les pipelines déclenchées, les pipelines enfants, coverage, id_tokens, inherit et hooks sont ignorés avec un avertissement.",459
"info.diff.services": "services au premier niveau est ignoré. Les services d'un job partagent un réseau et n'ont pas de contrôle de santé au-delà d'un conteneur démarré.",460
"info.diff.env": "environment ne fait que poser des variables. Il n'y a pas de déploiement et pas de job d'arrêt.",461
"info.diff.retry": "retry max est plafonné à 2.",462
"info.diff.parallel": "parallel est plafonné à 50.",463
"info.diff.rules": "Le numéro de pipeline est zéro pendant les règles. Les variables de job, de nœud et d'environnement n'existent que dans le conteneur.",464
"info.diff.mr": "Une pipeline de merge request tourne sur le commit source, pas sur un arbre fusionné. Elle démarre à l'ouverture, à chaque push vers la source, et encore quand quelqu'un pousse la cible.",465
"info.diff.cache": "cache reste sur cette machine et n'est pas partagé.",466
"info.diff.images": "Un nom d'image qui est un preset est construit localement. Tout autre nom est une image Docker ordinaire.",467
}@@ -236,6 +236,7 @@ var nl = map[string]string{
236
236
"pipe.duration": "Duur",
237
237
"pipe.finished": "Klaar",
238
238
"pipe.queued": "Wachtrij",
239
"pipe.queuePos": "In wachtrij (#%d)",
239
240
"pipe.timeout": "Timeout",
240
241
"pipe.environment": "Omgeving",
241
242
"pipe.runner": "Runner",
@@ -846,6 +847,7 @@ var de = map[string]string{
846
847
"pipe.duration": "Dauer",
847
848
"pipe.finished": "Beendet",
848
849
"pipe.queued": "Warteschlange",
850
"pipe.queuePos": "In der Warteschlange (#%d)",
849
851
"pipe.timeout": "Timeout",
850
852
"pipe.environment": "Umgebung",
851
853
"pipe.runner": "Runner",
@@ -1456,6 +1458,7 @@ var fr = map[string]string{
1456
1458
"pipe.duration": "Durée",
1457
1459
"pipe.finished": "Terminé",
1458
1460
"pipe.queued": "File",
1461
"pipe.queuePos": "Dans la file (#%d)",
1459
1462
"pipe.timeout": "Délai",
1460
1463
"pipe.environment": "Environnement",
1461
1464
"pipe.runner": "Runner",
@@ -236,6 +236,7 @@ var nl = map[string]string{236
"pipe.duration": "Duur",236
"pipe.duration": "Duur",237
"pipe.finished": "Klaar",237
"pipe.finished": "Klaar",238
"pipe.queued": "Wachtrij",238
"pipe.queued": "Wachtrij",239
"pipe.queuePos": "In wachtrij (#%d)",239
"pipe.timeout": "Timeout",240
"pipe.timeout": "Timeout",240
"pipe.environment": "Omgeving",241
"pipe.environment": "Omgeving",241
"pipe.runner": "Runner",242
"pipe.runner": "Runner",@@ -846,6 +847,7 @@ var de = map[string]string{846
"pipe.duration": "Dauer",847
"pipe.duration": "Dauer",847
"pipe.finished": "Beendet",848
"pipe.finished": "Beendet",848
"pipe.queued": "Warteschlange",849
"pipe.queued": "Warteschlange",850
"pipe.queuePos": "In der Warteschlange (#%d)",849
"pipe.timeout": "Timeout",851
"pipe.timeout": "Timeout",850
"pipe.environment": "Umgebung",852
"pipe.environment": "Umgebung",851
"pipe.runner": "Runner",853
"pipe.runner": "Runner",@@ -1456,6 +1458,7 @@ var fr = map[string]string{1456
"pipe.duration": "Durée",1458
"pipe.duration": "Durée",1457
"pipe.finished": "Terminé",1459
"pipe.finished": "Terminé",1458
"pipe.queued": "File",1460
"pipe.queued": "File",1461
"pipe.queuePos": "Dans la file (#%d)",1459
"pipe.timeout": "Délai",1462
"pipe.timeout": "Délai",1460
"pipe.environment": "Environnement",1463
"pipe.environment": "Environnement",1461
"pipe.runner": "Runner",1464
"pipe.runner": "Runner",@@ -0,0 +1,3 @@
1
# runtime: Alpine 3.20
2
FROM alpine:3.20
3
RUN apk add --no-cache bash ca-certificates curl git
@@ -0,0 +1,3 @@1
# runtime: Alpine 3.202
FROM alpine:3.203
RUN apk add --no-cache bash ca-certificates curl git@@ -0,0 +1,3 @@
1
# runtime: .NET SDK 8
2
FROM mcr.microsoft.com/dotnet/sdk:8.0
3
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates curl git && rm -rf /var/lib/apt/lists/*
@@ -0,0 +1,3 @@1
# runtime: .NET SDK 82
FROM mcr.microsoft.com/dotnet/sdk:8.03
RUN apt-get update && apt-get install -y --no-install-recommends bash ca-certificates curl git && rm -rf /var/lib/apt/lists/*@@ -0,0 +1,3 @@
1
# runtime: Go 1.22
2
FROM golang:1.22-alpine
3
RUN apk add --no-cache bash ca-certificates curl git
@@ -0,0 +1,3 @@1
# runtime: Go 1.222
FROM golang:1.22-alpine3
RUN apk add --no-cache bash ca-certificates curl git@@ -0,0 +1,3 @@
1
# runtime: Java 21
2
FROM eclipse-temurin:21-jdk-alpine
3
RUN apk add --no-cache bash ca-certificates curl git
@@ -0,0 +1,3 @@1
# runtime: Java 212
FROM eclipse-temurin:21-jdk-alpine3
RUN apk add --no-cache bash ca-certificates curl git@@ -0,0 +1,3 @@
1
# runtime: Node.js 22
2
FROM node:22-alpine
3
RUN apk add --no-cache bash ca-certificates curl git
@@ -0,0 +1,3 @@1
# runtime: Node.js 222
FROM node:22-alpine3
RUN apk add --no-cache bash ca-certificates curl git@@ -0,0 +1,3 @@
1
# runtime: Python 3.12
2
FROM python:3.12-alpine
3
RUN apk add --no-cache bash ca-certificates curl git
@@ -0,0 +1,3 @@1
# runtime: Python 3.122
FROM python:3.12-alpine3
RUN apk add --no-cache bash ca-certificates curl git@@ -0,0 +1,3 @@
1
# runtime: Rust 1.81
2
FROM rust:1.81-alpine
3
RUN apk add --no-cache bash ca-certificates curl git
@@ -0,0 +1,3 @@1
# runtime: Rust 1.812
FROM rust:1.81-alpine3
RUN apk add --no-cache bash ca-certificates curl git@@ -0,0 +1,325 @@
1
// Package images zijn de image-aliassen die Steve voor een job bouwt.
2
// bluegit/node is geen aparte runner: het is een Dockerfile die bij het
3
// eerste gebruik lokaal wordt gebouwd en daarna hergebruikt. Een gewone
4
// naam zoals node:22 blijft een gewoon Docker-image.
5
package images
6
7
import (
8
"context"
9
"crypto/sha256"
10
"embed"
11
"encoding/hex"
12
"fmt"
13
"os"
14
"os/exec"
15
"path/filepath"
16
"regexp"
17
"sort"
18
"strings"
19
"sync"
20
)
21
22
//go:embed dockerfiles/*/*
23
var dockerfiles embed.FS
24
25
// builtinOrder is de volgorde op de infopagina.
26
var builtinOrder = []string{"base", "node", "python", "go", "rust", "java", "dotnet"}
27
28
// Preset is één alias. Direct gezet betekent: gebruik dat image zonder bouw.
29
type Preset struct {
30
Name string
31
From string
32
Runtime string
33
Tools []string
34
Dockerfile []byte
35
Direct string
36
}
37
38
// Override komt uit ci.presets in config.yml.
39
type Override struct {
40
Image string
41
Dockerfile string
42
From string
43
}
44
45
var nameRE = regexp.MustCompile(`^[a-z0-9]+(?:[._-][a-z0-9]+)*(?:/[a-z0-9]+(?:[._-][a-z0-9]+)*)+$`)
46
47
// Known zegt of name een ingebouwde alias is.
48
func Known(name string) bool {
49
for _, n := range builtinOrder {
50
if "bluegit/"+n == name {
51
return true
52
}
53
}
54
return false
55
}
56
57
// ValidateOverride keurt één configregel goed.
58
// hasBuiltin is waar als name al een ingebouwde alias is; from mag die
59
// Dockerfile dan herschrijven.
60
func ValidateOverride(name string, o Override, hasBuiltin bool) error {
61
if !nameRE.MatchString(name) {
62
return fmt.Errorf("ci.presets %q: de naam moet een image-alias zijn, zoals team/tools", name)
63
}
64
if o.Image != "" && (o.Dockerfile != "" || o.From != "") {
65
return fmt.Errorf("ci.presets %s: image sluit dockerfile en from uit", name)
66
}
67
if o.Image == "" && o.Dockerfile == "" && o.From == "" {
68
return fmt.Errorf("ci.presets %s: geef image, dockerfile of from", name)
69
}
70
if o.From != "" && o.Dockerfile == "" && o.Image == "" && !hasBuiltin {
71
return fmt.Errorf("ci.presets %s: from hoort bij een ingebouwde preset of een dockerfile", name)
72
}
73
if o.Image != "" && !validRef(o.Image) {
74
return fmt.Errorf("ci.presets %s: image %q is ongeldig", name, o.Image)
75
}
76
if o.From != "" && !validRef(o.From) {
77
return fmt.Errorf("ci.presets %s: from %q is ongeldig", name, o.From)
78
}
79
if o.Dockerfile != "" {
80
if _, err := os.Stat(o.Dockerfile); err != nil {
81
return fmt.Errorf("ci.presets %s: dockerfile %s: %w", name, o.Dockerfile, err)
82
}
83
}
84
return nil
85
}
86
87
func validRef(s string) bool {
88
return s != "" && strings.TrimSpace(s) == s && !strings.ContainsAny(s, " \t")
89
}
90
91
// Builtin leest de Dockerfiles die in het binary zitten.
92
func Builtin() []Preset {
93
var out []Preset
94
for _, name := range builtinOrder {
95
raw, err := dockerfiles.ReadFile("dockerfiles/" + name + "/Dockerfile")
96
if err != nil {
97
continue
98
}
99
from, runtime, tools, err := ParseDockerfile(raw)
100
if err != nil {
101
continue
102
}
103
out = append(out, Preset{
104
Name: "bluegit/" + name, From: from, Runtime: runtime, Tools: tools, Dockerfile: raw,
105
})
106
}
107
return out
108
}
109
110
// Effective is de ingebouwde lijst plus de aliassen uit de configuratie.
111
// Een bestaande naam wordt vervangen. Nieuwe namen komen er alfabetisch achter.
112
func Effective(over map[string]Override) ([]Preset, error) {
113
base := Builtin()
114
index := map[string]int{}
115
for i, p := range base {
116
index[p.Name] = i
117
}
118
var extra []string
119
for name := range over {
120
if _, ok := index[name]; ok {
121
continue
122
}
123
extra = append(extra, name)
124
}
125
sort.Strings(extra)
126
order := make([]string, 0, len(base)+len(extra))
127
for _, p := range base {
128
order = append(order, p.Name)
129
}
130
order = append(order, extra...)
131
out := make([]Preset, 0, len(order))
132
for _, name := range order {
133
o, ok := over[name]
134
if !ok {
135
out = append(out, base[index[name]])
136
continue
137
}
138
cur := Preset{Name: name}
139
if i, known := index[name]; known {
140
cur = base[i]
141
}
142
next, err := apply(cur, o)
143
if err != nil {
144
return nil, err
145
}
146
out = append(out, next)
147
}
148
return out, nil
149
}
150
151
func apply(base Preset, o Override) (Preset, error) {
152
if err := ValidateOverride(base.Name, o, len(base.Dockerfile) > 0); err != nil {
153
return Preset{}, err
154
}
155
if o.Image != "" {
156
return Preset{Name: base.Name, From: o.Image, Runtime: o.Image, Direct: o.Image}, nil
157
}
158
data := append([]byte(nil), base.Dockerfile...)
159
if o.Dockerfile != "" {
160
raw, err := os.ReadFile(o.Dockerfile)
161
if err != nil {
162
return Preset{}, fmt.Errorf("ci.presets %s: %w", base.Name, err)
163
}
164
data = raw
165
}
166
if len(data) == 0 {
167
return Preset{}, fmt.Errorf("ci.presets %s: geen dockerfile", base.Name)
168
}
169
if o.From != "" {
170
data = rewriteFrom(data, o.From)
171
}
172
from, runtime, tools, err := ParseDockerfile(data)
173
if err != nil {
174
return Preset{}, fmt.Errorf("ci.presets %s: %w", base.Name, err)
175
}
176
return Preset{Name: base.Name, From: from, Runtime: runtime, Tools: tools, Dockerfile: data}, nil
177
}
178
179
// Find zoekt een exacte alias. node:22 is er geen.
180
func Find(set []Preset, image string) (Preset, bool) {
181
image = strings.TrimSpace(image)
182
for _, p := range set {
183
if p.Name == image {
184
return p, true
185
}
186
}
187
return Preset{}, false
188
}
189
190
// ParseDockerfile leest FROM, een regel "# runtime:" en de pakketten uit apk of apt-get.
191
func ParseDockerfile(data []byte) (from, runtime string, tools []string, err error) {
192
sawFrom := false
193
for _, line := range strings.Split(string(data), "\n") {
194
trim := strings.TrimSpace(line)
195
if trim == "" {
196
continue
197
}
198
if strings.HasPrefix(trim, "#") {
199
if rest, ok := strings.CutPrefix(trim, "# runtime:"); ok {
200
runtime = strings.TrimSpace(rest)
201
}
202
continue
203
}
204
if !sawFrom {
205
fields := strings.Fields(trim)
206
if len(fields) < 2 || !strings.EqualFold(fields[0], "FROM") {
207
return "", "", nil, fmt.Errorf("dockerfile moet met FROM beginnen")
208
}
209
from = fields[1]
210
sawFrom = true
211
continue
212
}
213
tools = append(tools, packages(trim)...)
214
}
215
if from == "" {
216
return "", "", nil, fmt.Errorf("dockerfile mist FROM")
217
}
218
if runtime == "" {
219
runtime = from
220
}
221
return from, runtime, tools, nil
222
}
223
224
func packages(line string) []string {
225
var out []string
226
if i := strings.Index(line, "apk add"); i >= 0 {
227
out = append(out, packageTokens(line[i+len("apk add"):])...)
228
}
229
if i := strings.Index(line, "apt-get install"); i >= 0 {
230
rest := line[i+len("apt-get install"):]
231
if j := strings.Index(rest, "&&"); j >= 0 {
232
rest = rest[:j]
233
}
234
out = append(out, packageTokens(rest)...)
235
}
236
return out
237
}
238
239
func packageTokens(s string) []string {
240
var out []string
241
for _, f := range strings.Fields(s) {
242
if strings.HasPrefix(f, "-") {
243
continue
244
}
245
out = append(out, f)
246
}
247
return out
248
}
249
250
func rewriteFrom(data []byte, from string) []byte {
251
lines := strings.Split(string(data), "\n")
252
for i, line := range lines {
253
trim := strings.TrimSpace(line)
254
if trim == "" || strings.HasPrefix(trim, "#") {
255
continue
256
}
257
if strings.HasPrefix(strings.ToUpper(trim), "FROM ") {
258
lines[i] = "FROM " + from
259
}
260
break
261
}
262
return []byte(strings.Join(lines, "\n"))
263
}
264
265
var (
266
buildMu = sync.Mutex{}
267
buildOf = map[string]*sync.Mutex{}
268
)
269
270
func lockRef(ref string) func() {
271
buildMu.Lock()
272
m := buildOf[ref]
273
if m == nil {
274
m = &sync.Mutex{}
275
buildOf[ref] = m
276
}
277
buildMu.Unlock()
278
m.Lock()
279
return m.Unlock
280
}
281
282
// Ensure bouwt de Dockerfile als het resultaat nog niet lokaal staat.
283
// De tag is de alias plus een hash van de Dockerfile, zodat een wijziging
284
// een nieuwe bouw is en een gelijke Dockerfile de cache raakt.
285
func (p Preset) Ensure(ctx context.Context, dockerBin string) (ref string, built bool, err error) {
286
if p.Direct != "" {
287
return p.Direct, false, nil
288
}
289
if len(p.Dockerfile) == 0 {
290
return "", false, fmt.Errorf("preset %s heeft geen dockerfile", p.Name)
291
}
292
sum := sha256.Sum256(p.Dockerfile)
293
ref = p.Name + ":" + hex.EncodeToString(sum[:6])
294
unlock := lockRef(ref)
295
defer unlock()
296
if ok, _ := imageExists(ctx, dockerBin, ref); ok {
297
return ref, false, nil
298
}
299
dir, err := os.MkdirTemp("", "bluegit-preset-")
300
if err != nil {
301
return "", false, err
302
}
303
defer os.RemoveAll(dir)
304
if err := os.WriteFile(filepath.Join(dir, "Dockerfile"), p.Dockerfile, 0o644); err != nil {
305
return "", false, err
306
}
307
cmd := exec.CommandContext(ctx, dockerBin, "build", "-t", ref, dir)
308
out, err := cmd.CombinedOutput()
309
if err != nil {
310
msg := strings.TrimSpace(string(out))
311
if msg == "" {
312
msg = err.Error()
313
}
314
return "", false, fmt.Errorf("%s", msg)
315
}
316
return ref, true, nil
317
}
318
319
func imageExists(ctx context.Context, dockerBin, ref string) (bool, error) {
320
cmd := exec.CommandContext(ctx, dockerBin, "image", "inspect", "--format", "{{.Id}}", ref)
321
if err := cmd.Run(); err != nil {
322
return false, err
323
}
324
return true, nil
325
}
@@ -0,0 +1,325 @@1
// Package images zijn de image-aliassen die Steve voor een job bouwt.2
// bluegit/node is geen aparte runner: het is een Dockerfile die bij het3
// eerste gebruik lokaal wordt gebouwd en daarna hergebruikt. Een gewone4
// naam zoals node:22 blijft een gewoon Docker-image.5
package images6
7
import (8
"context"9
"crypto/sha256"10
"embed"11
"encoding/hex"12
"fmt"13
"os"14
"os/exec"15
"path/filepath"16
"regexp"17
"sort"18
"strings"19
"sync"20
)21
22
//go:embed dockerfiles/*/*23
var dockerfiles embed.FS24
25
// builtinOrder is de volgorde op de infopagina.26
var builtinOrder = []string{"base", "node", "python", "go", "rust", "java", "dotnet"}27
28
// Preset is één alias. Direct gezet betekent: gebruik dat image zonder bouw.29
type Preset struct {30
Name string31
From string32
Runtime string33
Tools []string34
Dockerfile []byte35
Direct string36
}37
38
// Override komt uit ci.presets in config.yml.39
type Override struct {40
Image string41
Dockerfile string42
From string43
}44
45
var nameRE = regexp.MustCompile(`^[a-z0-9]+(?:[._-][a-z0-9]+)*(?:/[a-z0-9]+(?:[._-][a-z0-9]+)*)+$`)46
47
// Known zegt of name een ingebouwde alias is.48
func Known(name string) bool {49
for _, n := range builtinOrder {50
if "bluegit/"+n == name {51
return true52
}53
}54
return false55
}56
57
// ValidateOverride keurt één configregel goed.58
// hasBuiltin is waar als name al een ingebouwde alias is; from mag die59
// Dockerfile dan herschrijven.60
func ValidateOverride(name string, o Override, hasBuiltin bool) error {61
if !nameRE.MatchString(name) {62
return fmt.Errorf("ci.presets %q: de naam moet een image-alias zijn, zoals team/tools", name)63
}64
if o.Image != "" && (o.Dockerfile != "" || o.From != "") {65
return fmt.Errorf("ci.presets %s: image sluit dockerfile en from uit", name)66
}67
if o.Image == "" && o.Dockerfile == "" && o.From == "" {68
return fmt.Errorf("ci.presets %s: geef image, dockerfile of from", name)69
}70
if o.From != "" && o.Dockerfile == "" && o.Image == "" && !hasBuiltin {71
return fmt.Errorf("ci.presets %s: from hoort bij een ingebouwde preset of een dockerfile", name)72
}73
if o.Image != "" && !validRef(o.Image) {74
return fmt.Errorf("ci.presets %s: image %q is ongeldig", name, o.Image)75
}76
if o.From != "" && !validRef(o.From) {77
return fmt.Errorf("ci.presets %s: from %q is ongeldig", name, o.From)78
}79
if o.Dockerfile != "" {80
if _, err := os.Stat(o.Dockerfile); err != nil {81
return fmt.Errorf("ci.presets %s: dockerfile %s: %w", name, o.Dockerfile, err)82
}83
}84
return nil85
}86
87
func validRef(s string) bool {88
return s != "" && strings.TrimSpace(s) == s && !strings.ContainsAny(s, " \t")89
}90
91
// Builtin leest de Dockerfiles die in het binary zitten.92
func Builtin() []Preset {93
var out []Preset94
for _, name := range builtinOrder {95
raw, err := dockerfiles.ReadFile("dockerfiles/" + name + "/Dockerfile")96
if err != nil {97
continue98
}99
from, runtime, tools, err := ParseDockerfile(raw)100
if err != nil {101
continue102
}103
out = append(out, Preset{104
Name: "bluegit/" + name, From: from, Runtime: runtime, Tools: tools, Dockerfile: raw,105
})106
}107
return out108
}109
110
// Effective is de ingebouwde lijst plus de aliassen uit de configuratie.111
// Een bestaande naam wordt vervangen. Nieuwe namen komen er alfabetisch achter.112
func Effective(over map[string]Override) ([]Preset, error) {113
base := Builtin()114
index := map[string]int{}115
for i, p := range base {116
index[p.Name] = i117
}118
var extra []string119
for name := range over {120
if _, ok := index[name]; ok {121
continue122
}123
extra = append(extra, name)124
}125
sort.Strings(extra)126
order := make([]string, 0, len(base)+len(extra))127
for _, p := range base {128
order = append(order, p.Name)129
}130
order = append(order, extra...)131
out := make([]Preset, 0, len(order))132
for _, name := range order {133
o, ok := over[name]134
if !ok {135
out = append(out, base[index[name]])136
continue137
}138
cur := Preset{Name: name}139
if i, known := index[name]; known {140
cur = base[i]141
}142
next, err := apply(cur, o)143
if err != nil {144
return nil, err145
}146
out = append(out, next)147
}148
return out, nil149
}150
151
func apply(base Preset, o Override) (Preset, error) {152
if err := ValidateOverride(base.Name, o, len(base.Dockerfile) > 0); err != nil {153
return Preset{}, err154
}155
if o.Image != "" {156
return Preset{Name: base.Name, From: o.Image, Runtime: o.Image, Direct: o.Image}, nil157
}158
data := append([]byte(nil), base.Dockerfile...)159
if o.Dockerfile != "" {160
raw, err := os.ReadFile(o.Dockerfile)161
if err != nil {162
return Preset{}, fmt.Errorf("ci.presets %s: %w", base.Name, err)163
}164
data = raw165
}166
if len(data) == 0 {167
return Preset{}, fmt.Errorf("ci.presets %s: geen dockerfile", base.Name)168
}169
if o.From != "" {170
data = rewriteFrom(data, o.From)171
}172
from, runtime, tools, err := ParseDockerfile(data)173
if err != nil {174
return Preset{}, fmt.Errorf("ci.presets %s: %w", base.Name, err)175
}176
return Preset{Name: base.Name, From: from, Runtime: runtime, Tools: tools, Dockerfile: data}, nil177
}178
179
// Find zoekt een exacte alias. node:22 is er geen.180
func Find(set []Preset, image string) (Preset, bool) {181
image = strings.TrimSpace(image)182
for _, p := range set {183
if p.Name == image {184
return p, true185
}186
}187
return Preset{}, false188
}189
190
// ParseDockerfile leest FROM, een regel "# runtime:" en de pakketten uit apk of apt-get.191
func ParseDockerfile(data []byte) (from, runtime string, tools []string, err error) {192
sawFrom := false193
for _, line := range strings.Split(string(data), "\n") {194
trim := strings.TrimSpace(line)195
if trim == "" {196
continue197
}198
if strings.HasPrefix(trim, "#") {199
if rest, ok := strings.CutPrefix(trim, "# runtime:"); ok {200
runtime = strings.TrimSpace(rest)201
}202
continue203
}204
if !sawFrom {205
fields := strings.Fields(trim)206
if len(fields) < 2 || !strings.EqualFold(fields[0], "FROM") {207
return "", "", nil, fmt.Errorf("dockerfile moet met FROM beginnen")208
}209
from = fields[1]210
sawFrom = true211
continue212
}213
tools = append(tools, packages(trim)...)214
}215
if from == "" {216
return "", "", nil, fmt.Errorf("dockerfile mist FROM")217
}218
if runtime == "" {219
runtime = from220
}221
return from, runtime, tools, nil222
}223
224
func packages(line string) []string {225
var out []string226
if i := strings.Index(line, "apk add"); i >= 0 {227
out = append(out, packageTokens(line[i+len("apk add"):])...)228
}229
if i := strings.Index(line, "apt-get install"); i >= 0 {230
rest := line[i+len("apt-get install"):]231
if j := strings.Index(rest, "&&"); j >= 0 {232
rest = rest[:j]233
}234
out = append(out, packageTokens(rest)...)235
}236
return out237
}238
239
func packageTokens(s string) []string {240
var out []string241
for _, f := range strings.Fields(s) {242
if strings.HasPrefix(f, "-") {243
continue244
}245
out = append(out, f)246
}247
return out248
}249
250
func rewriteFrom(data []byte, from string) []byte {251
lines := strings.Split(string(data), "\n")252
for i, line := range lines {253
trim := strings.TrimSpace(line)254
if trim == "" || strings.HasPrefix(trim, "#") {255
continue256
}257
if strings.HasPrefix(strings.ToUpper(trim), "FROM ") {258
lines[i] = "FROM " + from259
}260
break261
}262
return []byte(strings.Join(lines, "\n"))263
}264
265
var (266
buildMu = sync.Mutex{}267
buildOf = map[string]*sync.Mutex{}268
)269
270
func lockRef(ref string) func() {271
buildMu.Lock()272
m := buildOf[ref]273
if m == nil {274
m = &sync.Mutex{}275
buildOf[ref] = m276
}277
buildMu.Unlock()278
m.Lock()279
return m.Unlock280
}281
282
// Ensure bouwt de Dockerfile als het resultaat nog niet lokaal staat.283
// De tag is de alias plus een hash van de Dockerfile, zodat een wijziging284
// een nieuwe bouw is en een gelijke Dockerfile de cache raakt.285
func (p Preset) Ensure(ctx context.Context, dockerBin string) (ref string, built bool, err error) {286
if p.Direct != "" {287
return p.Direct, false, nil288
}289
if len(p.Dockerfile) == 0 {290
return "", false, fmt.Errorf("preset %s heeft geen dockerfile", p.Name)291
}292
sum := sha256.Sum256(p.Dockerfile)293
ref = p.Name + ":" + hex.EncodeToString(sum[:6])294
unlock := lockRef(ref)295
defer unlock()296
if ok, _ := imageExists(ctx, dockerBin, ref); ok {297
return ref, false, nil298
}299
dir, err := os.MkdirTemp("", "bluegit-preset-")300
if err != nil {301
return "", false, err302
}303
defer os.RemoveAll(dir)304
if err := os.WriteFile(filepath.Join(dir, "Dockerfile"), p.Dockerfile, 0o644); err != nil {305
return "", false, err306
}307
cmd := exec.CommandContext(ctx, dockerBin, "build", "-t", ref, dir)308
out, err := cmd.CombinedOutput()309
if err != nil {310
msg := strings.TrimSpace(string(out))311
if msg == "" {312
msg = err.Error()313
}314
return "", false, fmt.Errorf("%s", msg)315
}316
return ref, true, nil317
}318
319
func imageExists(ctx context.Context, dockerBin, ref string) (bool, error) {320
cmd := exec.CommandContext(ctx, dockerBin, "image", "inspect", "--format", "{{.Id}}", ref)321
if err := cmd.Run(); err != nil {322
return false, err323
}324
return true, nil325
}@@ -0,0 +1,125 @@
1
package images
2
3
import (
4
"context"
5
"os"
6
"path/filepath"
7
"strings"
8
"testing"
9
)
10
11
func TestBuiltinPresets(t *testing.T) {
12
set := Builtin()
13
if len(set) != len(builtinOrder) {
14
t.Fatalf("aantal %d", len(set))
15
}
16
want := []string{"bluegit/base", "bluegit/node", "bluegit/python", "bluegit/go", "bluegit/rust", "bluegit/java", "bluegit/dotnet"}
17
for i, name := range want {
18
p := set[i]
19
if p.Name != name || p.From == "" || p.Runtime == "" || p.Direct != "" {
20
t.Fatalf("%d %+v", i, p)
21
}
22
joined := strings.Join(p.Tools, " ")
23
for _, tool := range []string{"bash", "ca-certificates", "curl", "git"} {
24
if !strings.Contains(joined, tool) {
25
t.Fatalf("%s mist %s in %s", name, tool, joined)
26
}
27
}
28
}
29
if set[0].From != "alpine:3.20" || set[1].From != "node:22-alpine" || set[6].From != "mcr.microsoft.com/dotnet/sdk:8.0" {
30
t.Fatalf("bases %s %s %s", set[0].From, set[1].From, set[6].From)
31
}
32
if _, ok := Find(set, "node:22"); ok {
33
t.Fatal("node:22 is een gewoon image")
34
}
35
if _, ok := Find(set, "bluegit/go"); !ok {
36
t.Fatal("bluegit/go")
37
}
38
}
39
40
func TestEffectiveOverride(t *testing.T) {
41
dir := t.TempDir()
42
path := filepath.Join(dir, "Dockerfile")
43
body := []byte("# runtime: Extra\nFROM debian:bookworm-slim\nRUN apt-get install -y --no-install-recommends curl git && rm -rf /var/lib/apt/lists/*\n")
44
if err := os.WriteFile(path, body, 0o644); err != nil {
45
t.Fatal(err)
46
}
47
set, err := Effective(map[string]Override{
48
"bluegit/node": {From: "node:22-bookworm"},
49
"team/tools": {Dockerfile: path},
50
"team/plain": {Image: "alpine:3.20"},
51
})
52
if err != nil {
53
t.Fatal(err)
54
}
55
node, ok := Find(set, "bluegit/node")
56
if !ok || node.From != "node:22-bookworm" || !strings.Contains(string(node.Dockerfile), "FROM node:22-bookworm") {
57
t.Fatalf("node %+v", node)
58
}
59
if strings.Contains(string(node.Dockerfile), "node:22-alpine") {
60
t.Fatal("oude FROM bleef staan")
61
}
62
tools, ok := Find(set, "team/tools")
63
if !ok || tools.From != "debian:bookworm-slim" || tools.Runtime != "Extra" {
64
t.Fatalf("tools %+v", tools)
65
}
66
plain, ok := Find(set, "team/plain")
67
if !ok || plain.Direct != "alpine:3.20" || len(plain.Dockerfile) != 0 {
68
t.Fatalf("plain %+v", plain)
69
}
70
if _, err := Effective(map[string]Override{"Nope": {Image: "alpine"}}); err == nil {
71
t.Fatal("hoofdletters")
72
}
73
if _, err := Effective(map[string]Override{"team/both": {Image: "alpine", From: "debian"}}); err == nil {
74
t.Fatal("image en from")
75
}
76
}
77
78
func TestEnsureBuildsOnce(t *testing.T) {
79
dir := t.TempDir()
80
logPath := filepath.Join(dir, "log")
81
builtPath := filepath.Join(dir, "built")
82
script := filepath.Join(dir, "docker")
83
body := `#!/bin/sh
84
echo "$@" >> "` + logPath + `"
85
tag=""
86
for a in "$@"; do tag="$a"; done
87
if [ "$1" = "image" ]; then
88
if grep -qx "$tag" "` + builtPath + `" 2>/dev/null; then
89
exit 0
90
fi
91
exit 1
92
fi
93
if [ "$1" = "build" ]; then
94
prev=""
95
for a in "$@"; do
96
if [ "$prev" = "-t" ]; then printf '%s\n' "$a" >> "` + builtPath + `"; fi
97
prev="$a"
98
done
99
exit 0
100
fi
101
exit 1
102
`
103
if err := os.WriteFile(script, []byte(body), 0o755); err != nil {
104
t.Fatal(err)
105
}
106
p, ok := Find(Builtin(), "bluegit/base")
107
if !ok {
108
t.Fatal("base")
109
}
110
ref, built, err := p.Ensure(context.Background(), script)
111
if err != nil || !built || !strings.HasPrefix(ref, "bluegit/base:") {
112
t.Fatalf("eerst %s %v %v", ref, built, err)
113
}
114
ref2, built2, err := p.Ensure(context.Background(), script)
115
if err != nil || built2 || ref2 != ref {
116
t.Fatalf("cache %s %v %v", ref2, built2, err)
117
}
118
log, err := os.ReadFile(logPath)
119
if err != nil {
120
t.Fatal(err)
121
}
122
if strings.Count(string(log), "build ") != 1 {
123
t.Fatalf("bouwt vaker:\n%s", log)
124
}
125
}
@@ -0,0 +1,125 @@1
package images2
3
import (4
"context"5
"os"6
"path/filepath"7
"strings"8
"testing"9
)10
11
func TestBuiltinPresets(t *testing.T) {12
set := Builtin()13
if len(set) != len(builtinOrder) {14
t.Fatalf("aantal %d", len(set))15
}16
want := []string{"bluegit/base", "bluegit/node", "bluegit/python", "bluegit/go", "bluegit/rust", "bluegit/java", "bluegit/dotnet"}17
for i, name := range want {18
p := set[i]19
if p.Name != name || p.From == "" || p.Runtime == "" || p.Direct != "" {20
t.Fatalf("%d %+v", i, p)21
}22
joined := strings.Join(p.Tools, " ")23
for _, tool := range []string{"bash", "ca-certificates", "curl", "git"} {24
if !strings.Contains(joined, tool) {25
t.Fatalf("%s mist %s in %s", name, tool, joined)26
}27
}28
}29
if set[0].From != "alpine:3.20" || set[1].From != "node:22-alpine" || set[6].From != "mcr.microsoft.com/dotnet/sdk:8.0" {30
t.Fatalf("bases %s %s %s", set[0].From, set[1].From, set[6].From)31
}32
if _, ok := Find(set, "node:22"); ok {33
t.Fatal("node:22 is een gewoon image")34
}35
if _, ok := Find(set, "bluegit/go"); !ok {36
t.Fatal("bluegit/go")37
}38
}39
40
func TestEffectiveOverride(t *testing.T) {41
dir := t.TempDir()42
path := filepath.Join(dir, "Dockerfile")43
body := []byte("# runtime: Extra\nFROM debian:bookworm-slim\nRUN apt-get install -y --no-install-recommends curl git && rm -rf /var/lib/apt/lists/*\n")44
if err := os.WriteFile(path, body, 0o644); err != nil {45
t.Fatal(err)46
}47
set, err := Effective(map[string]Override{48
"bluegit/node": {From: "node:22-bookworm"},49
"team/tools": {Dockerfile: path},50
"team/plain": {Image: "alpine:3.20"},51
})52
if err != nil {53
t.Fatal(err)54
}55
node, ok := Find(set, "bluegit/node")56
if !ok || node.From != "node:22-bookworm" || !strings.Contains(string(node.Dockerfile), "FROM node:22-bookworm") {57
t.Fatalf("node %+v", node)58
}59
if strings.Contains(string(node.Dockerfile), "node:22-alpine") {60
t.Fatal("oude FROM bleef staan")61
}62
tools, ok := Find(set, "team/tools")63
if !ok || tools.From != "debian:bookworm-slim" || tools.Runtime != "Extra" {64
t.Fatalf("tools %+v", tools)65
}66
plain, ok := Find(set, "team/plain")67
if !ok || plain.Direct != "alpine:3.20" || len(plain.Dockerfile) != 0 {68
t.Fatalf("plain %+v", plain)69
}70
if _, err := Effective(map[string]Override{"Nope": {Image: "alpine"}}); err == nil {71
t.Fatal("hoofdletters")72
}73
if _, err := Effective(map[string]Override{"team/both": {Image: "alpine", From: "debian"}}); err == nil {74
t.Fatal("image en from")75
}76
}77
78
func TestEnsureBuildsOnce(t *testing.T) {79
dir := t.TempDir()80
logPath := filepath.Join(dir, "log")81
builtPath := filepath.Join(dir, "built")82
script := filepath.Join(dir, "docker")83
body := `#!/bin/sh84
echo "$@" >> "` + logPath + `"85
tag=""86
for a in "$@"; do tag="$a"; done87
if [ "$1" = "image" ]; then88
if grep -qx "$tag" "` + builtPath + `" 2>/dev/null; then89
exit 090
fi91
exit 192
fi93
if [ "$1" = "build" ]; then94
prev=""95
for a in "$@"; do96
if [ "$prev" = "-t" ]; then printf '%s\n' "$a" >> "` + builtPath + `"; fi97
prev="$a"98
done99
exit 0100
fi101
exit 1102
`103
if err := os.WriteFile(script, []byte(body), 0o755); err != nil {104
t.Fatal(err)105
}106
p, ok := Find(Builtin(), "bluegit/base")107
if !ok {108
t.Fatal("base")109
}110
ref, built, err := p.Ensure(context.Background(), script)111
if err != nil || !built || !strings.HasPrefix(ref, "bluegit/base:") {112
t.Fatalf("eerst %s %v %v", ref, built, err)113
}114
ref2, built2, err := p.Ensure(context.Background(), script)115
if err != nil || built2 || ref2 != ref {116
t.Fatalf("cache %s %v %v", ref2, built2, err)117
}118
log, err := os.ReadFile(logPath)119
if err != nil {120
t.Fatal(err)121
}122
if strings.Count(string(log), "build ") != 1 {123
t.Fatalf("bouwt vaker:\n%s", log)124
}125
}@@ -102,6 +102,25 @@ func foldLatin(s string) string {
102
102
).Replace(s)
103
103
}
104
104
105
// ValidBranch laat een branchnaam toe met slashes, zonder ontsnapping.
106
func ValidBranch(s string) error {
107
if s == "" || len(s) > 200 || strings.HasPrefix(s, "/") || strings.HasSuffix(s, "/") || strings.Contains(s, "..") || strings.Contains(s, "//") || strings.Contains(s, "@{") || strings.HasSuffix(s, ".lock") {
108
return i18n.E("err.branchName", s)
109
}
110
for _, part := range strings.Split(s, "/") {
111
if part == "" || part == "." || strings.HasPrefix(part, "-") || strings.HasSuffix(part, ".") {
112
return i18n.E("err.branchName", s)
113
}
114
for _, c := range part {
115
ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'
116
if !ok {
117
return i18n.E("err.branchName", s)
118
}
119
}
120
}
121
return nil
122
}
123
105
124
// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
106
125
func ValidTag(s string) error {
107
126
if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
@@ -102,6 +102,25 @@ func foldLatin(s string) string {102
).Replace(s)102
).Replace(s)103
}103
}104
104
105
// ValidBranch laat een branchnaam toe met slashes, zonder ontsnapping.106
func ValidBranch(s string) error {107
if s == "" || len(s) > 200 || strings.HasPrefix(s, "/") || strings.HasSuffix(s, "/") || strings.Contains(s, "..") || strings.Contains(s, "//") || strings.Contains(s, "@{") || strings.HasSuffix(s, ".lock") {108
return i18n.E("err.branchName", s)109
}110
for _, part := range strings.Split(s, "/") {111
if part == "" || part == "." || strings.HasPrefix(part, "-") || strings.HasSuffix(part, ".") {112
return i18n.E("err.branchName", s)113
}114
for _, c := range part {115
ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'116
if !ok {117
return i18n.E("err.branchName", s)118
}119
}120
}121
return nil122
}123
105
// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.124
// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.106
func ValidTag(s string) error {125
func ValidTag(s string) error {107
if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {126
if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {@@ -0,0 +1,80 @@
1
package runner
2
3
import (
4
"os/exec"
5
"strings"
6
"testing"
7
8
"gitlab.com/Timfa/bluegit/internal/store"
9
)
10
11
func TestShellScriptNotesStayInEnvironmentSection(t *testing.T) {
12
job := store.Job{Before: "echo before\n", Script: "echo run\n", After: "echo after\n"}
13
note := placeNote{
14
Runner: "O'Hara $(touch /tmp/pwn)", Host: "build.example",
15
WorkDir: "/workspace", PipelineID: 12, JobID: 34,
16
}
17
script := shellScript(job, note)
18
start := strings.Index(script, "section_start:before:Preparing environment")
19
end := strings.Index(script, "section_end:before:Preparing environment")
20
if start < 0 || end < start {
21
t.Fatalf("sectie: %s", script)
22
}
23
body := script[start:end]
24
for _, want := range []string{
25
"echo " + shSingle("Running on O'Hara $(touch /tmp/pwn) via build.example..."),
26
"Working directory: /workspace",
27
"Pipeline #12, job #34",
28
} {
29
if !strings.Contains(body, want) {
30
t.Fatalf("ontbreekt %q in %s", want, body)
31
}
32
}
33
if strings.Index(body, "Pipeline #12") > strings.Index(body, "echo before") {
34
t.Fatal("info staat na before_script")
35
}
36
cmd := exec.Command("sh", "-n")
37
cmd.Stdin = strings.NewReader(script)
38
if out, err := cmd.CombinedOutput(); err != nil {
39
t.Fatalf("sh -n: %v %s\n%s", err, out, script)
40
}
41
}
42
43
func TestPlaceNoteDefaults(t *testing.T) {
44
lines := (placeNote{PipelineID: 7, JobID: 8}).lines()
45
if len(lines) != 3 || lines[0] != "Running on Steve via localhost..." || lines[1] != "Working directory: /workspace" || lines[2] != "Pipeline #7, job #8" {
46
t.Fatalf("%q", lines)
47
}
48
}
49
50
func TestDockerImageLines(t *testing.T) {
51
only := dockerImageLines("alpine:latest", "", nil)
52
if len(only) != 1 || only[0] != "Using docker image alpine:latest ..." {
53
t.Fatalf("zonder lokaal image: %q", only)
54
}
55
idOnly := dockerImageLines("alpine:latest", "sha256:abc", nil)
56
if len(idOnly) != 2 || idOnly[1] != "Using docker image sha256:abc for alpine:latest ..." {
57
t.Fatalf("alleen id: %q", idOnly)
58
}
59
full := dockerImageLines("alpine:latest", "sha256:abc", []string{
60
"other@sha256:nope",
61
"docker.io/library/alpine@sha256:def",
62
})
63
want := "Using docker image sha256:abc for alpine:latest with digest docker.io/library/alpine@sha256:def ..."
64
if len(full) != 2 || full[0] != "Using docker image alpine:latest ..." || full[1] != want {
65
t.Fatalf("digest: %q", full)
66
}
67
reg := dockerImageLines("localhost:5000/team/app:1", "sha256:fff", []string{
68
"localhost:5000/team/app@sha256:999",
69
})
70
if !strings.Contains(reg[1], "digest localhost:5000/team/app@sha256:999") {
71
t.Fatalf("registry: %q", reg)
72
}
73
}
74
75
func TestParseImageInspect(t *testing.T) {
76
id, digests := parseImageInspect("sha256:abc\nalpine@sha256:def\n\n")
77
if id != "sha256:abc" || len(digests) != 1 || digests[0] != "alpine@sha256:def" {
78
t.Fatalf("%s %q", id, digests)
79
}
80
}
@@ -0,0 +1,80 @@1
package runner2
3
import (4
"os/exec"5
"strings"6
"testing"7
8
"gitlab.com/Timfa/bluegit/internal/store"9
)10
11
func TestShellScriptNotesStayInEnvironmentSection(t *testing.T) {12
job := store.Job{Before: "echo before\n", Script: "echo run\n", After: "echo after\n"}13
note := placeNote{14
Runner: "O'Hara $(touch /tmp/pwn)", Host: "build.example",15
WorkDir: "/workspace", PipelineID: 12, JobID: 34,16
}17
script := shellScript(job, note)18
start := strings.Index(script, "section_start:before:Preparing environment")19
end := strings.Index(script, "section_end:before:Preparing environment")20
if start < 0 || end < start {21
t.Fatalf("sectie: %s", script)22
}23
body := script[start:end]24
for _, want := range []string{25
"echo " + shSingle("Running on O'Hara $(touch /tmp/pwn) via build.example..."),26
"Working directory: /workspace",27
"Pipeline #12, job #34",28
} {29
if !strings.Contains(body, want) {30
t.Fatalf("ontbreekt %q in %s", want, body)31
}32
}33
if strings.Index(body, "Pipeline #12") > strings.Index(body, "echo before") {34
t.Fatal("info staat na before_script")35
}36
cmd := exec.Command("sh", "-n")37
cmd.Stdin = strings.NewReader(script)38
if out, err := cmd.CombinedOutput(); err != nil {39
t.Fatalf("sh -n: %v %s\n%s", err, out, script)40
}41
}42
43
func TestPlaceNoteDefaults(t *testing.T) {44
lines := (placeNote{PipelineID: 7, JobID: 8}).lines()45
if len(lines) != 3 || lines[0] != "Running on Steve via localhost..." || lines[1] != "Working directory: /workspace" || lines[2] != "Pipeline #7, job #8" {46
t.Fatalf("%q", lines)47
}48
}49
50
func TestDockerImageLines(t *testing.T) {51
only := dockerImageLines("alpine:latest", "", nil)52
if len(only) != 1 || only[0] != "Using docker image alpine:latest ..." {53
t.Fatalf("zonder lokaal image: %q", only)54
}55
idOnly := dockerImageLines("alpine:latest", "sha256:abc", nil)56
if len(idOnly) != 2 || idOnly[1] != "Using docker image sha256:abc for alpine:latest ..." {57
t.Fatalf("alleen id: %q", idOnly)58
}59
full := dockerImageLines("alpine:latest", "sha256:abc", []string{60
"other@sha256:nope",61
"docker.io/library/alpine@sha256:def",62
})63
want := "Using docker image sha256:abc for alpine:latest with digest docker.io/library/alpine@sha256:def ..."64
if len(full) != 2 || full[0] != "Using docker image alpine:latest ..." || full[1] != want {65
t.Fatalf("digest: %q", full)66
}67
reg := dockerImageLines("localhost:5000/team/app:1", "sha256:fff", []string{68
"localhost:5000/team/app@sha256:999",69
})70
if !strings.Contains(reg[1], "digest localhost:5000/team/app@sha256:999") {71
t.Fatalf("registry: %q", reg)72
}73
}74
75
func TestParseImageInspect(t *testing.T) {76
id, digests := parseImageInspect("sha256:abc\nalpine@sha256:def\n\n")77
if id != "sha256:abc" || len(digests) != 1 || digests[0] != "alpine@sha256:def" {78
t.Fatalf("%s %q", id, digests)79
}80
}@@ -0,0 +1,135 @@
1
package runner
2
3
import (
4
"context"
5
"os"
6
"path/filepath"
7
"strings"
8
"testing"
9
10
"gitlab.com/Timfa/bluegit/internal/images"
11
)
12
13
func TestImageLogPresetAndPlain(t *testing.T) {
14
lines := imageLog("bluegit/node", "node:22-alpine", "bluegit/node:abc", "sha256:id", nil, []string{"docker.io/library/node@sha256:dead"})
15
joined := strings.Join(lines, "\n")
16
for _, want := range []string{
17
"Using image preset bluegit/node based on node:22-alpine",
18
"Using docker image bluegit/node:abc ...",
19
"Underlying image node:22-alpine with digest docker.io/library/node@sha256:dead ...",
20
} {
21
if !strings.Contains(joined, want) {
22
t.Fatalf("mist %q in %s", want, joined)
23
}
24
}
25
plain := imageLog("", "", "node:22", "", nil, nil)
26
if len(plain) != 1 || plain[0] != "Using docker image node:22 ..." || strings.Contains(plain[0], "preset") {
27
t.Fatalf("gewoon image: %q", plain)
28
}
29
}
30
31
func TestResolveImageBuildsPresetAndLeavesPlainImages(t *testing.T) {
32
dir := t.TempDir()
33
logPath := filepath.Join(dir, "log")
34
builtPath := filepath.Join(dir, "built")
35
script := filepath.Join(dir, "docker")
36
body := `#!/bin/sh
37
echo "$@" >> "` + logPath + `"
38
tag=""
39
for a in "$@"; do tag="$a"; done
40
if [ "$1" = "image" ]; then
41
case "$tag" in
42
bluegit/*)
43
if grep -qx "$tag" "` + builtPath + `" 2>/dev/null; then
44
printf '%s\n' "sha256:built"
45
printf '%s\n' "$tag@sha256:builtdigest"
46
exit 0
47
fi
48
exit 1
49
;;
50
esac
51
printf '%s\n' "sha256:base"
52
printf '%s\n' "docker.io/library/base@sha256:basedigest"
53
exit 0
54
fi
55
if [ "$1" = "build" ]; then
56
prev=""
57
for a in "$@"; do
58
if [ "$prev" = "-t" ]; then printf '%s\n' "$a" >> "` + builtPath + `"; fi
59
prev="$a"
60
done
61
exit 0
62
fi
63
exit 1
64
`
65
if err := os.WriteFile(script, []byte(body), 0o755); err != nil {
66
t.Fatal(err)
67
}
68
r := &Runner{Docker: script}
69
ref, lines, err := r.resolveImage(context.Background(), "bluegit/node")
70
if err != nil {
71
t.Fatal(err)
72
}
73
if !strings.HasPrefix(ref, "bluegit/node:") {
74
t.Fatalf("ref %s", ref)
75
}
76
joined := strings.Join(lines, "\n")
77
for _, want := range []string{
78
"Building image preset bluegit/node ...",
79
"Using image preset bluegit/node based on node:22-alpine",
80
"Using docker image " + ref,
81
"Underlying image node:22-alpine with digest docker.io/library/base@sha256:basedigest ...",
82
} {
83
if !strings.Contains(joined, want) {
84
t.Fatalf("mist %q in\n%s", want, joined)
85
}
86
}
87
if _, lines, err = r.resolveImage(context.Background(), "bluegit/node"); err != nil {
88
t.Fatal(err)
89
}
90
if strings.Contains(strings.Join(lines, "\n"), "Building image preset") {
91
t.Fatal("cache bouwt opnieuw")
92
}
93
plain, plainLines, err := r.resolveImage(context.Background(), "node:22")
94
if err != nil || plain != "node:22" {
95
t.Fatalf("plain %s %v", plain, err)
96
}
97
if strings.Contains(strings.Join(plainLines, "\n"), "preset") {
98
t.Fatalf("node:22 werd een preset: %s", plainLines)
99
}
100
log, err := os.ReadFile(logPath)
101
if err != nil {
102
t.Fatal(err)
103
}
104
if strings.Count(string(log), "\nbuild ")+strings.Count(string(log), "build -t") == 0 && !strings.Contains(string(log), "build ") {
105
t.Fatalf("geen build:\n%s", log)
106
}
107
}
108
109
func TestDirectPresetDoesNotBuild(t *testing.T) {
110
dir := t.TempDir()
111
script := filepath.Join(dir, "docker")
112
if err := os.WriteFile(script, []byte("#!/bin/sh\nexit 1\n"), 0o755); err != nil {
113
t.Fatal(err)
114
}
115
r := &Runner{Docker: script, Presets: map[string]images.Override{
116
"team/plain": {Image: "alpine:3.20"},
117
}}
118
// Docker ontbreekt niet: het script bestaat. inspect faalt, dat is geen fout.
119
// Een direct gemapte preset roept Ensure aan, dat geen build doet, en daarna inspect.
120
// inspect faalt stil. De regels noemen wel de preset.
121
ref, lines, err := r.resolveImage(context.Background(), "team/plain")
122
if err != nil {
123
t.Fatal(err)
124
}
125
if ref != "alpine:3.20" {
126
t.Fatalf("ref %s", ref)
127
}
128
joined := strings.Join(lines, "\n")
129
if !strings.Contains(joined, "Using image preset team/plain based on alpine:3.20") {
130
t.Fatalf("%s", joined)
131
}
132
if strings.Contains(joined, "Building image preset") {
133
t.Fatal("een mapping wordt gebouwd")
134
}
135
}
@@ -0,0 +1,135 @@1
package runner2
3
import (4
"context"5
"os"6
"path/filepath"7
"strings"8
"testing"9
10
"gitlab.com/Timfa/bluegit/internal/images"11
)12
13
func TestImageLogPresetAndPlain(t *testing.T) {14
lines := imageLog("bluegit/node", "node:22-alpine", "bluegit/node:abc", "sha256:id", nil, []string{"docker.io/library/node@sha256:dead"})15
joined := strings.Join(lines, "\n")16
for _, want := range []string{17
"Using image preset bluegit/node based on node:22-alpine",18
"Using docker image bluegit/node:abc ...",19
"Underlying image node:22-alpine with digest docker.io/library/node@sha256:dead ...",20
} {21
if !strings.Contains(joined, want) {22
t.Fatalf("mist %q in %s", want, joined)23
}24
}25
plain := imageLog("", "", "node:22", "", nil, nil)26
if len(plain) != 1 || plain[0] != "Using docker image node:22 ..." || strings.Contains(plain[0], "preset") {27
t.Fatalf("gewoon image: %q", plain)28
}29
}30
31
func TestResolveImageBuildsPresetAndLeavesPlainImages(t *testing.T) {32
dir := t.TempDir()33
logPath := filepath.Join(dir, "log")34
builtPath := filepath.Join(dir, "built")35
script := filepath.Join(dir, "docker")36
body := `#!/bin/sh37
echo "$@" >> "` + logPath + `"38
tag=""39
for a in "$@"; do tag="$a"; done40
if [ "$1" = "image" ]; then41
case "$tag" in42
bluegit/*)43
if grep -qx "$tag" "` + builtPath + `" 2>/dev/null; then44
printf '%s\n' "sha256:built"45
printf '%s\n' "$tag@sha256:builtdigest"46
exit 047
fi48
exit 149
;;50
esac51
printf '%s\n' "sha256:base"52
printf '%s\n' "docker.io/library/base@sha256:basedigest"53
exit 054
fi55
if [ "$1" = "build" ]; then56
prev=""57
for a in "$@"; do58
if [ "$prev" = "-t" ]; then printf '%s\n' "$a" >> "` + builtPath + `"; fi59
prev="$a"60
done61
exit 062
fi63
exit 164
`65
if err := os.WriteFile(script, []byte(body), 0o755); err != nil {66
t.Fatal(err)67
}68
r := &Runner{Docker: script}69
ref, lines, err := r.resolveImage(context.Background(), "bluegit/node")70
if err != nil {71
t.Fatal(err)72
}73
if !strings.HasPrefix(ref, "bluegit/node:") {74
t.Fatalf("ref %s", ref)75
}76
joined := strings.Join(lines, "\n")77
for _, want := range []string{78
"Building image preset bluegit/node ...",79
"Using image preset bluegit/node based on node:22-alpine",80
"Using docker image " + ref,81
"Underlying image node:22-alpine with digest docker.io/library/base@sha256:basedigest ...",82
} {83
if !strings.Contains(joined, want) {84
t.Fatalf("mist %q in\n%s", want, joined)85
}86
}87
if _, lines, err = r.resolveImage(context.Background(), "bluegit/node"); err != nil {88
t.Fatal(err)89
}90
if strings.Contains(strings.Join(lines, "\n"), "Building image preset") {91
t.Fatal("cache bouwt opnieuw")92
}93
plain, plainLines, err := r.resolveImage(context.Background(), "node:22")94
if err != nil || plain != "node:22" {95
t.Fatalf("plain %s %v", plain, err)96
}97
if strings.Contains(strings.Join(plainLines, "\n"), "preset") {98
t.Fatalf("node:22 werd een preset: %s", plainLines)99
}100
log, err := os.ReadFile(logPath)101
if err != nil {102
t.Fatal(err)103
}104
if strings.Count(string(log), "\nbuild ")+strings.Count(string(log), "build -t") == 0 && !strings.Contains(string(log), "build ") {105
t.Fatalf("geen build:\n%s", log)106
}107
}108
109
func TestDirectPresetDoesNotBuild(t *testing.T) {110
dir := t.TempDir()111
script := filepath.Join(dir, "docker")112
if err := os.WriteFile(script, []byte("#!/bin/sh\nexit 1\n"), 0o755); err != nil {113
t.Fatal(err)114
}115
r := &Runner{Docker: script, Presets: map[string]images.Override{116
"team/plain": {Image: "alpine:3.20"},117
}}118
// Docker ontbreekt niet: het script bestaat. inspect faalt, dat is geen fout.119
// Een direct gemapte preset roept Ensure aan, dat geen build doet, en daarna inspect.120
// inspect faalt stil. De regels noemen wel de preset.121
ref, lines, err := r.resolveImage(context.Background(), "team/plain")122
if err != nil {123
t.Fatal(err)124
}125
if ref != "alpine:3.20" {126
t.Fatalf("ref %s", ref)127
}128
joined := strings.Join(lines, "\n")129
if !strings.Contains(joined, "Using image preset team/plain based on alpine:3.20") {130
t.Fatalf("%s", joined)131
}132
if strings.Contains(joined, "Building image preset") {133
t.Fatal("een mapping wordt gebouwd")134
}135
}@@ -18,21 +18,25 @@ import (
18
18
"gitlab.com/Timfa/bluegit/internal/access"
19
19
"gitlab.com/Timfa/bluegit/internal/ci"
20
20
"gitlab.com/Timfa/bluegit/internal/gitrepo"
21
"gitlab.com/Timfa/bluegit/internal/images"
21
22
"gitlab.com/Timfa/bluegit/internal/store"
22
23
"gitlab.com/Timfa/bluegit/internal/webhook"
23
24
)
24
25
25
26
// Runner plant jobs en stuurt het resultaat door naar webhooks.
26
27
type Runner struct {
27
Store *store.Store
28
GitBin string
29
Docker string
30
Storage string
31
BaseURL string
32
Network string
33
Timeout time.Duration
34
Log *slog.Logger
35
OnEvent func(repoID int64, ev webhook.Event)
28
Store *store.Store
29
GitBin string
30
Docker string
31
Storage string
32
BaseURL string
33
Network string
34
Name string
35
Timeout time.Duration
36
Log *slog.Logger
37
OnEvent func(repoID int64, ev webhook.Event)
38
// Presets zijn de image-aliassen uit ci.presets. Nil is de ingebouwde lijst.
39
Presets map[string]images.Override
36
40
slots chan struct{}
37
41
mu sync.RWMutex
38
42
cancelMu sync.Mutex
@@ -143,8 +147,14 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
143
147
if busy, _ := r.Store.ResourceBusy(ctx, j.RepoID, j.ResourceGroup, j.ID); busy {
144
148
continue
145
149
}
150
// Meer jobs dan ci.concurrency blijven queued, met een plek
151
// in de wachtrij. Het slot gaat pas vrij als execute klaar is.
152
if !r.acquireSlot() {
153
continue
154
}
146
155
ok, err := r.Store.MarkJobRunning(ctx, j.ID)
147
156
if err != nil || !ok {
157
r.releaseSlot()
148
158
continue
149
159
}
150
160
status[j.Name] = "running"
@@ -209,11 +219,30 @@ func indexOf(jobs []store.Job, name string) int {
209
219
return 0
210
220
}
211
221
212
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
213
if r.slots != nil {
214
r.slots <- struct{}{}
215
defer func() { <-r.slots }()
222
func (r *Runner) acquireSlot() bool {
223
if r.slots == nil {
224
return true
225
}
226
select {
227
case r.slots <- struct{}{}:
228
return true
229
default:
230
return false
231
}
232
}
233
234
func (r *Runner) releaseSlot() {
235
if r.slots == nil {
236
return
216
237
}
238
select {
239
case <-r.slots:
240
default:
241
}
242
}
243
244
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
245
defer r.releaseSlot()
217
246
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)
218
247
base, stop := context.WithCancel(ctx)
219
248
r.track(job.ID, stop)
@@ -328,7 +357,12 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
328
357
return nil, err
329
358
}
330
359
scriptPath := filepath.Join(work, ".bluegit-job.sh")
331
if err := os.WriteFile(scriptPath, []byte(shellScript(job)), 0o755); err != nil {
360
host, _ := os.Hostname()
361
script := shellScript(job, placeNote{
362
Runner: r.Name, Host: host, WorkDir: "/workspace",
363
PipelineID: p.ID, JobID: job.ID,
364
})
365
if err := os.WriteFile(scriptPath, []byte(script), 0o755); err != nil {
332
366
sink.closeSection()
333
367
return nil, err
334
368
}
@@ -343,9 +377,25 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
343
377
return nil, err
344
378
}
345
379
sink.secrets = mask
346
if _, err := exec.LookPath(r.Docker); err != nil {
380
ref, lines, rerr := r.resolveImage(ctx, job.Image)
381
for _, line := range lines {
382
sink.emit(line)
383
}
384
if rerr != nil {
347
385
sink.closeSection()
348
return mask, fmt.Errorf("runner_system_failure: docker (%s) is not available; the job only runs in a container", r.Docker)
386
return mask, rerr
387
}
388
job.Image = ref
389
for i := range job.Services {
390
sref, slines, serr := r.resolveImage(ctx, job.Services[i].Name)
391
for _, line := range slines {
392
sink.emit(line)
393
}
394
if serr != nil {
395
sink.closeSection()
396
return mask, serr
397
}
398
job.Services[i].Name = sref
349
399
}
350
400
network := r.Network
351
401
if len(job.Services) > 0 {
@@ -386,10 +436,46 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([
386
436
return mask, nil
387
437
}
388
438
389
func shellScript(job store.Job) string {
439
// placeNote zijn de vaste regels in de sectie Preparing environment.
440
type placeNote struct {
441
Runner string
442
Host string
443
WorkDir string
444
PipelineID int64
445
JobID int64
446
}
447
448
func (n placeNote) lines() []string {
449
runner := strings.TrimSpace(n.Runner)
450
if runner == "" {
451
runner = "Steve"
452
}
453
host := strings.TrimSpace(n.Host)
454
if host == "" {
455
host = "localhost"
456
}
457
dir := strings.TrimSpace(n.WorkDir)
458
if dir == "" {
459
dir = "/workspace"
460
}
461
return []string{
462
fmt.Sprintf("Running on %s via %s...", runner, host),
463
fmt.Sprintf("Working directory: %s", dir),
464
fmt.Sprintf("Pipeline #%d, job #%d", n.PipelineID, n.JobID),
465
}
466
}
467
468
func shSingle(s string) string {
469
return "'" + strings.ReplaceAll(s, "'", `'"'"'`) + "'"
470
}
471
472
func shellScript(job store.Job, note placeNote) string {
390
473
var b strings.Builder
391
474
b.WriteString("#!/bin/sh\ncd /workspace\nrc=0\n")
392
475
fmt.Fprintf(&b, "echo \"section_start:before:Preparing environment\"\n")
476
for _, line := range note.lines() {
477
fmt.Fprintf(&b, "echo %s\n", shSingle(line))
478
}
393
479
if strings.TrimSpace(job.Before) != "" {
394
480
b.WriteString("(\nset -e\n")
395
481
b.WriteString(job.Before)
@@ -422,6 +508,145 @@ func shellScript(job store.Job) string {
422
508
return b.String()
423
509
}
424
510
511
// resolveImage kiest het image waarmee de container start.
512
// Een alias zoals bluegit/node wordt gebouwd. node:22 blijft zichzelf.
513
func (r *Runner) resolveImage(ctx context.Context, image string) (string, []string, error) {
514
image = strings.TrimSpace(image)
515
set, err := images.Effective(r.Presets)
516
if err != nil {
517
return image, nil, fmt.Errorf("runner_system_failure: %w", err)
518
}
519
missing := fmt.Errorf("runner_system_failure: docker (%s) is not available; the job only runs in a container", r.Docker)
520
if _, lookErr := exec.LookPath(r.Docker); lookErr != nil {
521
if p, ok := images.Find(set, image); ok {
522
return "", imageLog(p.Name, p.From, p.From, "", nil, nil), missing
523
}
524
return image, dockerImageLines(image, "", nil), missing
525
}
526
p, ok := images.Find(set, image)
527
if !ok {
528
id, digests := r.inspectImage(ctx, image)
529
return image, dockerImageLines(image, id, digests), nil
530
}
531
ref, built, err := p.Ensure(ctx, r.Docker)
532
if err != nil {
533
return "", imageLog(p.Name, p.From, "", "", nil, nil), fmt.Errorf("runner_system_failure: preset %s: %w", p.Name, err)
534
}
535
var lines []string
536
if built {
537
lines = append(lines, fmt.Sprintf("Building image preset %s ...", p.Name))
538
}
539
id, digests := r.inspectImage(ctx, ref)
540
var baseDigests []string
541
if ref != p.From {
542
_, baseDigests = r.inspectImage(ctx, p.From)
543
}
544
lines = append(lines, imageLog(p.Name, p.From, ref, id, digests, baseDigests)...)
545
return ref, lines, nil
546
}
547
548
func imageLog(preset, base, ref, id string, digests, baseDigests []string) []string {
549
var lines []string
550
if preset != "" {
551
lines = append(lines, fmt.Sprintf("Using image preset %s based on %s", preset, base))
552
}
553
if ref == "" {
554
return lines
555
}
556
lines = append(lines, dockerImageLines(ref, id, digests)...)
557
if preset != "" && ref != base {
558
digest := matchingDigest(base, baseDigests)
559
if digest == "" && len(baseDigests) > 0 {
560
digest = strings.TrimSpace(baseDigests[0])
561
}
562
if digest != "" {
563
lines = append(lines, fmt.Sprintf("Underlying image %s with digest %s ...", base, digest))
564
} else {
565
lines = append(lines, fmt.Sprintf("Underlying image %s ...", base))
566
}
567
}
568
return lines
569
}
570
571
func (r *Runner) inspectImage(ctx context.Context, image string) (string, []string) {
572
if strings.TrimSpace(image) == "" || r.Docker == "" {
573
return "", nil
574
}
575
out, err := execOut(ctx, r.Docker, "image", "inspect", "--format", "{{.Id}}\n{{range .RepoDigests}}{{.}}\n{{end}}", image)
576
if err != nil {
577
return "", nil
578
}
579
return parseImageInspect(out)
580
}
581
582
func parseImageInspect(out string) (string, []string) {
583
lines := strings.Split(out, "\n")
584
id := ""
585
if len(lines) > 0 {
586
id = strings.TrimSpace(lines[0])
587
}
588
var digests []string
589
for _, line := range lines[1:] {
590
line = strings.TrimSpace(line)
591
if line != "" {
592
digests = append(digests, line)
593
}
594
}
595
return id, digests
596
}
597
598
func dockerImageLines(image, id string, digests []string) []string {
599
image = strings.TrimSpace(image)
600
lines := []string{fmt.Sprintf("Using docker image %s ...", image)}
601
id = strings.TrimSpace(id)
602
digest := matchingDigest(image, digests)
603
switch {
604
case id != "" && digest != "":
605
lines = append(lines, fmt.Sprintf("Using docker image %s for %s with digest %s ...", id, image, digest))
606
case digest != "":
607
lines = append(lines, fmt.Sprintf("Using digest %s for %s ...", digest, image))
608
case id != "":
609
lines = append(lines, fmt.Sprintf("Using docker image %s for %s ...", id, image))
610
}
611
return lines
612
}
613
614
func matchingDigest(image string, digests []string) string {
615
name := imageName(image)
616
fallback := ""
617
for _, digest := range digests {
618
digest = strings.TrimSpace(digest)
619
at := strings.LastIndex(digest, "@")
620
if digest == "" || at <= 0 {
621
continue
622
}
623
if fallback == "" {
624
fallback = digest
625
}
626
repo := digest[:at]
627
if repo == name || strings.HasSuffix(repo, "/"+name) || imageName(repo) == name {
628
return digest
629
}
630
}
631
return fallback
632
}
633
634
func imageName(image string) string {
635
image = strings.TrimSpace(image)
636
if i := strings.LastIndex(image, "@"); i >= 0 {
637
image = image[:i]
638
}
639
slash := strings.LastIndex(image, "/")
640
name := image
641
if slash >= 0 {
642
name = image[slash+1:]
643
}
644
if i := strings.Index(name, ":"); i >= 0 {
645
name = name[:i]
646
}
647
return name
648
}
649
425
650
func (r *Runner) materialize(ctx context.Context, p store.Pipeline, job store.Job, work string) error {
426
651
jobs, err := r.Store.JobsByPipeline(ctx, p.ID)
427
652
if err != nil {
@@ -18,21 +18,25 @@ import (18
"gitlab.com/Timfa/bluegit/internal/access"18
"gitlab.com/Timfa/bluegit/internal/access"19
"gitlab.com/Timfa/bluegit/internal/ci"19
"gitlab.com/Timfa/bluegit/internal/ci"20
"gitlab.com/Timfa/bluegit/internal/gitrepo"20
"gitlab.com/Timfa/bluegit/internal/gitrepo"21
"gitlab.com/Timfa/bluegit/internal/images"21
"gitlab.com/Timfa/bluegit/internal/store"22
"gitlab.com/Timfa/bluegit/internal/store"22
"gitlab.com/Timfa/bluegit/internal/webhook"23
"gitlab.com/Timfa/bluegit/internal/webhook"23
)24
)24
25
25
// Runner plant jobs en stuurt het resultaat door naar webhooks.26
// Runner plant jobs en stuurt het resultaat door naar webhooks.26
type Runner struct {27
type Runner struct {27
Store *store.Store28
Store *store.Store28
GitBin string29
GitBin string29
Docker string30
Docker string30
Storage string31
Storage string31
BaseURL string32
BaseURL string32
Network string33
Network string33
Timeout time.Duration34
Name string34
Log *slog.Logger35
Timeout time.Duration35
OnEvent func(repoID int64, ev webhook.Event)36
Log *slog.Logger37
OnEvent func(repoID int64, ev webhook.Event)38
// Presets zijn de image-aliassen uit ci.presets. Nil is de ingebouwde lijst.39
Presets map[string]images.Override36
slots chan struct{}40
slots chan struct{}37
mu sync.RWMutex41
mu sync.RWMutex38
cancelMu sync.Mutex42
cancelMu sync.Mutex@@ -143,8 +147,14 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {143
if busy, _ := r.Store.ResourceBusy(ctx, j.RepoID, j.ResourceGroup, j.ID); busy {147
if busy, _ := r.Store.ResourceBusy(ctx, j.RepoID, j.ResourceGroup, j.ID); busy {144
continue148
continue145
}149
}150
// Meer jobs dan ci.concurrency blijven queued, met een plek151
// in de wachtrij. Het slot gaat pas vrij als execute klaar is.152
if !r.acquireSlot() {153
continue154
}146
ok, err := r.Store.MarkJobRunning(ctx, j.ID)155
ok, err := r.Store.MarkJobRunning(ctx, j.ID)147
if err != nil || !ok {156
if err != nil || !ok {157
r.releaseSlot()148
continue158
continue149
}159
}150
status[j.Name] = "running"160
status[j.Name] = "running"@@ -209,11 +219,30 @@ func indexOf(jobs []store.Job, name string) int {209
return 0219
return 0210
}220
}211
221
212
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {222
func (r *Runner) acquireSlot() bool {213
if r.slots != nil {223
if r.slots == nil {214
r.slots <- struct{}{}224
return true215
defer func() { <-r.slots }()225
}226
select {227
case r.slots <- struct{}{}:228
return true229
default:230
return false231
}232
}233
234
func (r *Runner) releaseSlot() {235
if r.slots == nil {236
return216
}237
}238
select {239
case <-r.slots:240
default:241
}242
}243
244
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {245
defer r.releaseSlot()217
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)246
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)218
base, stop := context.WithCancel(ctx)247
base, stop := context.WithCancel(ctx)219
r.track(job.ID, stop)248
r.track(job.ID, stop)@@ -328,7 +357,12 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([328
return nil, err357
return nil, err329
}358
}330
scriptPath := filepath.Join(work, ".bluegit-job.sh")359
scriptPath := filepath.Join(work, ".bluegit-job.sh")331
if err := os.WriteFile(scriptPath, []byte(shellScript(job)), 0o755); err != nil {360
host, _ := os.Hostname()361
script := shellScript(job, placeNote{362
Runner: r.Name, Host: host, WorkDir: "/workspace",363
PipelineID: p.ID, JobID: job.ID,364
})365
if err := os.WriteFile(scriptPath, []byte(script), 0o755); err != nil {332
sink.closeSection()366
sink.closeSection()333
return nil, err367
return nil, err334
}368
}@@ -343,9 +377,25 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([343
return nil, err377
return nil, err344
}378
}345
sink.secrets = mask379
sink.secrets = mask346
if _, err := exec.LookPath(r.Docker); err != nil {380
ref, lines, rerr := r.resolveImage(ctx, job.Image)381
for _, line := range lines {382
sink.emit(line)383
}384
if rerr != nil {347
sink.closeSection()385
sink.closeSection()348
return mask, fmt.Errorf("runner_system_failure: docker (%s) is not available; the job only runs in a container", r.Docker)386
return mask, rerr387
}388
job.Image = ref389
for i := range job.Services {390
sref, slines, serr := r.resolveImage(ctx, job.Services[i].Name)391
for _, line := range slines {392
sink.emit(line)393
}394
if serr != nil {395
sink.closeSection()396
return mask, serr397
}398
job.Services[i].Name = sref349
}399
}350
network := r.Network400
network := r.Network351
if len(job.Services) > 0 {401
if len(job.Services) > 0 {@@ -386,10 +436,46 @@ func (r *Runner) runOne(ctx context.Context, p store.Pipeline, job store.Job) ([386
return mask, nil436
return mask, nil387
}437
}388
438
389
func shellScript(job store.Job) string {439
// placeNote zijn de vaste regels in de sectie Preparing environment.440
type placeNote struct {441
Runner string442
Host string443
WorkDir string444
PipelineID int64445
JobID int64446
}447
448
func (n placeNote) lines() []string {449
runner := strings.TrimSpace(n.Runner)450
if runner == "" {451
runner = "Steve"452
}453
host := strings.TrimSpace(n.Host)454
if host == "" {455
host = "localhost"456
}457
dir := strings.TrimSpace(n.WorkDir)458
if dir == "" {459
dir = "/workspace"460
}461
return []string{462
fmt.Sprintf("Running on %s via %s...", runner, host),463
fmt.Sprintf("Working directory: %s", dir),464
fmt.Sprintf("Pipeline #%d, job #%d", n.PipelineID, n.JobID),465
}466
}467
468
func shSingle(s string) string {469
return "'" + strings.ReplaceAll(s, "'", `'"'"'`) + "'"470
}471
472
func shellScript(job store.Job, note placeNote) string {390
var b strings.Builder473
var b strings.Builder391
b.WriteString("#!/bin/sh\ncd /workspace\nrc=0\n")474
b.WriteString("#!/bin/sh\ncd /workspace\nrc=0\n")392
fmt.Fprintf(&b, "echo \"section_start:before:Preparing environment\"\n")475
fmt.Fprintf(&b, "echo \"section_start:before:Preparing environment\"\n")476
for _, line := range note.lines() {477
fmt.Fprintf(&b, "echo %s\n", shSingle(line))478
}393
if strings.TrimSpace(job.Before) != "" {479
if strings.TrimSpace(job.Before) != "" {394
b.WriteString("(\nset -e\n")480
b.WriteString("(\nset -e\n")395
b.WriteString(job.Before)481
b.WriteString(job.Before)@@ -422,6 +508,145 @@ func shellScript(job store.Job) string {422
return b.String()508
return b.String()423
}509
}424
510
511
// resolveImage kiest het image waarmee de container start.512
// Een alias zoals bluegit/node wordt gebouwd. node:22 blijft zichzelf.513
func (r *Runner) resolveImage(ctx context.Context, image string) (string, []string, error) {514
image = strings.TrimSpace(image)515
set, err := images.Effective(r.Presets)516
if err != nil {517
return image, nil, fmt.Errorf("runner_system_failure: %w", err)518
}519
missing := fmt.Errorf("runner_system_failure: docker (%s) is not available; the job only runs in a container", r.Docker)520
if _, lookErr := exec.LookPath(r.Docker); lookErr != nil {521
if p, ok := images.Find(set, image); ok {522
return "", imageLog(p.Name, p.From, p.From, "", nil, nil), missing523
}524
return image, dockerImageLines(image, "", nil), missing525
}526
p, ok := images.Find(set, image)527
if !ok {528
id, digests := r.inspectImage(ctx, image)529
return image, dockerImageLines(image, id, digests), nil530
}531
ref, built, err := p.Ensure(ctx, r.Docker)532
if err != nil {533
return "", imageLog(p.Name, p.From, "", "", nil, nil), fmt.Errorf("runner_system_failure: preset %s: %w", p.Name, err)534
}535
var lines []string536
if built {537
lines = append(lines, fmt.Sprintf("Building image preset %s ...", p.Name))538
}539
id, digests := r.inspectImage(ctx, ref)540
var baseDigests []string541
if ref != p.From {542
_, baseDigests = r.inspectImage(ctx, p.From)543
}544
lines = append(lines, imageLog(p.Name, p.From, ref, id, digests, baseDigests)...)545
return ref, lines, nil546
}547
548
func imageLog(preset, base, ref, id string, digests, baseDigests []string) []string {549
var lines []string550
if preset != "" {551
lines = append(lines, fmt.Sprintf("Using image preset %s based on %s", preset, base))552
}553
if ref == "" {554
return lines555
}556
lines = append(lines, dockerImageLines(ref, id, digests)...)557
if preset != "" && ref != base {558
digest := matchingDigest(base, baseDigests)559
if digest == "" && len(baseDigests) > 0 {560
digest = strings.TrimSpace(baseDigests[0])561
}562
if digest != "" {563
lines = append(lines, fmt.Sprintf("Underlying image %s with digest %s ...", base, digest))564
} else {565
lines = append(lines, fmt.Sprintf("Underlying image %s ...", base))566
}567
}568
return lines569
}570
571
func (r *Runner) inspectImage(ctx context.Context, image string) (string, []string) {572
if strings.TrimSpace(image) == "" || r.Docker == "" {573
return "", nil574
}575
out, err := execOut(ctx, r.Docker, "image", "inspect", "--format", "{{.Id}}\n{{range .RepoDigests}}{{.}}\n{{end}}", image)576
if err != nil {577
return "", nil578
}579
return parseImageInspect(out)580
}581
582
func parseImageInspect(out string) (string, []string) {583
lines := strings.Split(out, "\n")584
id := ""585
if len(lines) > 0 {586
id = strings.TrimSpace(lines[0])587
}588
var digests []string589
for _, line := range lines[1:] {590
line = strings.TrimSpace(line)591
if line != "" {592
digests = append(digests, line)593
}594
}595
return id, digests596
}597
598
func dockerImageLines(image, id string, digests []string) []string {599
image = strings.TrimSpace(image)600
lines := []string{fmt.Sprintf("Using docker image %s ...", image)}601
id = strings.TrimSpace(id)602
digest := matchingDigest(image, digests)603
switch {604
case id != "" && digest != "":605
lines = append(lines, fmt.Sprintf("Using docker image %s for %s with digest %s ...", id, image, digest))606
case digest != "":607
lines = append(lines, fmt.Sprintf("Using digest %s for %s ...", digest, image))608
case id != "":609
lines = append(lines, fmt.Sprintf("Using docker image %s for %s ...", id, image))610
}611
return lines612
}613
614
func matchingDigest(image string, digests []string) string {615
name := imageName(image)616
fallback := ""617
for _, digest := range digests {618
digest = strings.TrimSpace(digest)619
at := strings.LastIndex(digest, "@")620
if digest == "" || at <= 0 {621
continue622
}623
if fallback == "" {624
fallback = digest625
}626
repo := digest[:at]627
if repo == name || strings.HasSuffix(repo, "/"+name) || imageName(repo) == name {628
return digest629
}630
}631
return fallback632
}633
634
func imageName(image string) string {635
image = strings.TrimSpace(image)636
if i := strings.LastIndex(image, "@"); i >= 0 {637
image = image[:i]638
}639
slash := strings.LastIndex(image, "/")640
name := image641
if slash >= 0 {642
name = image[slash+1:]643
}644
if i := strings.Index(name, ":"); i >= 0 {645
name = name[:i]646
}647
return name648
}649
425
func (r *Runner) materialize(ctx context.Context, p store.Pipeline, job store.Job, work string) error {650
func (r *Runner) materialize(ctx context.Context, p store.Pipeline, job store.Job, work string) error {426
jobs, err := r.Store.JobsByPipeline(ctx, p.ID)651
jobs, err := r.Store.JobsByPipeline(ctx, p.ID)427
if err != nil {652
if err != nil {@@ -0,0 +1,22 @@
1
package runner
2
3
import "testing"
4
5
func TestAcquireSlotStopsAtConcurrency(t *testing.T) {
6
r := &Runner{slots: make(chan struct{}, 1)}
7
if !r.acquireSlot() {
8
t.Fatal("eerste slot")
9
}
10
if r.acquireSlot() {
11
t.Fatal("tweede slot hoort vol te zijn")
12
}
13
r.releaseSlot()
14
if !r.acquireSlot() {
15
t.Fatal("na vrijgeven")
16
}
17
open := &Runner{}
18
if !open.acquireSlot() {
19
t.Fatal("zonder limiet")
20
}
21
open.releaseSlot()
22
}
@@ -0,0 +1,22 @@1
package runner2
3
import "testing"4
5
func TestAcquireSlotStopsAtConcurrency(t *testing.T) {6
r := &Runner{slots: make(chan struct{}, 1)}7
if !r.acquireSlot() {8
t.Fatal("eerste slot")9
}10
if r.acquireSlot() {11
t.Fatal("tweede slot hoort vol te zijn")12
}13
r.releaseSlot()14
if !r.acquireSlot() {15
t.Fatal("na vrijgeven")16
}17
open := &Runner{}18
if !open.acquireSlot() {19
t.Fatal("zonder limiet")20
}21
open.releaseSlot()22
}@@ -41,6 +41,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
41
41
token := bearer(r)
42
42
var job store.Job
43
43
var author int64
44
var actor store.User
44
45
if strings.HasPrefix(token, "bgj_") {
45
46
job, err = s.Store.JobByToken(r.Context(), token)
46
47
if err != nil || job.RepoID != repo.ID || job.Status != "running" {
@@ -59,6 +60,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
59
60
return
60
61
}
61
62
author = u.ID
63
actor = u
62
64
} else {
63
65
http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)
64
66
return
@@ -118,7 +120,9 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {
118
120
}
119
121
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})
120
122
}
121
if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {
123
if err := s.postReceive(r.Context(), repo, actor, dir, func() error {
124
return gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name)
125
}); err != nil {
122
126
http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)
123
127
return
124
128
}
@@ -41,6 +41,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {41
token := bearer(r)41
token := bearer(r)42
var job store.Job42
var job store.Job43
var author int6443
var author int6444
var actor store.User44
if strings.HasPrefix(token, "bgj_") {45
if strings.HasPrefix(token, "bgj_") {45
job, err = s.Store.JobByToken(r.Context(), token)46
job, err = s.Store.JobByToken(r.Context(), token)46
if err != nil || job.RepoID != repo.ID || job.Status != "running" {47
if err != nil || job.RepoID != repo.ID || job.Status != "running" {@@ -59,6 +60,7 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {59
return60
return60
}61
}61
author = u.ID62
author = u.ID63
actor = u62
} else {64
} else {63
http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)65
http.Error(w, s.tr(r, "err.tokenAbsent"), http.StatusUnauthorized)64
return66
return@@ -118,7 +120,9 @@ func (s *Server) createRelease(w http.ResponseWriter, r *http.Request) {118
}120
}119
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})121
assets = append(assets, store.ReleaseAsset{Name: a.Name, StoragePath: dst, Size: info.Size()})120
}122
}121
if err := gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name); err != nil {123
if err := s.postReceive(r.Context(), repo, actor, dir, func() error {124
return gitrepo.Tag(r.Context(), s.Git, dir, req.Tag, req.Commit, req.Name)125
}); err != nil {122
http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)126
http.Error(w, s.tr(r, "err.tagFail", err.Error()), http.StatusBadRequest)123
return127
return124
}128
}@@ -0,0 +1,189 @@
1
package server
2
3
import (
4
"net/http"
5
"net/http/cookiejar"
6
"net/http/httptest"
7
"net/url"
8
"os/exec"
9
"path/filepath"
10
"strings"
11
"testing"
12
13
"gitlab.com/Timfa/bluegit/internal/auth"
14
"gitlab.com/Timfa/bluegit/internal/config"
15
"gitlab.com/Timfa/bluegit/internal/store"
16
)
17
18
func TestBranchesAndMergeRequest(t *testing.T) {
19
if _, err := exec.LookPath("git"); err != nil {
20
t.Skip("git ontbreekt")
21
}
22
storage := t.TempDir()
23
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24
if err != nil {
25
t.Fatal(err)
26
}
27
t.Cleanup(func() { _ = st.Close() })
28
cfg := config.Config{
29
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
31
Git: config.Git{Binary: "git", DefaultBranch: "master"},
32
}
33
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
34
ts := httptest.NewServer(srv.Handler())
35
t.Cleanup(ts.Close)
36
jar, _ := cookiejar.New(nil)
37
tim := &http.Client{Jar: jar}
38
page := read(t, mustGet(t, tim, ts.URL+"/login"))
39
page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
40
"csrf": {csrfOf(t, page)}, "name": {"takken"}, "visibility": {"public"},
41
}))
42
page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{
43
"csrf": {csrfOf(t, page)}, "name": {"laptop"},
44
}))
45
token := between(page, `<p class="code">`, "</p>")
46
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/takken.git"
47
work := t.TempDir()
48
git(t, work, "init", "-b", "master")
49
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
50
git(t, work, "config", "user.name", "tim")
51
writeFile(t, filepath.Join(work, "hello.txt"), "alpha\n")
52
git(t, work, "add", "hello.txt")
53
git(t, work, "commit", "-m", "start")
54
git(t, work, "remote", "add", "origin", remote)
55
git(t, work, "push", "-u", "origin", "master")
56
git(t, work, "checkout", "-b", "topic")
57
writeFile(t, filepath.Join(work, "hello.txt"), "beta\n")
58
git(t, work, "add", "hello.txt")
59
git(t, work, "commit", "-m", "onderwerp-xyz")
60
git(t, work, "push", "-u", "origin", "topic")
61
62
page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))
63
for _, want := range []string{"data-branch-filter", "topic", "default", "1 ahead", "master"} {
64
if !strings.Contains(page, want) {
65
t.Fatalf("branchpagina mist %q", want)
66
}
67
}
68
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
69
"csrf": {csrfOf(t, page)}, "name": {"master"}, "confirm": {"master"},
70
}))
71
if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, ">master<") && !strings.Contains(page, ">master</a>") {
72
if !strings.Contains(page, "master") {
73
t.Fatalf("standaardbranch weg:\n%s", page)
74
}
75
}
76
if !strings.Contains(page, "cannot be renamed or deleted") {
77
t.Fatalf("geen blokkade voor master:\n%s", page)
78
}
79
80
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/protected", url.Values{
81
"csrf": {csrfOf(t, page)}, "pattern": {"locked"},
82
}))
83
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{
84
"csrf": {csrfOf(t, page)}, "name": {"locked"}, "from": {"master"},
85
}))
86
if !strings.Contains(page, "locked") {
87
t.Fatalf("branch locked ontbreekt:\n%s", page)
88
}
89
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
90
"csrf": {csrfOf(t, page)}, "name": {"locked"}, "confirm": {"locked"},
91
}))
92
if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, "locked") {
93
t.Fatalf("beschermde branch verwijderd:\n%s", page)
94
}
95
96
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{
97
"csrf": {csrfOf(t, page)}, "name": {"wip"}, "from": {"topic"},
98
}))
99
if !strings.Contains(page, "wip") {
100
t.Fatalf("wip ontbreekt:\n%s", page)
101
}
102
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/rename", url.Values{
103
"csrf": {csrfOf(t, page)}, "name": {"wip"}, "new_name": {"wip2"}, "confirm": {"wip"},
104
}))
105
if !strings.Contains(page, "wip2") || strings.Contains(page, ">wip<") {
106
t.Fatalf("hernoemen:\n%s", page)
107
}
108
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
109
"csrf": {csrfOf(t, page)}, "name": {"wip2"}, "confirm": {"wip2"},
110
}))
111
if strings.Contains(page, "wip2") {
112
t.Fatalf("wip2 bleef staan:\n%s", page)
113
}
114
115
preview := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/new?source=topic&target=master"))
116
if !strings.Contains(preview, "onderwerp-xyz") || !strings.Contains(preview, "hello.txt") || !strings.Contains(preview, "data-md-box") {
117
t.Fatalf("voorvertoning:\n%s", preview)
118
}
119
md := read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/markdown", url.Values{
120
"csrf": {csrfOf(t, preview)}, "body": {"**vet** <script>alert(1)</script>"},
121
}))
122
if !strings.Contains(md, "<strong>vet</strong>") || !strings.Contains(md, "<script>") || strings.Contains(md, "<script>") {
123
t.Fatalf("markdown:\n%s", md)
124
}
125
126
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests", url.Values{
127
"csrf": {csrfOf(t, preview)}, "title": {"Onderwerp"}, "description": {"**vet** <script>alert(1)</script>"},
128
"source": {"topic"}, "target": {"master"}, "draft": {"1"},
129
}))
130
if !strings.Contains(page, "Draft") || !strings.Contains(page, "This merge request is a draft.") || !strings.Contains(page, "<strong>vet</strong>") || strings.Contains(page, "<script>") {
131
t.Fatalf("concept:\n%s", page)
132
}
133
if !strings.Contains(page, "disabled") {
134
t.Fatalf("concept hoort mergen te blokkeren:\n%s", page)
135
}
136
if !strings.Contains(page, "mr.overview") && !strings.Contains(page, "Overview") {
137
t.Fatalf("tabs:\n%s", page)
138
}
139
if !strings.Contains(page, "opened this merge request") {
140
t.Fatalf("tijdlijn:\n%s", page)
141
}
142
143
branches := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))
144
if !strings.Contains(branches, "/-/merge-requests/1") {
145
t.Fatalf("mr-link:\n%s", branches)
146
}
147
148
writeFile(t, filepath.Join(work, "hello.txt"), "gamma\n")
149
git(t, work, "add", "hello.txt")
150
git(t, work, "commit", "-m", "tweede-stap")
151
git(t, work, "push", "origin", "topic")
152
page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1"))
153
if !strings.Contains(page, "tweede-stap") || !strings.Contains(page, "pushed") {
154
t.Fatalf("push ververst de tijdlijn niet:\n%s", page)
155
}
156
changes := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1?tab=changes"))
157
if !strings.Contains(changes, "hello.txt") || !strings.Contains(changes, `class="gutter"`) {
158
t.Fatalf("wijzigingen:\n%s", changes)
159
}
160
161
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{
162
"csrf": {csrfOf(t, page)}, "body": {"eerste reactie"},
163
}))
164
noteID := between(page, `data-reply="`, `"`)
165
if noteID == "" || !strings.Contains(page, "eerste reactie") {
166
t.Fatalf("reactie:\n%s", page)
167
}
168
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{
169
"csrf": {csrfOf(t, page)}, "parent": {noteID}, "body": {"**antwoord**"},
170
}))
171
if !strings.Contains(page, "<strong>antwoord</strong>") {
172
t.Fatalf("antwoord:\n%s", page)
173
}
174
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1", url.Values{
175
"csrf": {csrfOf(t, page)}, "title": {"Nieuwe titel"}, "description": {"**vet**"}, "labels": {"bug, docs"},
176
}))
177
if !strings.Contains(page, "Nieuwe titel") || !strings.Contains(page, "changed the title") || !strings.Contains(page, "bug") {
178
t.Fatalf("bewerken:\n%s", page)
179
}
180
}
181
182
func mustPost(t *testing.T, c *http.Client, raw string, form url.Values) *http.Response {
183
t.Helper()
184
res, err := c.PostForm(raw, form)
185
if err != nil {
186
t.Fatal(err)
187
}
188
return res
189
}
@@ -0,0 +1,189 @@1
package server2
3
import (4
"net/http"5
"net/http/cookiejar"6
"net/http/httptest"7
"net/url"8
"os/exec"9
"path/filepath"10
"strings"11
"testing"12
13
"gitlab.com/Timfa/bluegit/internal/auth"14
"gitlab.com/Timfa/bluegit/internal/config"15
"gitlab.com/Timfa/bluegit/internal/store"16
)17
18
func TestBranchesAndMergeRequest(t *testing.T) {19
if _, err := exec.LookPath("git"); err != nil {20
t.Skip("git ontbreekt")21
}22
storage := t.TempDir()23
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())24
if err != nil {25
t.Fatal(err)26
}27
t.Cleanup(func() { _ = st.Close() })28
cfg := config.Config{29
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,30
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},31
Git: config.Git{Binary: "git", DefaultBranch: "master"},32
}33
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}34
ts := httptest.NewServer(srv.Handler())35
t.Cleanup(ts.Close)36
jar, _ := cookiejar.New(nil)37
tim := &http.Client{Jar: jar}38
page := read(t, mustGet(t, tim, ts.URL+"/login"))39
page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{40
"csrf": {csrfOf(t, page)}, "name": {"takken"}, "visibility": {"public"},41
}))42
page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{43
"csrf": {csrfOf(t, page)}, "name": {"laptop"},44
}))45
token := between(page, `<p class="code">`, "</p>")46
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/takken.git"47
work := t.TempDir()48
git(t, work, "init", "-b", "master")49
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")50
git(t, work, "config", "user.name", "tim")51
writeFile(t, filepath.Join(work, "hello.txt"), "alpha\n")52
git(t, work, "add", "hello.txt")53
git(t, work, "commit", "-m", "start")54
git(t, work, "remote", "add", "origin", remote)55
git(t, work, "push", "-u", "origin", "master")56
git(t, work, "checkout", "-b", "topic")57
writeFile(t, filepath.Join(work, "hello.txt"), "beta\n")58
git(t, work, "add", "hello.txt")59
git(t, work, "commit", "-m", "onderwerp-xyz")60
git(t, work, "push", "-u", "origin", "topic")61
62
page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))63
for _, want := range []string{"data-branch-filter", "topic", "default", "1 ahead", "master"} {64
if !strings.Contains(page, want) {65
t.Fatalf("branchpagina mist %q", want)66
}67
}68
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{69
"csrf": {csrfOf(t, page)}, "name": {"master"}, "confirm": {"master"},70
}))71
if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, ">master<") && !strings.Contains(page, ">master</a>") {72
if !strings.Contains(page, "master") {73
t.Fatalf("standaardbranch weg:\n%s", page)74
}75
}76
if !strings.Contains(page, "cannot be renamed or deleted") {77
t.Fatalf("geen blokkade voor master:\n%s", page)78
}79
80
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/protected", url.Values{81
"csrf": {csrfOf(t, page)}, "pattern": {"locked"},82
}))83
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{84
"csrf": {csrfOf(t, page)}, "name": {"locked"}, "from": {"master"},85
}))86
if !strings.Contains(page, "locked") {87
t.Fatalf("branch locked ontbreekt:\n%s", page)88
}89
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{90
"csrf": {csrfOf(t, page)}, "name": {"locked"}, "confirm": {"locked"},91
}))92
if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, "locked") {93
t.Fatalf("beschermde branch verwijderd:\n%s", page)94
}95
96
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{97
"csrf": {csrfOf(t, page)}, "name": {"wip"}, "from": {"topic"},98
}))99
if !strings.Contains(page, "wip") {100
t.Fatalf("wip ontbreekt:\n%s", page)101
}102
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/rename", url.Values{103
"csrf": {csrfOf(t, page)}, "name": {"wip"}, "new_name": {"wip2"}, "confirm": {"wip"},104
}))105
if !strings.Contains(page, "wip2") || strings.Contains(page, ">wip<") {106
t.Fatalf("hernoemen:\n%s", page)107
}108
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{109
"csrf": {csrfOf(t, page)}, "name": {"wip2"}, "confirm": {"wip2"},110
}))111
if strings.Contains(page, "wip2") {112
t.Fatalf("wip2 bleef staan:\n%s", page)113
}114
115
preview := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/new?source=topic&target=master"))116
if !strings.Contains(preview, "onderwerp-xyz") || !strings.Contains(preview, "hello.txt") || !strings.Contains(preview, "data-md-box") {117
t.Fatalf("voorvertoning:\n%s", preview)118
}119
md := read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/markdown", url.Values{120
"csrf": {csrfOf(t, preview)}, "body": {"**vet** <script>alert(1)</script>"},121
}))122
if !strings.Contains(md, "<strong>vet</strong>") || !strings.Contains(md, "<script>") || strings.Contains(md, "<script>") {123
t.Fatalf("markdown:\n%s", md)124
}125
126
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests", url.Values{127
"csrf": {csrfOf(t, preview)}, "title": {"Onderwerp"}, "description": {"**vet** <script>alert(1)</script>"},128
"source": {"topic"}, "target": {"master"}, "draft": {"1"},129
}))130
if !strings.Contains(page, "Draft") || !strings.Contains(page, "This merge request is a draft.") || !strings.Contains(page, "<strong>vet</strong>") || strings.Contains(page, "<script>") {131
t.Fatalf("concept:\n%s", page)132
}133
if !strings.Contains(page, "disabled") {134
t.Fatalf("concept hoort mergen te blokkeren:\n%s", page)135
}136
if !strings.Contains(page, "mr.overview") && !strings.Contains(page, "Overview") {137
t.Fatalf("tabs:\n%s", page)138
}139
if !strings.Contains(page, "opened this merge request") {140
t.Fatalf("tijdlijn:\n%s", page)141
}142
143
branches := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))144
if !strings.Contains(branches, "/-/merge-requests/1") {145
t.Fatalf("mr-link:\n%s", branches)146
}147
148
writeFile(t, filepath.Join(work, "hello.txt"), "gamma\n")149
git(t, work, "add", "hello.txt")150
git(t, work, "commit", "-m", "tweede-stap")151
git(t, work, "push", "origin", "topic")152
page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1"))153
if !strings.Contains(page, "tweede-stap") || !strings.Contains(page, "pushed") {154
t.Fatalf("push ververst de tijdlijn niet:\n%s", page)155
}156
changes := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1?tab=changes"))157
if !strings.Contains(changes, "hello.txt") || !strings.Contains(changes, `class="gutter"`) {158
t.Fatalf("wijzigingen:\n%s", changes)159
}160
161
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{162
"csrf": {csrfOf(t, page)}, "body": {"eerste reactie"},163
}))164
noteID := between(page, `data-reply="`, `"`)165
if noteID == "" || !strings.Contains(page, "eerste reactie") {166
t.Fatalf("reactie:\n%s", page)167
}168
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{169
"csrf": {csrfOf(t, page)}, "parent": {noteID}, "body": {"**antwoord**"},170
}))171
if !strings.Contains(page, "<strong>antwoord</strong>") {172
t.Fatalf("antwoord:\n%s", page)173
}174
page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1", url.Values{175
"csrf": {csrfOf(t, page)}, "title": {"Nieuwe titel"}, "description": {"**vet**"}, "labels": {"bug, docs"},176
}))177
if !strings.Contains(page, "Nieuwe titel") || !strings.Contains(page, "changed the title") || !strings.Contains(page, "bug") {178
t.Fatalf("bewerken:\n%s", page)179
}180
}181
182
func mustPost(t *testing.T, c *http.Client, raw string, form url.Values) *http.Response {183
t.Helper()184
res, err := c.PostForm(raw, form)185
if err != nil {186
t.Fatal(err)187
}188
return res189
}@@ -0,0 +1,175 @@
1
package server
2
3
import (
4
"net/http"
5
"sort"
6
"strings"
7
8
"gitlab.com/Timfa/bluegit/internal/access"
9
"gitlab.com/Timfa/bluegit/internal/gitrepo"
10
"gitlab.com/Timfa/bluegit/internal/names"
11
"gitlab.com/Timfa/bluegit/internal/store"
12
)
13
14
func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
15
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)
16
if !ok {
17
return
18
}
19
v := s.repoView(w, r, repo, role, "title.branches")
20
v.Page = "branches"
21
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
22
tips, _ := gitrepo.BranchTips(r.Context(), s.Git, dir)
23
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
24
for _, tip := range tips {
25
row := BranchRow{
26
Name: tip.Name, SHA: tip.SHA, Short: shortSHA(tip.SHA),
27
Subject: tip.Subject, When: tip.Date,
28
Protected: access.BranchProtected(patterns, tip.Name),
29
Default: tip.Name == repo.DefaultBranch,
30
}
31
if !row.Default && repo.DefaultBranch != "" {
32
ahead, behind, err := gitrepo.AheadBehind(r.Context(), s.Git, dir, repo.DefaultBranch, tip.Name)
33
if err == nil {
34
row.Ahead, row.Behind = ahead, behind
35
}
36
}
37
if p, err := s.Store.LatestPipelineByCommit(r.Context(), repo.ID, tip.SHA); err == nil {
38
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
39
row.PipeID = p.ID
40
row.PipeStatus = displayStatus(p.Status, jobs)
41
row.PipeLabel = s.tr(r, "pipe."+row.PipeStatus)
42
}
43
if mrs, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, tip.Name); err == nil && len(mrs) > 0 {
44
row.MRNumber = mrs[0].Number
45
}
46
v.Branches = append(v.Branches, row)
47
}
48
sort.Slice(v.Branches, func(i, j int) bool {
49
if v.Branches[i].Default != v.Branches[j].Default {
50
return v.Branches[i].Default
51
}
52
return v.Branches[i].Name < v.Branches[j].Name
53
})
54
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
55
for _, name := range tags {
56
v.Tags = append(v.Tags, TagRow{Name: name})
57
}
58
s.render(w, "branches", v)
59
}
60
61
func (s *Server) createBranch(w http.ResponseWriter, r *http.Request) {
62
u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
63
if !ok || !s.csrfOK(w, r) {
64
return
65
}
66
back := repoURL(repo) + "/-/branches"
67
if !role.CanWriteCode() {
68
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
69
return
70
}
71
name := strings.TrimSpace(r.FormValue("name"))
72
if err := names.ValidBranch(name); err != nil {
73
s.redirect(w, r, back, "", s.trErr(r, err))
74
return
75
}
76
from := safeRev(r.FormValue("from"), repo.DefaultBranch)
77
if from == "" {
78
s.redirect(w, r, back, "", s.tr(r, "err.branches"))
79
return
80
}
81
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
82
if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) != "" {
83
s.redirect(w, r, back, "", s.tr(r, "err.branchName", name))
84
return
85
}
86
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
87
return gitrepo.CreateBranch(r.Context(), s.Git, dir, name, from)
88
}); err != nil {
89
s.redirect(w, r, back, "", s.commitProblem(r, err))
90
return
91
}
92
s.redirect(w, r, back, s.tr(r, "flash.branchCreated"), "")
93
}
94
95
func (s *Server) deleteBranch(w http.ResponseWriter, r *http.Request) {
96
u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
97
if !ok || !s.csrfOK(w, r) {
98
return
99
}
100
back := repoURL(repo) + "/-/branches"
101
if !role.CanWriteCode() {
102
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
103
return
104
}
105
name := strings.TrimSpace(r.FormValue("name"))
106
if r.FormValue("confirm") != name || name == "" {
107
s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))
108
return
109
}
110
if locked, text := s.branchLocked(r, repo, name); locked {
111
s.redirect(w, r, back, "", text)
112
return
113
}
114
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
115
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
116
return gitrepo.DeleteBranch(r.Context(), s.Git, dir, name)
117
}); err != nil {
118
s.redirect(w, r, back, "", s.commitProblem(r, err))
119
return
120
}
121
s.redirect(w, r, back, s.tr(r, "flash.branchDeleted"), "")
122
}
123
124
func (s *Server) renameBranch(w http.ResponseWriter, r *http.Request) {
125
u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
126
if !ok || !s.csrfOK(w, r) {
127
return
128
}
129
back := repoURL(repo) + "/-/branches"
130
if !role.CanWriteCode() {
131
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
132
return
133
}
134
name := strings.TrimSpace(r.FormValue("name"))
135
newName := strings.TrimSpace(r.FormValue("new_name"))
136
if r.FormValue("confirm") != name || name == "" {
137
s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))
138
return
139
}
140
if err := names.ValidBranch(newName); err != nil {
141
s.redirect(w, r, back, "", s.trErr(r, err))
142
return
143
}
144
if locked, text := s.branchLocked(r, repo, name); locked {
145
s.redirect(w, r, back, "", text)
146
return
147
}
148
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149
if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+newName) != "" {
150
s.redirect(w, r, back, "", s.tr(r, "err.branchName", newName))
151
return
152
}
153
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
154
if err := gitrepo.RenameBranch(r.Context(), s.Git, dir, name, newName); err != nil {
155
return err
156
}
157
return s.Store.RenameOpenMRBranches(r.Context(), repo.ID, name, newName)
158
}); err != nil {
159
s.redirect(w, r, back, "", s.commitProblem(r, err))
160
return
161
}
162
s.redirect(w, r, back, s.tr(r, "flash.branchRenamed"), "")
163
}
164
165
// branchLocked weigert de standaardbranch en elke beschermde branch, ook voor een beheerder.
166
func (s *Server) branchLocked(r *http.Request, repo store.Repo, name string) (bool, string) {
167
if name == repo.DefaultBranch {
168
return true, s.tr(r, "err.branchLocked", name)
169
}
170
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
171
if access.BranchProtected(patterns, name) {
172
return true, s.tr(r, "err.branchLocked", name)
173
}
174
return false, ""
175
}
@@ -0,0 +1,175 @@1
package server2
3
import (4
"net/http"5
"sort"6
"strings"7
8
"gitlab.com/Timfa/bluegit/internal/access"9
"gitlab.com/Timfa/bluegit/internal/gitrepo"10
"gitlab.com/Timfa/bluegit/internal/names"11
"gitlab.com/Timfa/bluegit/internal/store"12
)13
14
func (s *Server) branches(w http.ResponseWriter, r *http.Request) {15
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)16
if !ok {17
return18
}19
v := s.repoView(w, r, repo, role, "title.branches")20
v.Page = "branches"21
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)22
tips, _ := gitrepo.BranchTips(r.Context(), s.Git, dir)23
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)24
for _, tip := range tips {25
row := BranchRow{26
Name: tip.Name, SHA: tip.SHA, Short: shortSHA(tip.SHA),27
Subject: tip.Subject, When: tip.Date,28
Protected: access.BranchProtected(patterns, tip.Name),29
Default: tip.Name == repo.DefaultBranch,30
}31
if !row.Default && repo.DefaultBranch != "" {32
ahead, behind, err := gitrepo.AheadBehind(r.Context(), s.Git, dir, repo.DefaultBranch, tip.Name)33
if err == nil {34
row.Ahead, row.Behind = ahead, behind35
}36
}37
if p, err := s.Store.LatestPipelineByCommit(r.Context(), repo.ID, tip.SHA); err == nil {38
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)39
row.PipeID = p.ID40
row.PipeStatus = displayStatus(p.Status, jobs)41
row.PipeLabel = s.tr(r, "pipe."+row.PipeStatus)42
}43
if mrs, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, tip.Name); err == nil && len(mrs) > 0 {44
row.MRNumber = mrs[0].Number45
}46
v.Branches = append(v.Branches, row)47
}48
sort.Slice(v.Branches, func(i, j int) bool {49
if v.Branches[i].Default != v.Branches[j].Default {50
return v.Branches[i].Default51
}52
return v.Branches[i].Name < v.Branches[j].Name53
})54
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)55
for _, name := range tags {56
v.Tags = append(v.Tags, TagRow{Name: name})57
}58
s.render(w, "branches", v)59
}60
61
func (s *Server) createBranch(w http.ResponseWriter, r *http.Request) {62
u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)63
if !ok || !s.csrfOK(w, r) {64
return65
}66
back := repoURL(repo) + "/-/branches"67
if !role.CanWriteCode() {68
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)69
return70
}71
name := strings.TrimSpace(r.FormValue("name"))72
if err := names.ValidBranch(name); err != nil {73
s.redirect(w, r, back, "", s.trErr(r, err))74
return75
}76
from := safeRev(r.FormValue("from"), repo.DefaultBranch)77
if from == "" {78
s.redirect(w, r, back, "", s.tr(r, "err.branches"))79
return80
}81
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)82
if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) != "" {83
s.redirect(w, r, back, "", s.tr(r, "err.branchName", name))84
return85
}86
if err := s.postReceive(r.Context(), repo, u, dir, func() error {87
return gitrepo.CreateBranch(r.Context(), s.Git, dir, name, from)88
}); err != nil {89
s.redirect(w, r, back, "", s.commitProblem(r, err))90
return91
}92
s.redirect(w, r, back, s.tr(r, "flash.branchCreated"), "")93
}94
95
func (s *Server) deleteBranch(w http.ResponseWriter, r *http.Request) {96
u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)97
if !ok || !s.csrfOK(w, r) {98
return99
}100
back := repoURL(repo) + "/-/branches"101
if !role.CanWriteCode() {102
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)103
return104
}105
name := strings.TrimSpace(r.FormValue("name"))106
if r.FormValue("confirm") != name || name == "" {107
s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))108
return109
}110
if locked, text := s.branchLocked(r, repo, name); locked {111
s.redirect(w, r, back, "", text)112
return113
}114
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)115
if err := s.postReceive(r.Context(), repo, u, dir, func() error {116
return gitrepo.DeleteBranch(r.Context(), s.Git, dir, name)117
}); err != nil {118
s.redirect(w, r, back, "", s.commitProblem(r, err))119
return120
}121
s.redirect(w, r, back, s.tr(r, "flash.branchDeleted"), "")122
}123
124
func (s *Server) renameBranch(w http.ResponseWriter, r *http.Request) {125
u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)126
if !ok || !s.csrfOK(w, r) {127
return128
}129
back := repoURL(repo) + "/-/branches"130
if !role.CanWriteCode() {131
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)132
return133
}134
name := strings.TrimSpace(r.FormValue("name"))135
newName := strings.TrimSpace(r.FormValue("new_name"))136
if r.FormValue("confirm") != name || name == "" {137
s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))138
return139
}140
if err := names.ValidBranch(newName); err != nil {141
s.redirect(w, r, back, "", s.trErr(r, err))142
return143
}144
if locked, text := s.branchLocked(r, repo, name); locked {145
s.redirect(w, r, back, "", text)146
return147
}148
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)149
if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+newName) != "" {150
s.redirect(w, r, back, "", s.tr(r, "err.branchName", newName))151
return152
}153
if err := s.postReceive(r.Context(), repo, u, dir, func() error {154
if err := gitrepo.RenameBranch(r.Context(), s.Git, dir, name, newName); err != nil {155
return err156
}157
return s.Store.RenameOpenMRBranches(r.Context(), repo.ID, name, newName)158
}); err != nil {159
s.redirect(w, r, back, "", s.commitProblem(r, err))160
return161
}162
s.redirect(w, r, back, s.tr(r, "flash.branchRenamed"), "")163
}164
165
// branchLocked weigert de standaardbranch en elke beschermde branch, ook voor een beheerder.166
func (s *Server) branchLocked(r *http.Request, repo store.Repo, name string) (bool, string) {167
if name == repo.DefaultBranch {168
return true, s.tr(r, "err.branchLocked", name)169
}170
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)171
if access.BranchProtected(patterns, name) {172
return true, s.tr(r, "err.branchLocked", name)173
}174
return false, ""175
}@@ -0,0 +1,270 @@
1
package server
2
3
import (
4
"html"
5
"html/template"
6
"net/url"
7
"sort"
8
"strconv"
9
"strings"
10
11
"gitlab.com/Timfa/bluegit/internal/gitrepo"
12
"gitlab.com/Timfa/bluegit/internal/highlight"
13
)
14
15
// largeChange is het aantal toegevoegde en verwijderde regels waarna een diff dicht blijft.
16
const largeChange = 200
17
18
// CommitDiff is de diff van één commit.
19
type CommitDiff struct {
20
Parents []ParentSHA
21
Files []CommitFile
22
Tree []CommitTreeRow
23
Added, Deleted, FilesN int
24
}
25
26
// ParentSHA is een parent van de commit.
27
type ParentSHA struct {
28
SHA, Short string
29
}
30
31
// CommitFile is één gewijzigd bestand, in unified en side-by-side vorm.
32
type CommitFile struct {
33
Path, OldPath, Status, Anchor, FileURL string
34
Added, Deleted int
35
Binary, Collapsed, HasBody bool
36
Lines []CommitLine
37
Pairs []CommitPair
38
}
39
40
// CommitLine is één unified diffregel. HTML is al geëscaped.
41
type CommitLine struct {
42
Kind string
43
Old int
44
New int
45
HTML template.HTML
46
Notes []NoteRow
47
}
48
49
// CommitPair is één rij in de naast-elkaar-weergave.
50
type CommitPair struct {
51
Hunk string
52
LKind, RKind string
53
LNo, RNo int
54
LHTML, RHTML template.HTML
55
}
56
57
// CommitTreeRow is een map of bestand in de boom.
58
type CommitTreeRow struct {
59
Name, Path, Anchor, Status, Icon string
60
Dir bool
61
Depth, Added, Deleted int
62
}
63
64
func presentCommitDiff(repoPath, sha string, parents []string, files []gitrepo.PatchFile) *CommitDiff {
65
d := &CommitDiff{}
66
for _, p := range parents {
67
if !safeSHA(p) {
68
continue
69
}
70
d.Parents = append(d.Parents, ParentSHA{SHA: p, Short: shortSHA(p)})
71
}
72
parent := ""
73
if len(d.Parents) > 0 {
74
parent = d.Parents[0].SHA
75
}
76
seen := map[string]int{}
77
for _, f := range files {
78
if f.Path == "" {
79
continue
80
}
81
cf := CommitFile{
82
Path: f.Path, OldPath: f.OldPath, Status: f.Status,
83
Added: f.Added, Deleted: f.Deleted, Binary: f.Binary,
84
Anchor: diffAnchor(f.Path, seen),
85
Collapsed: !f.Binary && f.Added+f.Deleted > largeChange,
86
}
87
linkPath := f.Path
88
linkRev := sha
89
if f.Status == "deleted" {
90
linkPath = f.Path
91
linkRev = parent
92
}
93
if linkRev != "" {
94
cf.FileURL = blobLink(repoPath, linkRev, linkPath)
95
}
96
if f.Binary || len(f.Lines) > 0 {
97
cf.HasBody = true
98
}
99
if !f.Binary && len(f.Lines) > 0 {
100
name := f.Path
101
if f.Status == "deleted" {
102
name = f.Path
103
}
104
painter := highlight.NewPainter(name)
105
for _, ln := range f.Lines {
106
row := CommitLine{Kind: ln.Kind, Old: ln.Old, New: ln.New}
107
if ln.Kind == "hunk" {
108
row.HTML = template.HTML(html.EscapeString(ln.Text))
109
} else {
110
row.HTML = template.HTML(painter.Line(ln.Text))
111
}
112
cf.Lines = append(cf.Lines, row)
113
}
114
cf.Pairs = pairDiff(cf.Lines)
115
}
116
d.Added += cf.Added
117
d.Deleted += cf.Deleted
118
d.Files = append(d.Files, cf)
119
}
120
d.FilesN = len(d.Files)
121
d.Tree = commitTree(d.Files)
122
return d
123
}
124
125
func pairDiff(lines []CommitLine) []CommitPair {
126
var out []CommitPair
127
for i := 0; i < len(lines); {
128
ln := lines[i]
129
if ln.Kind == "hunk" {
130
out = append(out, CommitPair{Hunk: html.UnescapeString(string(ln.HTML))})
131
i++
132
continue
133
}
134
if ln.Kind == "ctx" {
135
out = append(out, CommitPair{
136
LKind: "ctx", RKind: "ctx", LNo: ln.Old, RNo: ln.New, LHTML: ln.HTML, RHTML: ln.HTML,
137
})
138
i++
139
continue
140
}
141
var dels, adds []CommitLine
142
for i < len(lines) && lines[i].Kind == "del" {
143
dels = append(dels, lines[i])
144
i++
145
}
146
for i < len(lines) && lines[i].Kind == "add" {
147
adds = append(adds, lines[i])
148
i++
149
}
150
n := len(dels)
151
if len(adds) > n {
152
n = len(adds)
153
}
154
for k := 0; k < n; k++ {
155
p := CommitPair{}
156
if k < len(dels) {
157
p.LKind = "del"
158
p.LNo = dels[k].Old
159
p.LHTML = dels[k].HTML
160
}
161
if k < len(adds) {
162
p.RKind = "add"
163
p.RNo = adds[k].New
164
p.RHTML = adds[k].HTML
165
}
166
out = append(out, p)
167
}
168
}
169
return out
170
}
171
172
func diffAnchor(path string, seen map[string]int) string {
173
var b strings.Builder
174
b.WriteString("diff-")
175
for _, r := range path {
176
switch {
177
case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9', r == '-', r == '_':
178
b.WriteRune(r)
179
default:
180
b.WriteByte('-')
181
}
182
}
183
base := b.String()
184
n := seen[base]
185
seen[base]++
186
if n == 0 {
187
return base
188
}
189
return base + "-" + strconv.Itoa(n)
190
}
191
192
func blobLink(repoPath, rev, path string) string {
193
parts := strings.Split(path, "/")
194
for i, p := range parts {
195
parts[i] = url.PathEscape(p)
196
}
197
return "/" + repoPath + "/-/blob/" + strings.Join(parts, "/") + "?rev=" + url.QueryEscape(rev)
198
}
199
200
func commitTree(files []CommitFile) []CommitTreeRow {
201
root := &treeNode{kids: map[string]*treeNode{}}
202
for i := range files {
203
f := &files[i]
204
parts := strings.Split(f.Path, "/")
205
cur := root
206
acc := ""
207
for j, part := range parts {
208
if acc == "" {
209
acc = part
210
} else {
211
acc += "/" + part
212
}
213
n := cur.kids[part]
214
if n == nil {
215
n = &treeNode{name: part, path: acc, kids: map[string]*treeNode{}}
216
cur.kids[part] = n
217
cur.order = append(cur.order, part)
218
}
219
if j == len(parts)-1 {
220
n.file = f
221
} else {
222
n.dir = true
223
}
224
cur = n
225
}
226
}
227
var rows []CommitTreeRow
228
var walk func(n *treeNode, depth int)
229
walk = func(n *treeNode, depth int) {
230
names := append([]string(nil), n.order...)
231
sort.Slice(names, func(i, j int) bool {
232
a, b := n.kids[names[i]], n.kids[names[j]]
233
aDir := a.dir && a.file == nil
234
bDir := b.dir && b.file == nil
235
if aDir != bDir {
236
return aDir
237
}
238
return strings.ToLower(a.name) < strings.ToLower(b.name)
239
})
240
for _, name := range names {
241
child := n.kids[name]
242
shown := depth
243
if shown > 8 {
244
shown = 8
245
}
246
if child.dir && child.file == nil {
247
rows = append(rows, CommitTreeRow{
248
Name: child.name, Path: child.path, Dir: true, Depth: shown, Icon: "dir",
249
})
250
walk(child, depth+1)
251
continue
252
}
253
f := child.file
254
rows = append(rows, CommitTreeRow{
255
Name: child.name, Path: f.Path, Anchor: f.Anchor, Status: f.Status,
256
Depth: shown, Added: f.Added, Deleted: f.Deleted, Icon: fileIcon(child.name, "blob"),
257
})
258
}
259
}
260
walk(root, 0)
261
return rows
262
}
263
264
type treeNode struct {
265
name, path string
266
dir bool
267
file *CommitFile
268
kids map[string]*treeNode
269
order []string
270
}
@@ -0,0 +1,270 @@1
package server2
3
import (4
"html"5
"html/template"6
"net/url"7
"sort"8
"strconv"9
"strings"10
11
"gitlab.com/Timfa/bluegit/internal/gitrepo"12
"gitlab.com/Timfa/bluegit/internal/highlight"13
)14
15
// largeChange is het aantal toegevoegde en verwijderde regels waarna een diff dicht blijft.16
const largeChange = 20017
18
// CommitDiff is de diff van één commit.19
type CommitDiff struct {20
Parents []ParentSHA21
Files []CommitFile22
Tree []CommitTreeRow23
Added, Deleted, FilesN int24
}25
26
// ParentSHA is een parent van de commit.27
type ParentSHA struct {28
SHA, Short string29
}30
31
// CommitFile is één gewijzigd bestand, in unified en side-by-side vorm.32
type CommitFile struct {33
Path, OldPath, Status, Anchor, FileURL string34
Added, Deleted int35
Binary, Collapsed, HasBody bool36
Lines []CommitLine37
Pairs []CommitPair38
}39
40
// CommitLine is één unified diffregel. HTML is al geëscaped.41
type CommitLine struct {42
Kind string43
Old int44
New int45
HTML template.HTML46
Notes []NoteRow47
}48
49
// CommitPair is één rij in de naast-elkaar-weergave.50
type CommitPair struct {51
Hunk string52
LKind, RKind string53
LNo, RNo int54
LHTML, RHTML template.HTML55
}56
57
// CommitTreeRow is een map of bestand in de boom.58
type CommitTreeRow struct {59
Name, Path, Anchor, Status, Icon string60
Dir bool61
Depth, Added, Deleted int62
}63
64
func presentCommitDiff(repoPath, sha string, parents []string, files []gitrepo.PatchFile) *CommitDiff {65
d := &CommitDiff{}66
for _, p := range parents {67
if !safeSHA(p) {68
continue69
}70
d.Parents = append(d.Parents, ParentSHA{SHA: p, Short: shortSHA(p)})71
}72
parent := ""73
if len(d.Parents) > 0 {74
parent = d.Parents[0].SHA75
}76
seen := map[string]int{}77
for _, f := range files {78
if f.Path == "" {79
continue80
}81
cf := CommitFile{82
Path: f.Path, OldPath: f.OldPath, Status: f.Status,83
Added: f.Added, Deleted: f.Deleted, Binary: f.Binary,84
Anchor: diffAnchor(f.Path, seen),85
Collapsed: !f.Binary && f.Added+f.Deleted > largeChange,86
}87
linkPath := f.Path88
linkRev := sha89
if f.Status == "deleted" {90
linkPath = f.Path91
linkRev = parent92
}93
if linkRev != "" {94
cf.FileURL = blobLink(repoPath, linkRev, linkPath)95
}96
if f.Binary || len(f.Lines) > 0 {97
cf.HasBody = true98
}99
if !f.Binary && len(f.Lines) > 0 {100
name := f.Path101
if f.Status == "deleted" {102
name = f.Path103
}104
painter := highlight.NewPainter(name)105
for _, ln := range f.Lines {106
row := CommitLine{Kind: ln.Kind, Old: ln.Old, New: ln.New}107
if ln.Kind == "hunk" {108
row.HTML = template.HTML(html.EscapeString(ln.Text))109
} else {110
row.HTML = template.HTML(painter.Line(ln.Text))111
}112
cf.Lines = append(cf.Lines, row)113
}114
cf.Pairs = pairDiff(cf.Lines)115
}116
d.Added += cf.Added117
d.Deleted += cf.Deleted118
d.Files = append(d.Files, cf)119
}120
d.FilesN = len(d.Files)121
d.Tree = commitTree(d.Files)122
return d123
}124
125
func pairDiff(lines []CommitLine) []CommitPair {126
var out []CommitPair127
for i := 0; i < len(lines); {128
ln := lines[i]129
if ln.Kind == "hunk" {130
out = append(out, CommitPair{Hunk: html.UnescapeString(string(ln.HTML))})131
i++132
continue133
}134
if ln.Kind == "ctx" {135
out = append(out, CommitPair{136
LKind: "ctx", RKind: "ctx", LNo: ln.Old, RNo: ln.New, LHTML: ln.HTML, RHTML: ln.HTML,137
})138
i++139
continue140
}141
var dels, adds []CommitLine142
for i < len(lines) && lines[i].Kind == "del" {143
dels = append(dels, lines[i])144
i++145
}146
for i < len(lines) && lines[i].Kind == "add" {147
adds = append(adds, lines[i])148
i++149
}150
n := len(dels)151
if len(adds) > n {152
n = len(adds)153
}154
for k := 0; k < n; k++ {155
p := CommitPair{}156
if k < len(dels) {157
p.LKind = "del"158
p.LNo = dels[k].Old159
p.LHTML = dels[k].HTML160
}161
if k < len(adds) {162
p.RKind = "add"163
p.RNo = adds[k].New164
p.RHTML = adds[k].HTML165
}166
out = append(out, p)167
}168
}169
return out170
}171
172
func diffAnchor(path string, seen map[string]int) string {173
var b strings.Builder174
b.WriteString("diff-")175
for _, r := range path {176
switch {177
case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9', r == '-', r == '_':178
b.WriteRune(r)179
default:180
b.WriteByte('-')181
}182
}183
base := b.String()184
n := seen[base]185
seen[base]++186
if n == 0 {187
return base188
}189
return base + "-" + strconv.Itoa(n)190
}191
192
func blobLink(repoPath, rev, path string) string {193
parts := strings.Split(path, "/")194
for i, p := range parts {195
parts[i] = url.PathEscape(p)196
}197
return "/" + repoPath + "/-/blob/" + strings.Join(parts, "/") + "?rev=" + url.QueryEscape(rev)198
}199
200
func commitTree(files []CommitFile) []CommitTreeRow {201
root := &treeNode{kids: map[string]*treeNode{}}202
for i := range files {203
f := &files[i]204
parts := strings.Split(f.Path, "/")205
cur := root206
acc := ""207
for j, part := range parts {208
if acc == "" {209
acc = part210
} else {211
acc += "/" + part212
}213
n := cur.kids[part]214
if n == nil {215
n = &treeNode{name: part, path: acc, kids: map[string]*treeNode{}}216
cur.kids[part] = n217
cur.order = append(cur.order, part)218
}219
if j == len(parts)-1 {220
n.file = f221
} else {222
n.dir = true223
}224
cur = n225
}226
}227
var rows []CommitTreeRow228
var walk func(n *treeNode, depth int)229
walk = func(n *treeNode, depth int) {230
names := append([]string(nil), n.order...)231
sort.Slice(names, func(i, j int) bool {232
a, b := n.kids[names[i]], n.kids[names[j]]233
aDir := a.dir && a.file == nil234
bDir := b.dir && b.file == nil235
if aDir != bDir {236
return aDir237
}238
return strings.ToLower(a.name) < strings.ToLower(b.name)239
})240
for _, name := range names {241
child := n.kids[name]242
shown := depth243
if shown > 8 {244
shown = 8245
}246
if child.dir && child.file == nil {247
rows = append(rows, CommitTreeRow{248
Name: child.name, Path: child.path, Dir: true, Depth: shown, Icon: "dir",249
})250
walk(child, depth+1)251
continue252
}253
f := child.file254
rows = append(rows, CommitTreeRow{255
Name: child.name, Path: f.Path, Anchor: f.Anchor, Status: f.Status,256
Depth: shown, Added: f.Added, Deleted: f.Deleted, Icon: fileIcon(child.name, "blob"),257
})258
}259
}260
walk(root, 0)261
return rows262
}263
264
type treeNode struct {265
name, path string266
dir bool267
file *CommitFile268
kids map[string]*treeNode269
order []string270
}@@ -0,0 +1,284 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"net/url"
9
"os"
10
"os/exec"
11
"path/filepath"
12
"strings"
13
"testing"
14
15
"gitlab.com/Timfa/bluegit/internal/auth"
16
"gitlab.com/Timfa/bluegit/internal/config"
17
"gitlab.com/Timfa/bluegit/internal/gitrepo"
18
"gitlab.com/Timfa/bluegit/internal/store"
19
)
20
21
func TestPresentCommitTree(t *testing.T) {
22
files := []gitrepo.PatchFile{
23
{Status: "added", Path: "src/util.go", Added: 2, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "func util() {}"}}},
24
{Status: "renamed", Path: "a2.txt", OldPath: "a.txt"},
25
{Status: "added", Path: "huge.txt", Added: largeChange + 1, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "x"}}},
26
}
27
d := presentCommitDiff("tim/demo", "abcdef1234567890", []string{"1234abcd1234abcd1234abcd1234abcd1234abcd"}, files)
28
if d.FilesN != 3 || len(d.Parents) != 1 || d.Parents[0].Short != "1234abcd" {
29
t.Fatalf("kop: %+v", d)
30
}
31
if !d.Files[2].Collapsed || d.Files[0].Collapsed {
32
t.Fatalf("inklappen: util %v huge %v", d.Files[0].Collapsed, d.Files[2].Collapsed)
33
}
34
if !strings.Contains(string(d.Files[0].Lines[0].HTML), "hl-k") {
35
t.Fatalf("geen highlight: %s", d.Files[0].Lines[0].HTML)
36
}
37
if d.Files[0].Pairs[0].RKind != "add" || d.Files[0].Pairs[0].RNo != 1 || d.Files[0].Pairs[0].LKind != "" {
38
t.Fatalf("paar: %+v", d.Files[0].Pairs)
39
}
40
var dirs, nested bool
41
for _, row := range d.Tree {
42
if row.Dir && row.Name == "src" && row.Depth == 0 {
43
dirs = true
44
}
45
if row.Name == "util.go" && row.Depth == 1 && row.Anchor != "" {
46
nested = true
47
}
48
}
49
if !dirs || !nested {
50
t.Fatalf("boom: %+v", d.Tree)
51
}
52
if !strings.Contains(d.Files[0].FileURL, "/tim/demo/-/blob/src/util.go?rev=abcdef1234567890") {
53
t.Fatal(d.Files[0].FileURL)
54
}
55
}
56
57
func TestCommitDetailPage(t *testing.T) {
58
if _, err := exec.LookPath("git"); err != nil {
59
t.Skip("git ontbreekt")
60
}
61
storage := t.TempDir()
62
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
63
if err != nil {
64
t.Fatal(err)
65
}
66
t.Cleanup(func() { _ = st.Close() })
67
cfg := config.Config{
68
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
69
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
70
Git: config.Git{Binary: "git", DefaultBranch: "master"},
71
}
72
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
73
ts := httptest.NewServer(srv.Handler())
74
t.Cleanup(ts.Close)
75
jar, _ := cookiejar.New(nil)
76
client := &http.Client{Jar: jar}
77
res, err := client.Get(ts.URL + "/login")
78
if err != nil {
79
t.Fatal(err)
80
}
81
page := read(t, res)
82
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
83
"csrf": {csrfOf(t, page)}, "name": {"diffdemo"}, "visibility": {"public"},
84
})
85
if err != nil {
86
t.Fatal(err)
87
}
88
page = read(t, res)
89
res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
90
if err != nil {
91
t.Fatal(err)
92
}
93
token := between(read(t, res), `<p class="code">`, "</p>")
94
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/diffdemo.git"
95
work := t.TempDir()
96
git(t, work, "init", "-b", "master")
97
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
98
git(t, work, "config", "user.name", "tim")
99
git(t, work, "config", "commit.gpgsign", "false")
100
writeFile(t, filepath.Join(work, "a.txt"), "alpha\n")
101
writeFile(t, filepath.Join(work, "b.txt"), "beta\n")
102
writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\n")
103
git(t, work, "add", ".")
104
git(t, work, "commit", "-m", "begin")
105
root := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
106
writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\nfunc extra() {}\n")
107
if err := os.Remove(filepath.Join(work, "b.txt")); err != nil {
108
t.Fatal(err)
109
}
110
writeFile(t, filepath.Join(work, "c.txt"), strings.Repeat("x", 180)+"\n")
111
writeFile(t, filepath.Join(work, "note file.txt"), "spatie\n")
112
writeFile(t, filepath.Join(work, "src", "util.go"), "package src\n\nfunc util() {}\n")
113
var huge strings.Builder
114
for i := 0; i < 220; i++ {
115
huge.WriteString("regel\n")
116
}
117
writeFile(t, filepath.Join(work, "huge.txt"), huge.String())
118
writeFile(t, filepath.Join(work, "bin.dat"), "a\x00b\n")
119
git(t, work, "add", "-A")
120
git(t, work, "mv", "a.txt", "a2.txt")
121
git(t, work, "commit", "-m", "wijzig bestanden", "-m", "tweede alinea")
122
mixed := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
123
git(t, work, "remote", "add", "origin", remote)
124
git(t, work, "push", "-u", "origin", "master")
125
git(t, work, "checkout", "-b", "side")
126
writeFile(t, filepath.Join(work, "side.txt"), "zijtak\n")
127
git(t, work, "add", "side.txt")
128
git(t, work, "commit", "-m", "zijtak")
129
git(t, work, "checkout", "master")
130
git(t, work, "merge", "--no-ff", "side", "-m", "voeg zijtak samen")
131
merge := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
132
git(t, work, "push", "origin", "master")
133
134
ctx := context.Background()
135
repo, err := st.RepoByPath(ctx, "tim", "diffdemo")
136
if err != nil {
137
t.Fatal(err)
138
}
139
pipeID, err := st.CreatePipeline(ctx, repo.ID, mixed, "refs/heads/master", "push", "tim", "wijzig bestanden", []store.NewJob{
140
{Name: "lint", Stage: "test", Script: "exit 0"},
141
})
142
if err != nil {
143
t.Fatal(err)
144
}
145
jobs, _ := st.JobsByPipeline(ctx, pipeID)
146
for _, j := range jobs {
147
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
148
t.Fatal(err)
149
}
150
}
151
if status, err := st.RefreshPipelineStatus(ctx, pipeID); err != nil || status != "success" {
152
t.Fatalf("pipeline: %s %v", status, err)
153
}
154
155
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
156
if err != nil {
157
t.Fatal(err)
158
}
159
body := read(t, res)
160
for _, want := range []string{
161
"wijzig bestanden", "tweede alinea", "Authored",
162
`data-copy="` + mixed + `"`,
163
"/tim/diffdemo/-/commit/" + root,
164
"Parent",
165
`class="status passed"`, "Passed",
166
"a.txt", "a2.txt", "renamed",
167
"b.txt", "deleted",
168
"note file.txt", "added",
169
"Binary file", "The contents of this binary file are not shown.",
170
`data-path="huge.txt"`, `data-collapsed="1"`, "Show diff",
171
`data-path="keep.go"`, `data-collapsed="0"`, "Hide diff",
172
"hl-k", "func", "src", "util.go",
173
`data-diff-mode="side"`, "Side-by-side",
174
"/assets/commit-mode.js", `class="d1"`,
175
strings.Repeat("x", 180),
176
"Changed files",
177
} {
178
if !strings.Contains(body, want) {
179
t.Errorf("pagina mist %q", want)
180
}
181
}
182
if strings.Contains(body, "commit.show") {
183
t.Fatal("vertaling ontbreekt")
184
}
185
keep := section(body, `data-path="keep.go"`)
186
if !strings.Contains(keep, `class="ln">1</span>`) || !strings.Contains(keep, "kind-add") || !strings.Contains(keep, "extra") || !strings.Contains(keep, "hl-k") {
187
i := strings.Index(body, `data-path="keep.go"`)
188
j := strings.Index(body[i:], "</section>")
189
k := strings.Index(body[i:], "kind-add")
190
t.Fatalf("keep.go mist delen ln=%v add=%v extra=%v hl=%v section-op=%d add-op=%d keep-len=%d",
191
strings.Contains(keep, `class="ln">1</span>`), strings.Contains(keep, "kind-add"),
192
strings.Contains(keep, "extra"), strings.Contains(keep, "hl-k"), j, k, len(keep))
193
}
194
gone := section(body, `data-path="b.txt"`)
195
if !strings.Contains(gone, "kind-del") || !strings.Contains(gone, `class="ln">1</span>`) {
196
t.Fatal("b.txt mist het verwijderde regelnummer")
197
}
198
199
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + merge)
200
if err != nil {
201
t.Fatal(err)
202
}
203
mergePage := read(t, res)
204
if !strings.Contains(mergePage, "Parents") || !strings.Contains(mergePage, "/tim/diffdemo/-/commit/"+mixed) || !strings.Contains(mergePage, `data-path="side.txt"`) {
205
t.Fatal("mergepagina mist parents of side.txt")
206
}
207
if strings.Contains(mergePage, `data-path="huge.txt"`) || strings.Contains(mergePage, `data-path="keep.go"`) {
208
t.Fatal("merge-diff toont meer dan de eerste parent")
209
}
210
211
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + root)
212
if err != nil {
213
t.Fatal(err)
214
}
215
rootPage := read(t, res)
216
if strings.Contains(rootPage, "Parent") || !strings.Contains(rootPage, `data-path="a.txt"`) || !strings.Contains(rootPage, "added") {
217
t.Fatal("rootcommit klopt niet")
218
}
219
220
res, err = client.Get(ts.URL + "/settings")
221
if err != nil {
222
t.Fatal(err)
223
}
224
settings := read(t, res)
225
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"nl"}})
226
if err != nil {
227
t.Fatal(err)
228
}
229
_ = read(t, res)
230
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
231
if err != nil {
232
t.Fatal(err)
233
}
234
nl := read(t, res)
235
for _, want := range []string{"Toon diff", "hernoemd", "Bovenliggende commit", "Naast elkaar", "Gewijzigde bestanden", "Binair bestand"} {
236
if !strings.Contains(nl, want) {
237
t.Errorf("Nederlands mist %q", want)
238
}
239
}
240
if strings.Contains(nl, "Show diff") {
241
t.Fatal("Engelse diffknop bleef staan")
242
}
243
244
res, err = client.Get(ts.URL + "/settings")
245
if err != nil {
246
t.Fatal(err)
247
}
248
settings = read(t, res)
249
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"cuneiform"}})
250
if err != nil {
251
t.Fatal(err)
252
}
253
_ = read(t, res)
254
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
255
if err != nil {
256
t.Fatal(err)
257
}
258
signs := read(t, res)
259
if strings.Contains(signs, "Show diff") || strings.Contains(signs, "Toon diff") || !strings.Contains(signs, mixed) || !strings.Contains(signs, "𒀀") {
260
t.Fatal("spijkerschrift of hash klopt niet")
261
}
262
}
263
264
func gitOutOK(t *testing.T, dir string, args ...string) string {
265
t.Helper()
266
out, err := gitOut(dir, args...)
267
if err != nil {
268
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
269
}
270
return out
271
}
272
273
func section(body, marker string) string {
274
i := strings.Index(body, marker)
275
if i < 0 {
276
return ""
277
}
278
rest := body[i:]
279
j := strings.Index(rest, "</section>")
280
if j < 0 {
281
return rest
282
}
283
return rest[:j]
284
}
@@ -0,0 +1,284 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"net/url"9
"os"10
"os/exec"11
"path/filepath"12
"strings"13
"testing"14
15
"gitlab.com/Timfa/bluegit/internal/auth"16
"gitlab.com/Timfa/bluegit/internal/config"17
"gitlab.com/Timfa/bluegit/internal/gitrepo"18
"gitlab.com/Timfa/bluegit/internal/store"19
)20
21
func TestPresentCommitTree(t *testing.T) {22
files := []gitrepo.PatchFile{23
{Status: "added", Path: "src/util.go", Added: 2, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "func util() {}"}}},24
{Status: "renamed", Path: "a2.txt", OldPath: "a.txt"},25
{Status: "added", Path: "huge.txt", Added: largeChange + 1, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "x"}}},26
}27
d := presentCommitDiff("tim/demo", "abcdef1234567890", []string{"1234abcd1234abcd1234abcd1234abcd1234abcd"}, files)28
if d.FilesN != 3 || len(d.Parents) != 1 || d.Parents[0].Short != "1234abcd" {29
t.Fatalf("kop: %+v", d)30
}31
if !d.Files[2].Collapsed || d.Files[0].Collapsed {32
t.Fatalf("inklappen: util %v huge %v", d.Files[0].Collapsed, d.Files[2].Collapsed)33
}34
if !strings.Contains(string(d.Files[0].Lines[0].HTML), "hl-k") {35
t.Fatalf("geen highlight: %s", d.Files[0].Lines[0].HTML)36
}37
if d.Files[0].Pairs[0].RKind != "add" || d.Files[0].Pairs[0].RNo != 1 || d.Files[0].Pairs[0].LKind != "" {38
t.Fatalf("paar: %+v", d.Files[0].Pairs)39
}40
var dirs, nested bool41
for _, row := range d.Tree {42
if row.Dir && row.Name == "src" && row.Depth == 0 {43
dirs = true44
}45
if row.Name == "util.go" && row.Depth == 1 && row.Anchor != "" {46
nested = true47
}48
}49
if !dirs || !nested {50
t.Fatalf("boom: %+v", d.Tree)51
}52
if !strings.Contains(d.Files[0].FileURL, "/tim/demo/-/blob/src/util.go?rev=abcdef1234567890") {53
t.Fatal(d.Files[0].FileURL)54
}55
}56
57
func TestCommitDetailPage(t *testing.T) {58
if _, err := exec.LookPath("git"); err != nil {59
t.Skip("git ontbreekt")60
}61
storage := t.TempDir()62
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())63
if err != nil {64
t.Fatal(err)65
}66
t.Cleanup(func() { _ = st.Close() })67
cfg := config.Config{68
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,69
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},70
Git: config.Git{Binary: "git", DefaultBranch: "master"},71
}72
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}73
ts := httptest.NewServer(srv.Handler())74
t.Cleanup(ts.Close)75
jar, _ := cookiejar.New(nil)76
client := &http.Client{Jar: jar}77
res, err := client.Get(ts.URL + "/login")78
if err != nil {79
t.Fatal(err)80
}81
page := read(t, res)82
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{83
"csrf": {csrfOf(t, page)}, "name": {"diffdemo"}, "visibility": {"public"},84
})85
if err != nil {86
t.Fatal(err)87
}88
page = read(t, res)89
res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})90
if err != nil {91
t.Fatal(err)92
}93
token := between(read(t, res), `<p class="code">`, "</p>")94
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/diffdemo.git"95
work := t.TempDir()96
git(t, work, "init", "-b", "master")97
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")98
git(t, work, "config", "user.name", "tim")99
git(t, work, "config", "commit.gpgsign", "false")100
writeFile(t, filepath.Join(work, "a.txt"), "alpha\n")101
writeFile(t, filepath.Join(work, "b.txt"), "beta\n")102
writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\n")103
git(t, work, "add", ".")104
git(t, work, "commit", "-m", "begin")105
root := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))106
writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\nfunc extra() {}\n")107
if err := os.Remove(filepath.Join(work, "b.txt")); err != nil {108
t.Fatal(err)109
}110
writeFile(t, filepath.Join(work, "c.txt"), strings.Repeat("x", 180)+"\n")111
writeFile(t, filepath.Join(work, "note file.txt"), "spatie\n")112
writeFile(t, filepath.Join(work, "src", "util.go"), "package src\n\nfunc util() {}\n")113
var huge strings.Builder114
for i := 0; i < 220; i++ {115
huge.WriteString("regel\n")116
}117
writeFile(t, filepath.Join(work, "huge.txt"), huge.String())118
writeFile(t, filepath.Join(work, "bin.dat"), "a\x00b\n")119
git(t, work, "add", "-A")120
git(t, work, "mv", "a.txt", "a2.txt")121
git(t, work, "commit", "-m", "wijzig bestanden", "-m", "tweede alinea")122
mixed := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))123
git(t, work, "remote", "add", "origin", remote)124
git(t, work, "push", "-u", "origin", "master")125
git(t, work, "checkout", "-b", "side")126
writeFile(t, filepath.Join(work, "side.txt"), "zijtak\n")127
git(t, work, "add", "side.txt")128
git(t, work, "commit", "-m", "zijtak")129
git(t, work, "checkout", "master")130
git(t, work, "merge", "--no-ff", "side", "-m", "voeg zijtak samen")131
merge := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))132
git(t, work, "push", "origin", "master")133
134
ctx := context.Background()135
repo, err := st.RepoByPath(ctx, "tim", "diffdemo")136
if err != nil {137
t.Fatal(err)138
}139
pipeID, err := st.CreatePipeline(ctx, repo.ID, mixed, "refs/heads/master", "push", "tim", "wijzig bestanden", []store.NewJob{140
{Name: "lint", Stage: "test", Script: "exit 0"},141
})142
if err != nil {143
t.Fatal(err)144
}145
jobs, _ := st.JobsByPipeline(ctx, pipeID)146
for _, j := range jobs {147
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {148
t.Fatal(err)149
}150
}151
if status, err := st.RefreshPipelineStatus(ctx, pipeID); err != nil || status != "success" {152
t.Fatalf("pipeline: %s %v", status, err)153
}154
155
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)156
if err != nil {157
t.Fatal(err)158
}159
body := read(t, res)160
for _, want := range []string{161
"wijzig bestanden", "tweede alinea", "Authored",162
`data-copy="` + mixed + `"`,163
"/tim/diffdemo/-/commit/" + root,164
"Parent",165
`class="status passed"`, "Passed",166
"a.txt", "a2.txt", "renamed",167
"b.txt", "deleted",168
"note file.txt", "added",169
"Binary file", "The contents of this binary file are not shown.",170
`data-path="huge.txt"`, `data-collapsed="1"`, "Show diff",171
`data-path="keep.go"`, `data-collapsed="0"`, "Hide diff",172
"hl-k", "func", "src", "util.go",173
`data-diff-mode="side"`, "Side-by-side",174
"/assets/commit-mode.js", `class="d1"`,175
strings.Repeat("x", 180),176
"Changed files",177
} {178
if !strings.Contains(body, want) {179
t.Errorf("pagina mist %q", want)180
}181
}182
if strings.Contains(body, "commit.show") {183
t.Fatal("vertaling ontbreekt")184
}185
keep := section(body, `data-path="keep.go"`)186
if !strings.Contains(keep, `class="ln">1</span>`) || !strings.Contains(keep, "kind-add") || !strings.Contains(keep, "extra") || !strings.Contains(keep, "hl-k") {187
i := strings.Index(body, `data-path="keep.go"`)188
j := strings.Index(body[i:], "</section>")189
k := strings.Index(body[i:], "kind-add")190
t.Fatalf("keep.go mist delen ln=%v add=%v extra=%v hl=%v section-op=%d add-op=%d keep-len=%d",191
strings.Contains(keep, `class="ln">1</span>`), strings.Contains(keep, "kind-add"),192
strings.Contains(keep, "extra"), strings.Contains(keep, "hl-k"), j, k, len(keep))193
}194
gone := section(body, `data-path="b.txt"`)195
if !strings.Contains(gone, "kind-del") || !strings.Contains(gone, `class="ln">1</span>`) {196
t.Fatal("b.txt mist het verwijderde regelnummer")197
}198
199
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + merge)200
if err != nil {201
t.Fatal(err)202
}203
mergePage := read(t, res)204
if !strings.Contains(mergePage, "Parents") || !strings.Contains(mergePage, "/tim/diffdemo/-/commit/"+mixed) || !strings.Contains(mergePage, `data-path="side.txt"`) {205
t.Fatal("mergepagina mist parents of side.txt")206
}207
if strings.Contains(mergePage, `data-path="huge.txt"`) || strings.Contains(mergePage, `data-path="keep.go"`) {208
t.Fatal("merge-diff toont meer dan de eerste parent")209
}210
211
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + root)212
if err != nil {213
t.Fatal(err)214
}215
rootPage := read(t, res)216
if strings.Contains(rootPage, "Parent") || !strings.Contains(rootPage, `data-path="a.txt"`) || !strings.Contains(rootPage, "added") {217
t.Fatal("rootcommit klopt niet")218
}219
220
res, err = client.Get(ts.URL + "/settings")221
if err != nil {222
t.Fatal(err)223
}224
settings := read(t, res)225
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"nl"}})226
if err != nil {227
t.Fatal(err)228
}229
_ = read(t, res)230
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)231
if err != nil {232
t.Fatal(err)233
}234
nl := read(t, res)235
for _, want := range []string{"Toon diff", "hernoemd", "Bovenliggende commit", "Naast elkaar", "Gewijzigde bestanden", "Binair bestand"} {236
if !strings.Contains(nl, want) {237
t.Errorf("Nederlands mist %q", want)238
}239
}240
if strings.Contains(nl, "Show diff") {241
t.Fatal("Engelse diffknop bleef staan")242
}243
244
res, err = client.Get(ts.URL + "/settings")245
if err != nil {246
t.Fatal(err)247
}248
settings = read(t, res)249
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"cuneiform"}})250
if err != nil {251
t.Fatal(err)252
}253
_ = read(t, res)254
res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)255
if err != nil {256
t.Fatal(err)257
}258
signs := read(t, res)259
if strings.Contains(signs, "Show diff") || strings.Contains(signs, "Toon diff") || !strings.Contains(signs, mixed) || !strings.Contains(signs, "𒀀") {260
t.Fatal("spijkerschrift of hash klopt niet")261
}262
}263
264
func gitOutOK(t *testing.T, dir string, args ...string) string {265
t.Helper()266
out, err := gitOut(dir, args...)267
if err != nil {268
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)269
}270
return out271
}272
273
func section(body, marker string) string {274
i := strings.Index(body, marker)275
if i < 0 {276
return ""277
}278
rest := body[i:]279
j := strings.Index(rest, "</section>")280
if j < 0 {281
return rest282
}283
return rest[:j]284
}@@ -176,7 +176,9 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {
176
176
return
177
177
}
178
178
email := u.Username + "@users.git.timfalken.com"
179
err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
179
err = s.postReceive(r.Context(), repo, u, dir, func() error {
180
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)
181
})
180
182
if err != nil {
181
183
s.redirect(w, r, back, "", s.commitProblem(r, err))
182
184
return
@@ -176,7 +176,9 @@ func (s *Server) saveCIEditor(w http.ResponseWriter, r *http.Request) {176
return176
return177
}177
}178
email := u.Username + "@users.git.timfalken.com"178
email := u.Username + "@users.git.timfalken.com"179
err = gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)179
err = s.postReceive(r.Context(), repo, u, dir, func() error {180
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, message, "", map[string]string{ciFile: body}, role, patterns)181
})180
if err != nil {182
if err != nil {181
s.redirect(w, r, back, "", s.commitProblem(r, err))183
s.redirect(w, r, back, "", s.commitProblem(r, err))182
return184
return@@ -19,20 +19,45 @@ import (
19
19
"gitlab.com/Timfa/bluegit/internal/webhook"
20
20
)
21
21
22
// postReceive is de enige route voor een ref-wijziging die BlueGit zelf maakt:
23
// de Pipeline Editor, suggesties, een merge en een tag. mutate schrijft de refs.
24
// Daarna geldt hetzelfde als na een git push: pipeline, webhook en activity.
25
func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.User, dir string, mutate func() error) error {
26
before, err := gitrepo.Refs(ctx, s.Git, dir)
27
if err != nil {
28
before = map[string]string{}
29
}
30
if err := mutate(); err != nil {
31
return err
32
}
33
after, err := gitrepo.Refs(ctx, s.Git, dir)
34
if err != nil {
35
if s.Log != nil {
36
s.Log.Error("post-receive", "err", err)
37
}
38
return nil
39
}
40
s.AfterPush(repo, user, before, after)
41
return nil
42
}
43
44
// AfterPush behandelt elke nieuwe ref zoals een git push.
45
// git http, SSH en postReceive zijn de enige aanroepers.
22
46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {
23
47
if after == nil {
24
48
return
25
49
}
26
50
actor := user.Username
27
51
for ref, sha := range after {
28
if before[ref] == sha {
29
continue
30
}
31
if isZero(sha) {
52
if before[ref] == sha || isZero(sha) {
32
53
continue
33
54
}
55
commit := s.peeled(repo, sha)
34
56
if strings.HasPrefix(ref, "refs/tags/") {
35
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)
57
name := strings.TrimPrefix(ref, "refs/tags/")
58
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
59
s.recordContribution(user.ID, repo.ID, "tag", ref, time.Now().UTC())
60
s.pushHook(repo, actor, name, commit)
36
61
continue
37
62
}
38
63
branch, ok := gitrepo.BranchOfRef(ref)
@@ -40,20 +65,35 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
40
65
continue
41
66
}
42
67
s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
43
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)
44
s.startMergeRequestPipelines(context.Background(), repo, sha, branch, actor, before[ref])
68
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
69
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])
70
s.recordMRPushes(repo, user, branch, before[ref], sha)
45
71
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
46
web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()
47
s.Dispatch(repo.ID, webhook.Event{
48
Type: webhook.EventPush,
49
Project: repo.FullPath(),
50
Branch: branch,
51
Commit: sha,
52
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),
53
URL: web,
54
Actor: actor,
55
})
72
s.pushHook(repo, actor, branch, commit)
73
}
74
}
75
76
func (s *Server) pushHook(repo store.Repo, actor, branch, commit string) {
77
s.Dispatch(repo.ID, webhook.Event{
78
Type: webhook.EventPush,
79
Project: repo.FullPath(),
80
Branch: branch,
81
Commit: commit,
82
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),
83
URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),
84
Actor: actor,
85
})
86
}
87
88
func (s *Server) peeled(repo store.Repo, sha string) string {
89
if s.StoragePath() == "" || sha == "" {
90
return sha
91
}
92
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
93
if commit := gitOne(context.Background(), s.Git, dir, "rev-parse", "--verify", sha+"^{commit}"); commit != "" {
94
return commit
56
95
}
96
return sha
57
97
}
58
98
59
99
func isZero(sha string) bool {
@@ -19,20 +19,45 @@ import (19
"gitlab.com/Timfa/bluegit/internal/webhook"19
"gitlab.com/Timfa/bluegit/internal/webhook"20
)20
)21
21
22
// postReceive is de enige route voor een ref-wijziging die BlueGit zelf maakt:23
// de Pipeline Editor, suggesties, een merge en een tag. mutate schrijft de refs.24
// Daarna geldt hetzelfde als na een git push: pipeline, webhook en activity.25
func (s *Server) postReceive(ctx context.Context, repo store.Repo, user store.User, dir string, mutate func() error) error {26
before, err := gitrepo.Refs(ctx, s.Git, dir)27
if err != nil {28
before = map[string]string{}29
}30
if err := mutate(); err != nil {31
return err32
}33
after, err := gitrepo.Refs(ctx, s.Git, dir)34
if err != nil {35
if s.Log != nil {36
s.Log.Error("post-receive", "err", err)37
}38
return nil39
}40
s.AfterPush(repo, user, before, after)41
return nil42
}43
44
// AfterPush behandelt elke nieuwe ref zoals een git push.45
// git http, SSH en postReceive zijn de enige aanroepers.22
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {46
func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[string]string) {23
if after == nil {47
if after == nil {24
return48
return25
}49
}26
actor := user.Username50
actor := user.Username27
for ref, sha := range after {51
for ref, sha := range after {28
if before[ref] == sha {52
if before[ref] == sha || isZero(sha) {29
continue30
}31
if isZero(sha) {32
continue53
continue33
}54
}55
commit := s.peeled(repo, sha)34
if strings.HasPrefix(ref, "refs/tags/") {56
if strings.HasPrefix(ref, "refs/tags/") {35
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)57
name := strings.TrimPrefix(ref, "refs/tags/")58
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)59
s.recordContribution(user.ID, repo.ID, "tag", ref, time.Now().UTC())60
s.pushHook(repo, actor, name, commit)36
continue61
continue37
}62
}38
branch, ok := gitrepo.BranchOfRef(ref)63
branch, ok := gitrepo.BranchOfRef(ref)@@ -40,20 +65,35 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s40
continue65
continue41
}66
}42
s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})67
s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})43
s.startPipeline(context.Background(), repo, sha, ref, actor, "push", before[ref], nil)68
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)44
s.startMergeRequestPipelines(context.Background(), repo, sha, branch, actor, before[ref])69
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])70
s.recordMRPushes(repo, user, branch, before[ref], sha)45
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)71
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)46
web := strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath()72
s.pushHook(repo, actor, branch, commit)47
s.Dispatch(repo.ID, webhook.Event{73
}48
Type: webhook.EventPush,74
}49
Project: repo.FullPath(),75
50
Branch: branch,76
func (s *Server) pushHook(repo store.Repo, actor, branch, commit string) {51
Commit: sha,77
s.Dispatch(repo.ID, webhook.Event{52
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),78
Type: webhook.EventPush,53
URL: web,79
Project: repo.FullPath(),54
Actor: actor,80
Branch: branch,55
})81
Commit: commit,82
Summary: i18n.T(i18n.EN, "hook.push", actor, branch, repo.FullPath()),83
URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),84
Actor: actor,85
})86
}87
88
func (s *Server) peeled(repo store.Repo, sha string) string {89
if s.StoragePath() == "" || sha == "" {90
return sha91
}92
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)93
if commit := gitOne(context.Background(), s.Git, dir, "rev-parse", "--verify", sha+"^{commit}"); commit != "" {94
return commit56
}95
}96
return sha57
}97
}58
98
59
func isZero(sha string) bool {99
func isZero(sha string) bool {@@ -0,0 +1,48 @@
1
package server
2
3
import (
4
"html/template"
5
"net/http"
6
7
"gitlab.com/Timfa/bluegit/internal/cispec"
8
"gitlab.com/Timfa/bluegit/internal/i18n"
9
"gitlab.com/Timfa/bluegit/internal/images"
10
)
11
12
func (s *Server) infoPage(w http.ResponseWriter, r *http.Request) {
13
doc, raw, err := s.ciDocument(s.langOf(r))
14
if err != nil {
15
http.Error(w, err.Error(), http.StatusInternalServerError)
16
return
17
}
18
v := s.view(w, r, "title.info")
19
v.Page = "info"
20
v.Info = true
21
v.Spec = doc
22
v.SpecJSON = template.JS(raw)
23
s.render(w, "info", v)
24
}
25
26
func (s *Server) ciSpec(w http.ResponseWriter, r *http.Request) {
27
lang := i18n.EN
28
if q := r.URL.Query().Get("lang"); q != "" {
29
lang = i18n.Parse(q)
30
}
31
_, raw, err := s.ciDocument(lang)
32
if err != nil {
33
http.Error(w, err.Error(), http.StatusInternalServerError)
34
return
35
}
36
w.Header().Set("Content-Type", "application/json; charset=utf-8")
37
w.Header().Set("Cache-Control", "no-store")
38
_, _ = w.Write(raw)
39
}
40
41
func (s *Server) ciDocument(lang i18n.Lang) (cispec.Doc, []byte, error) {
42
set, err := images.Effective(s.Cfg.CI.ImageOverrides())
43
if err != nil {
44
return cispec.Doc{}, nil, err
45
}
46
doc := cispec.Build(lang, set)
47
return doc, cispec.Marshal(doc), nil
48
}
@@ -0,0 +1,48 @@1
package server2
3
import (4
"html/template"5
"net/http"6
7
"gitlab.com/Timfa/bluegit/internal/cispec"8
"gitlab.com/Timfa/bluegit/internal/i18n"9
"gitlab.com/Timfa/bluegit/internal/images"10
)11
12
func (s *Server) infoPage(w http.ResponseWriter, r *http.Request) {13
doc, raw, err := s.ciDocument(s.langOf(r))14
if err != nil {15
http.Error(w, err.Error(), http.StatusInternalServerError)16
return17
}18
v := s.view(w, r, "title.info")19
v.Page = "info"20
v.Info = true21
v.Spec = doc22
v.SpecJSON = template.JS(raw)23
s.render(w, "info", v)24
}25
26
func (s *Server) ciSpec(w http.ResponseWriter, r *http.Request) {27
lang := i18n.EN28
if q := r.URL.Query().Get("lang"); q != "" {29
lang = i18n.Parse(q)30
}31
_, raw, err := s.ciDocument(lang)32
if err != nil {33
http.Error(w, err.Error(), http.StatusInternalServerError)34
return35
}36
w.Header().Set("Content-Type", "application/json; charset=utf-8")37
w.Header().Set("Cache-Control", "no-store")38
_, _ = w.Write(raw)39
}40
41
func (s *Server) ciDocument(lang i18n.Lang) (cispec.Doc, []byte, error) {42
set, err := images.Effective(s.Cfg.CI.ImageOverrides())43
if err != nil {44
return cispec.Doc{}, nil, err45
}46
doc := cispec.Build(lang, set)47
return doc, cispec.Marshal(doc), nil48
}@@ -0,0 +1,84 @@
1
package server
2
3
import (
4
"encoding/json"
5
"net/http"
6
"net/http/httptest"
7
"strings"
8
"testing"
9
10
"gitlab.com/Timfa/bluegit/internal/cispec"
11
"gitlab.com/Timfa/bluegit/internal/config"
12
)
13
14
func TestCISpecPageMatchesAPI(t *testing.T) {
15
srv := &Server{Cfg: config.Config{BaseURL: "http://127.0.0.1:9"}}
16
ts := httptest.NewServer(srv.Handler())
17
t.Cleanup(ts.Close)
18
19
page, err := http.Get(ts.URL + "/-/info")
20
if err != nil {
21
t.Fatal(err)
22
}
23
body := read(t, page)
24
if page.StatusCode != 200 {
25
t.Fatalf("pagina %d", page.StatusCode)
26
}
27
for _, want := range []string{
28
`<script type="application/json" id="bluegit-ci-spec">`,
29
"bluegit/node",
30
"node:22",
31
"CI_JOB_TOKEN",
32
"workflow",
33
"Differences with GitLab",
34
`href="/-/info"`,
35
} {
36
if !strings.Contains(body, want) {
37
t.Fatalf("mist %q", want)
38
}
39
}
40
const start = `<script type="application/json" id="bluegit-ci-spec">`
41
i := strings.Index(body, start)
42
rest := body[i+len(start):]
43
j := strings.Index(rest, "</script>")
44
embedded := rest[:j]
45
46
api, err := http.Get(ts.URL + "/api/v1/ci/spec")
47
if err != nil {
48
t.Fatal(err)
49
}
50
raw := read(t, api)
51
if api.StatusCode != 200 || !strings.Contains(api.Header.Get("Content-Type"), "application/json") {
52
t.Fatalf("api %d %s", api.StatusCode, api.Header.Get("Content-Type"))
53
}
54
if embedded != strings.TrimRight(raw, "\n") && embedded != raw {
55
// Marshal eindigt op een newline. Het scriptblok bevat die newline.
56
if strings.TrimSpace(embedded) != strings.TrimSpace(raw) {
57
t.Fatalf("pagina en API wijken af\npage %q\napi %q", embedded[:80], raw[:80])
58
}
59
}
60
var doc cispec.Doc
61
if err := json.Unmarshal([]byte(raw), &doc); err != nil {
62
t.Fatal(err)
63
}
64
if doc.File != "blue-ci-cd.yml" || len(doc.Sections) < 6 {
65
t.Fatalf("%+v", doc.File)
66
}
67
68
nl, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=nl")
69
if err != nil {
70
t.Fatal(err)
71
}
72
dutch := read(t, nl)
73
if !strings.Contains(dutch, "Volgorde van de stages") || !strings.Contains(dutch, "bluegit/base") {
74
t.Fatalf("nl: %s", dutch[:400])
75
}
76
cu, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=cuneiform")
77
if err != nil {
78
t.Fatal(err)
79
}
80
signs := read(t, cu)
81
if strings.Contains(signs, "Stage order") || !strings.Contains(signs, `"name":"stages"`) && !strings.Contains(signs, `"name": "stages"`) {
82
t.Fatalf("spijkerschrift of sleutelnaam: %s", signs[:300])
83
}
84
}
@@ -0,0 +1,84 @@1
package server2
3
import (4
"encoding/json"5
"net/http"6
"net/http/httptest"7
"strings"8
"testing"9
10
"gitlab.com/Timfa/bluegit/internal/cispec"11
"gitlab.com/Timfa/bluegit/internal/config"12
)13
14
func TestCISpecPageMatchesAPI(t *testing.T) {15
srv := &Server{Cfg: config.Config{BaseURL: "http://127.0.0.1:9"}}16
ts := httptest.NewServer(srv.Handler())17
t.Cleanup(ts.Close)18
19
page, err := http.Get(ts.URL + "/-/info")20
if err != nil {21
t.Fatal(err)22
}23
body := read(t, page)24
if page.StatusCode != 200 {25
t.Fatalf("pagina %d", page.StatusCode)26
}27
for _, want := range []string{28
`<script type="application/json" id="bluegit-ci-spec">`,29
"bluegit/node",30
"node:22",31
"CI_JOB_TOKEN",32
"workflow",33
"Differences with GitLab",34
`href="/-/info"`,35
} {36
if !strings.Contains(body, want) {37
t.Fatalf("mist %q", want)38
}39
}40
const start = `<script type="application/json" id="bluegit-ci-spec">`41
i := strings.Index(body, start)42
rest := body[i+len(start):]43
j := strings.Index(rest, "</script>")44
embedded := rest[:j]45
46
api, err := http.Get(ts.URL + "/api/v1/ci/spec")47
if err != nil {48
t.Fatal(err)49
}50
raw := read(t, api)51
if api.StatusCode != 200 || !strings.Contains(api.Header.Get("Content-Type"), "application/json") {52
t.Fatalf("api %d %s", api.StatusCode, api.Header.Get("Content-Type"))53
}54
if embedded != strings.TrimRight(raw, "\n") && embedded != raw {55
// Marshal eindigt op een newline. Het scriptblok bevat die newline.56
if strings.TrimSpace(embedded) != strings.TrimSpace(raw) {57
t.Fatalf("pagina en API wijken af\npage %q\napi %q", embedded[:80], raw[:80])58
}59
}60
var doc cispec.Doc61
if err := json.Unmarshal([]byte(raw), &doc); err != nil {62
t.Fatal(err)63
}64
if doc.File != "blue-ci-cd.yml" || len(doc.Sections) < 6 {65
t.Fatalf("%+v", doc.File)66
}67
68
nl, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=nl")69
if err != nil {70
t.Fatal(err)71
}72
dutch := read(t, nl)73
if !strings.Contains(dutch, "Volgorde van de stages") || !strings.Contains(dutch, "bluegit/base") {74
t.Fatalf("nl: %s", dutch[:400])75
}76
cu, err := http.Get(ts.URL + "/api/v1/ci/spec?lang=cuneiform")77
if err != nil {78
t.Fatal(err)79
}80
signs := read(t, cu)81
if strings.Contains(signs, "Stage order") || !strings.Contains(signs, `"name":"stages"`) && !strings.Contains(signs, `"name": "stages"`) {82
t.Fatalf("spijkerschrift of sleutelnaam: %s", signs[:300])83
}84
}@@ -0,0 +1,318 @@
1
package server
2
3
import (
4
"context"
5
"html/template"
6
"net/http"
7
"sort"
8
"strconv"
9
"strings"
10
11
"gitlab.com/Timfa/bluegit/internal/access"
12
"gitlab.com/Timfa/bluegit/internal/gitrepo"
13
"gitlab.com/Timfa/bluegit/internal/i18n"
14
"gitlab.com/Timfa/bluegit/internal/markdown"
15
"gitlab.com/Timfa/bluegit/internal/store"
16
)
17
18
func (s *Server) compare(w http.ResponseWriter, r *http.Request) {
19
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)
20
if !ok {
21
return
22
}
23
v := s.repoView(w, r, repo, role, "branch.compare")
24
v.Title = s.tr(r, "branch.compare")
25
v.Page = "compare"
26
v.Wide = true
27
s.fillBranchChoices(r, &v, repo)
28
from := safeRev(r.URL.Query().Get("from"), repo.DefaultBranch)
29
to := safeRev(r.URL.Query().Get("to"), "")
30
s.fillCompare(r, &v, repo, from, to)
31
s.render(w, "compare", v)
32
}
33
34
func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
35
_, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
36
if !ok {
37
return
38
}
39
if !role.CanWriteCode() {
40
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
41
return
42
}
43
v := s.repoView(w, r, repo, role, "mr.create")
44
v.Title = s.tr(r, "mr.create")
45
v.Page = "newmr"
46
v.Wide = true
47
s.fillBranchChoices(r, &v, repo)
48
source := safeRev(r.URL.Query().Get("source"), "")
49
target := safeRev(r.URL.Query().Get("target"), repo.DefaultBranch)
50
if source == "" {
51
for _, b := range v.Branches {
52
if b.Name != target {
53
source = b.Name
54
break
55
}
56
}
57
}
58
s.fillCompare(r, &v, repo, target, source)
59
v.CompareFrom = source
60
v.CompareTo = target
61
s.render(w, "newmr", v)
62
}
63
64
func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
65
u, _, _, ok := s.guard(w, r, access.RoleReadonly)
66
if !ok || !s.csrfOK(w, r) {
67
return
68
}
69
if u.ID == 0 {
70
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
71
return
72
}
73
body := r.FormValue("body")
74
if len(body) > 20000 {
75
body = body[:20000]
76
}
77
w.Header().Set("Content-Type", "text/html; charset=utf-8")
78
_, _ = w.Write([]byte(markdown.Render(body, "", "")))
79
}
80
81
func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
82
u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
83
if !ok || !s.csrfOK(w, r) {
84
return
85
}
86
mr, err := s.mrFromRequest(r, repo.ID)
87
if err != nil {
88
http.NotFound(w, r)
89
return
90
}
91
back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
92
if mr.Status != "open" || u.ID == 0 || (u.ID != mr.AuthorID && !role.CanWriteCode()) {
93
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
94
return
95
}
96
title := strings.TrimSpace(r.FormValue("title"))
97
description := r.FormValue("description")
98
labels := normalizeLabels(r.FormValue("labels"))
99
if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, title, description, labels); err != nil {
100
s.redirect(w, r, back, "", s.trErr(r, err))
101
return
102
}
103
if title != mr.Title {
104
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "retitled", title)
105
}
106
if labels != normalizeLabels(mr.Labels) {
107
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "relabeled", labels)
108
}
109
s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "")
110
}
111
112
func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
113
v.DescHTML = template.HTML(markdown.Render(mr.Description, "", ""))
114
v.Labels = splitLabels(mr.Labels)
115
v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
116
switch r.URL.Query().Get("tab") {
117
case "commits", "pipelines", "changes":
118
v.Tab = r.URL.Query().Get("tab")
119
default:
120
v.Tab = "overview"
121
}
122
s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
123
raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
124
rows := buildNoteRows(raw, s.langOf(r))
125
v.Notes = stampNotes(v.CommitDiff, rows)
126
s.fillTimeline(r, v, repo, mr, rows)
127
}
128
129
func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
130
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
131
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
132
for _, name := range names {
133
v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})
134
}
135
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
136
for _, name := range tags {
137
v.Tags = append(v.Tags, TagRow{Name: name})
138
}
139
}
140
141
// fillCompare vult commits (from..to) en de three-dot diff (from...to).
142
func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) {
143
v.CompareFrom = from
144
v.CompareTo = to
145
if from == "" || to == "" || from == to {
146
return
147
}
148
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149
commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50)
150
if err == nil && len(commits) > 0 {
151
v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
152
if len(commits) == 1 {
153
v.FormTitle = commits[0].Subject
154
}
155
}
156
if v.FormTitle == "" {
157
v.FormTitle = s.tr(r, "mr.mergeTitle", to, from)
158
}
159
files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to)
160
if err == nil {
161
v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files)
162
}
163
if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil {
164
v.Diff = stat
165
}
166
}
167
168
func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
169
lang := s.langOf(r)
170
items := []TimelineItem{{
171
Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
172
When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
173
}}
174
events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
175
for _, e := range events {
176
key := mrEventKey(e.Kind)
177
if key == "" {
178
continue
179
}
180
items = append(items, TimelineItem{
181
Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
182
When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
183
})
184
}
185
revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
186
for _, rev := range revs {
187
items = append(items, TimelineItem{
188
Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
189
When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
190
})
191
}
192
pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID)
193
for _, p := range pipes {
194
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
195
status := displayStatus(p.Status, jobs)
196
label := s.tr(r, "pipe."+status)
197
v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
198
items = append(items, TimelineItem{
199
Kind: "pipeline", Actor: p.Actor,
200
Text: s.tr(r, "mr.pipeEvent", p.ID, label),
201
URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
202
When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
203
})
204
}
205
for _, n := range rows {
206
if n.ParentID != 0 {
207
continue
208
}
209
item := TimelineItem{
210
ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
211
HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
212
}
213
for _, rp := range n.Replies {
214
item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
215
}
216
items = append(items, item)
217
}
218
sort.SliceStable(items, func(i, j int) bool {
219
if items[i].At.Equal(items[j].At) {
220
return items[i].Rank < items[j].Rank
221
}
222
return items[i].At.Before(items[j].At)
223
})
224
v.Timeline = items
225
}
226
227
func mrEventKey(kind string) string {
228
switch kind {
229
case "pushed":
230
return "mr.pushed"
231
case "retitled":
232
return "mr.retitled"
233
case "relabeled":
234
return "mr.relabeled"
235
case "merged":
236
return "mr.mergedEvent"
237
case "closed":
238
return "mr.closedEvent"
239
case "reopened":
240
return "mr.reopenedEvent"
241
default:
242
return ""
243
}
244
}
245
246
func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow {
247
placed := map[int64]bool{}
248
if diff != nil {
249
for i := range diff.Files {
250
for j := range diff.Files[i].Lines {
251
ln := &diff.Files[i].Lines[j]
252
if ln.New == 0 {
253
continue
254
}
255
for _, note := range rows {
256
if note.ParentID != 0 {
257
continue
258
}
259
if note.Path == diff.Files[i].Path && note.End == ln.New {
260
ln.Notes = append(ln.Notes, note)
261
placed[note.ID] = true
262
}
263
}
264
}
265
}
266
}
267
var general []NoteRow
268
for _, note := range rows {
269
if note.ParentID != 0 {
270
continue
271
}
272
if note.Path == "" || !placed[note.ID] {
273
general = append(general, note)
274
}
275
}
276
return general
277
}
278
279
func splitLabels(raw string) []string {
280
var out []string
281
for _, part := range strings.Split(raw, ",") {
282
part = strings.TrimSpace(part)
283
if part != "" {
284
out = append(out, part)
285
}
286
}
287
return out
288
}
289
290
func normalizeLabels(raw string) string {
291
return strings.Join(splitLabels(raw), ", ")
292
}
293
294
func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) {
295
if s.StoragePath() == "" || branch == "" || after == "" {
296
return
297
}
298
ctx := context.Background()
299
mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch)
300
if err != nil || len(mrs) == 0 {
301
return
302
}
303
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
304
rev := after
305
limit := 1
306
if before != "" && strings.Trim(before, "0") != "" {
307
rev = before + ".." + after
308
limit = 20
309
}
310
subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit)
311
if err != nil || len(subjects) == 0 {
312
return
313
}
314
body := strings.Join(subjects, "\n")
315
for _, mr := range mrs {
316
_ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
317
}
318
}
@@ -0,0 +1,318 @@1
package server2
3
import (4
"context"5
"html/template"6
"net/http"7
"sort"8
"strconv"9
"strings"10
11
"gitlab.com/Timfa/bluegit/internal/access"12
"gitlab.com/Timfa/bluegit/internal/gitrepo"13
"gitlab.com/Timfa/bluegit/internal/i18n"14
"gitlab.com/Timfa/bluegit/internal/markdown"15
"gitlab.com/Timfa/bluegit/internal/store"16
)17
18
func (s *Server) compare(w http.ResponseWriter, r *http.Request) {19
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)20
if !ok {21
return22
}23
v := s.repoView(w, r, repo, role, "branch.compare")24
v.Title = s.tr(r, "branch.compare")25
v.Page = "compare"26
v.Wide = true27
s.fillBranchChoices(r, &v, repo)28
from := safeRev(r.URL.Query().Get("from"), repo.DefaultBranch)29
to := safeRev(r.URL.Query().Get("to"), "")30
s.fillCompare(r, &v, repo, from, to)31
s.render(w, "compare", v)32
}33
34
func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {35
_, repo, role, ok := s.guard(w, r, access.RoleDeveloper)36
if !ok {37
return38
}39
if !role.CanWriteCode() {40
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)41
return42
}43
v := s.repoView(w, r, repo, role, "mr.create")44
v.Title = s.tr(r, "mr.create")45
v.Page = "newmr"46
v.Wide = true47
s.fillBranchChoices(r, &v, repo)48
source := safeRev(r.URL.Query().Get("source"), "")49
target := safeRev(r.URL.Query().Get("target"), repo.DefaultBranch)50
if source == "" {51
for _, b := range v.Branches {52
if b.Name != target {53
source = b.Name54
break55
}56
}57
}58
s.fillCompare(r, &v, repo, target, source)59
v.CompareFrom = source60
v.CompareTo = target61
s.render(w, "newmr", v)62
}63
64
func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {65
u, _, _, ok := s.guard(w, r, access.RoleReadonly)66
if !ok || !s.csrfOK(w, r) {67
return68
}69
if u.ID == 0 {70
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)71
return72
}73
body := r.FormValue("body")74
if len(body) > 20000 {75
body = body[:20000]76
}77
w.Header().Set("Content-Type", "text/html; charset=utf-8")78
_, _ = w.Write([]byte(markdown.Render(body, "", "")))79
}80
81
func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {82
u, repo, role, ok := s.guard(w, r, access.RoleReadonly)83
if !ok || !s.csrfOK(w, r) {84
return85
}86
mr, err := s.mrFromRequest(r, repo.ID)87
if err != nil {88
http.NotFound(w, r)89
return90
}91
back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)92
if mr.Status != "open" || u.ID == 0 || (u.ID != mr.AuthorID && !role.CanWriteCode()) {93
http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)94
return95
}96
title := strings.TrimSpace(r.FormValue("title"))97
description := r.FormValue("description")98
labels := normalizeLabels(r.FormValue("labels"))99
if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, title, description, labels); err != nil {100
s.redirect(w, r, back, "", s.trErr(r, err))101
return102
}103
if title != mr.Title {104
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "retitled", title)105
}106
if labels != normalizeLabels(mr.Labels) {107
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "relabeled", labels)108
}109
s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "")110
}111
112
func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {113
v.DescHTML = template.HTML(markdown.Render(mr.Description, "", ""))114
v.Labels = splitLabels(mr.Labels)115
v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)116
switch r.URL.Query().Get("tab") {117
case "commits", "pipelines", "changes":118
v.Tab = r.URL.Query().Get("tab")119
default:120
v.Tab = "overview"121
}122
s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)123
raw, _ := s.Store.ListNotes(r.Context(), mr.ID)124
rows := buildNoteRows(raw, s.langOf(r))125
v.Notes = stampNotes(v.CommitDiff, rows)126
s.fillTimeline(r, v, repo, mr, rows)127
}128
129
func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {130
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)131
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)132
for _, name := range names {133
v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})134
}135
tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)136
for _, name := range tags {137
v.Tags = append(v.Tags, TagRow{Name: name})138
}139
}140
141
// fillCompare vult commits (from..to) en de three-dot diff (from...to).142
func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) {143
v.CompareFrom = from144
v.CompareTo = to145
if from == "" || to == "" || from == to {146
return147
}148
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)149
commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50)150
if err == nil && len(commits) > 0 {151
v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))152
if len(commits) == 1 {153
v.FormTitle = commits[0].Subject154
}155
}156
if v.FormTitle == "" {157
v.FormTitle = s.tr(r, "mr.mergeTitle", to, from)158
}159
files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to)160
if err == nil {161
v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files)162
}163
if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil {164
v.Diff = stat165
}166
}167
168
func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {169
lang := s.langOf(r)170
items := []TimelineItem{{171
Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),172
When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,173
}}174
events, _ := s.Store.ListMREvents(r.Context(), mr.ID)175
for _, e := range events {176
key := mrEventKey(e.Kind)177
if key == "" {178
continue179
}180
items = append(items, TimelineItem{181
Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,182
When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,183
})184
}185
revs, _ := s.Store.ListReviews(r.Context(), mr.ID)186
for _, rev := range revs {187
items = append(items, TimelineItem{188
Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),189
When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,190
})191
}192
pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID)193
for _, p := range pipes {194
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)195
status := displayStatus(p.Status, jobs)196
label := s.tr(r, "pipe."+status)197
v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))198
items = append(items, TimelineItem{199
Kind: "pipeline", Actor: p.Actor,200
Text: s.tr(r, "mr.pipeEvent", p.ID, label),201
URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),202
When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,203
})204
}205
for _, n := range rows {206
if n.ParentID != 0 {207
continue208
}209
item := TimelineItem{210
ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),211
HTML: n.HTML, When: n.When, At: n.At, Rank: 4,212
}213
for _, rp := range n.Replies {214
item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})215
}216
items = append(items, item)217
}218
sort.SliceStable(items, func(i, j int) bool {219
if items[i].At.Equal(items[j].At) {220
return items[i].Rank < items[j].Rank221
}222
return items[i].At.Before(items[j].At)223
})224
v.Timeline = items225
}226
227
func mrEventKey(kind string) string {228
switch kind {229
case "pushed":230
return "mr.pushed"231
case "retitled":232
return "mr.retitled"233
case "relabeled":234
return "mr.relabeled"235
case "merged":236
return "mr.mergedEvent"237
case "closed":238
return "mr.closedEvent"239
case "reopened":240
return "mr.reopenedEvent"241
default:242
return ""243
}244
}245
246
func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow {247
placed := map[int64]bool{}248
if diff != nil {249
for i := range diff.Files {250
for j := range diff.Files[i].Lines {251
ln := &diff.Files[i].Lines[j]252
if ln.New == 0 {253
continue254
}255
for _, note := range rows {256
if note.ParentID != 0 {257
continue258
}259
if note.Path == diff.Files[i].Path && note.End == ln.New {260
ln.Notes = append(ln.Notes, note)261
placed[note.ID] = true262
}263
}264
}265
}266
}267
var general []NoteRow268
for _, note := range rows {269
if note.ParentID != 0 {270
continue271
}272
if note.Path == "" || !placed[note.ID] {273
general = append(general, note)274
}275
}276
return general277
}278
279
func splitLabels(raw string) []string {280
var out []string281
for _, part := range strings.Split(raw, ",") {282
part = strings.TrimSpace(part)283
if part != "" {284
out = append(out, part)285
}286
}287
return out288
}289
290
func normalizeLabels(raw string) string {291
return strings.Join(splitLabels(raw), ", ")292
}293
294
func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) {295
if s.StoragePath() == "" || branch == "" || after == "" {296
return297
}298
ctx := context.Background()299
mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch)300
if err != nil || len(mrs) == 0 {301
return302
}303
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)304
rev := after305
limit := 1306
if before != "" && strings.Trim(before, "0") != "" {307
rev = before + ".." + after308
limit = 20309
}310
subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit)311
if err != nil || len(subjects) == 0 {312
return313
}314
body := strings.Join(subjects, "\n")315
for _, mr := range mrs {316
_ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)317
}318
}@@ -140,6 +140,9 @@ func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeReq
140
140
return nil
141
141
}
142
142
var blocks []string
143
if mr.Draft {
144
blocks = append(blocks, s.tr(r, "mr.block.draft"))
145
}
143
146
if s.Cfg.CI.Enabled && s.StoragePath() != "" {
144
147
blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)
145
148
}
@@ -192,6 +195,6 @@ func (s *Server) fillMRPipeline(r *http.Request, v *View, repo store.Repo, mr st
192
195
if err != nil {
193
196
return
194
197
}
195
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{})
198
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{}, s.queueRanks(r.Context()))
196
199
v.MRPipe = &row
197
200
}
@@ -140,6 +140,9 @@ func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeReq140
return nil140
return nil141
}141
}142
var blocks []string142
var blocks []string143
if mr.Draft {144
blocks = append(blocks, s.tr(r, "mr.block.draft"))145
}143
if s.Cfg.CI.Enabled && s.StoragePath() != "" {146
if s.Cfg.CI.Enabled && s.StoragePath() != "" {144
blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)147
blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)145
}148
}@@ -192,6 +195,6 @@ func (s *Server) fillMRPipeline(r *http.Request, v *View, repo store.Repo, mr st192
if err != nil {195
if err != nil {193
return196
return194
}197
}195
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{})198
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{}, s.queueRanks(r.Context()))196
v.MRPipe = &row199
v.MRPipe = &row197
}200
}@@ -1,8 +1,10 @@
1
1
package server
2
2
3
3
import (
4
"bytes"
4
5
"encoding/json"
5
6
"net/http"
7
"net/url"
6
8
"strconv"
7
9
"strings"
8
10
"time"
@@ -46,6 +48,7 @@ type JobLink struct {
46
48
Name string
47
49
Status string
48
50
Label string
51
Queue string
49
52
Current bool
50
53
Stage string
51
54
}
@@ -82,6 +85,7 @@ type JobPage struct {
82
85
Environment string
83
86
EnvironmentURL string
84
87
EnvironmentLink string
88
Queue string
85
89
}
86
90
87
91
// LogBlock is een losse regel of een inklapbare sectie.
@@ -106,17 +110,42 @@ func (s *Server) fillPipelines(r *http.Request, v *View, repo store.Repo) {
106
110
list, _ := s.Store.ListPipelines(r.Context(), repo.ID)
107
111
q := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("q")))
108
112
v.Query = r.URL.Query().Get("q")
113
ranks := s.queueRanks(r.Context())
109
114
users := map[string]store.User{}
110
115
for _, p := range list {
111
row := s.pipeRow(r, lang, repo, p, users)
116
row := s.pipeRow(r, lang, repo, p, users, ranks)
112
117
if q != "" && !pipeMatches(row, q) {
113
118
continue
114
119
}
120
if rowLive(row) {
121
v.Live = true
122
}
115
123
v.PipeRows = append(v.PipeRows, row)
116
124
}
125
v.LiveURL = repoURL(repo) + "/-/pipelines"
126
if raw := strings.TrimSpace(r.URL.Query().Get("q")); raw != "" {
127
v.LiveURL += "?q=" + url.QueryEscape(raw)
128
}
129
}
130
131
func rowLive(row PipeRow) bool {
132
if row.Status == "pending" || row.Status == "running" {
133
return true
134
}
135
for _, st := range row.Stages {
136
if st.Status == "pending" || st.Status == "running" {
137
return true
138
}
139
for _, j := range st.Jobs {
140
if j.Status == "pending" || j.Status == "running" {
141
return true
142
}
143
}
144
}
145
return false
117
146
}
118
147
119
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User) PipeRow {
148
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User, ranks map[int64]int) PipeRow {
120
149
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
121
150
name, kind := ci.SplitRef(p.Ref)
122
151
status := displayStatus(p.Status, jobs)
@@ -138,7 +167,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
138
167
Duration: formatClock(end.Sub(start)), When: i18n.Ago(lang, p.CreatedAt.Unix()),
139
168
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),
140
169
Ref: name, RefKind: kind, Actor: actor, Avatar: avatar, Initial: initial,
141
Stages: stageViews(lang, jobs, func(key string) string { return s.tr(r, key) }),
170
Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),
142
171
}
143
172
}
144
173
@@ -208,7 +237,7 @@ func displayStatus(pipe string, jobs []store.Job) string {
208
237
return pipe
209
238
}
210
239
211
func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []StageView {
240
func stageViews(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []StageView {
212
241
var order []string
213
242
by := map[string][]store.Job{}
214
243
for _, j := range jobs {
@@ -225,11 +254,13 @@ func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []Stag
225
254
var links []JobLink
226
255
for _, j := range group {
227
256
st := jobDisplay(j)
228
links = append(links, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage})
257
links = append(links, JobLink{
258
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,
259
Queue: queueText(tr, ranks, j.ID),
260
})
229
261
}
230
262
out = append(out, StageView{Name: name, Status: status, Label: label, Tip: name + ": " + strings.ToLower(label), Jobs: links})
231
263
}
232
_ = lang
233
264
return out
234
265
}
235
266
@@ -354,11 +385,18 @@ func (s *Server) jobLog(w http.ResponseWriter, r *http.Request) {
354
385
if offset < 0 || offset > len(job.Log) {
355
386
offset = 0
356
387
}
388
queue := ""
389
if job.Status == "queued" {
390
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
391
queue = queueText(tr, s.queueRanks(r.Context()), job.ID)
392
}
357
393
w.Header().Set("Content-Type", "application/json")
394
w.Header().Set("Cache-Control", "no-store")
358
395
_ = json.NewEncoder(w).Encode(map[string]any{
359
396
"offset": len(job.Log),
360
397
"status": job.Status,
361
398
"text": job.Log[offset:],
399
"queue": queue,
362
400
})
363
401
}
364
402
@@ -438,6 +476,8 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
438
476
if !end.IsZero() {
439
477
finished = i18n.Ago(lang, end.Unix())
440
478
}
479
ranks := s.queueRanks(r.Context())
480
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
441
481
var stages []string
442
482
seen := map[string]bool{}
443
483
var related []JobLink
@@ -447,7 +487,10 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
447
487
stages = append(stages, j.Stage)
448
488
}
449
489
st := jobDisplay(j)
450
related = append(related, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: s.tr(r, "pipe."+st), Current: j.ID == job.ID, Stage: j.Stage})
490
related = append(related, JobLink{
491
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Current: j.ID == job.ID, Stage: j.Stage,
492
Queue: queueText(tr, ranks, j.ID),
493
})
451
494
}
452
495
sourceKey := "pipe.src." + p.Source
453
496
source := s.tr(r, sourceKey)
@@ -462,6 +505,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
462
505
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
463
506
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",
464
507
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),
508
Queue: queueText(tr, ranks, job.ID),
465
509
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),
466
510
}
467
511
}
@@ -531,6 +575,114 @@ func parseLog(raw string) []LogBlock {
531
575
return blocks
532
576
}
533
577
578
func wantsJSON(r *http.Request) bool {
579
return strings.Contains(r.Header.Get("Accept"), "application/json")
580
}
581
582
func jobsLive(pipe string, jobs []store.Job) bool {
583
if pipe == "queued" || pipe == "running" {
584
return true
585
}
586
for _, j := range jobs {
587
if j.Status == "queued" || j.Status == "running" {
588
return true
589
}
590
}
591
return false
592
}
593
594
func linksFor(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []JobLink {
595
out := make([]JobLink, 0, len(jobs))
596
for _, j := range jobs {
597
st := jobDisplay(j)
598
out = append(out, JobLink{
599
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,
600
Queue: queueText(tr, ranks, j.ID),
601
})
602
}
603
return out
604
}
605
606
func (s *Server) partial(name string, v View) string {
607
var buf bytes.Buffer
608
tmpl := s.byLang[v.Lang]
609
if tmpl == nil {
610
tmpl = s.tmpl
611
}
612
if tmpl == nil {
613
return ""
614
}
615
if err := tmpl.ExecuteTemplate(&buf, name, v); err != nil && s.Log != nil {
616
s.Log.Error("sjabloon", "name", name, "err", err)
617
}
618
return buf.String()
619
}
620
621
func (s *Server) writePipeList(w http.ResponseWriter, v View) {
622
type job struct {
623
ID int64 `json:"id"`
624
Name string `json:"name"`
625
Status string `json:"status"`
626
Label string `json:"label"`
627
Queue string `json:"queue"`
628
}
629
type stage struct {
630
Name string `json:"name"`
631
Status string `json:"status"`
632
Tip string `json:"tip"`
633
Jobs []job `json:"jobs"`
634
}
635
type row struct {
636
ID int64 `json:"id"`
637
Status string `json:"status"`
638
Label string `json:"label"`
639
Duration string `json:"duration"`
640
When string `json:"when"`
641
Stages []stage `json:"stages"`
642
HTML string `json:"html"`
643
}
644
rows := make([]row, 0, len(v.PipeRows))
645
for _, pr := range v.PipeRows {
646
one := v
647
one.PipeRows = []PipeRow{pr}
648
item := row{
649
ID: pr.ID, Status: pr.Status, Label: pr.Label, Duration: pr.Duration, When: pr.When,
650
HTML: s.partial("pipe-rows", one),
651
}
652
for _, st := range pr.Stages {
653
jobs := make([]job, 0, len(st.Jobs))
654
for _, j := range st.Jobs {
655
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Queue: j.Queue})
656
}
657
item.Stages = append(item.Stages, stage{Name: st.Name, Status: st.Status, Tip: st.Tip, Jobs: jobs})
658
}
659
rows = append(rows, item)
660
}
661
w.Header().Set("Content-Type", "application/json")
662
w.Header().Set("Cache-Control", "no-store")
663
_ = json.NewEncoder(w).Encode(map[string]any{"active": v.Live, "rows": rows})
664
}
665
666
func (s *Server) writePipeDetail(w http.ResponseWriter, v View) {
667
type job struct {
668
ID int64 `json:"id"`
669
Name string `json:"name"`
670
Status string `json:"status"`
671
Label string `json:"label"`
672
Stage string `json:"stage"`
673
Queue string `json:"queue"`
674
}
675
jobs := make([]job, 0, len(v.PipeJobs))
676
for _, j := range v.PipeJobs {
677
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Stage: j.Stage, Queue: j.Queue})
678
}
679
w.Header().Set("Content-Type", "application/json")
680
w.Header().Set("Cache-Control", "no-store")
681
_ = json.NewEncoder(w).Encode(map[string]any{
682
"active": v.Live, "status": v.PipeStatus, "label": v.PipeLabel, "jobs": jobs,
683
})
684
}
685
534
686
func clockOf(ts string) string {
535
687
if t, err := time.Parse(time.RFC3339, ts); err == nil {
536
688
return t.UTC().Format("15:04:05")
@@ -1,8 +1,10 @@1
package server1
package server2
2
3
import (3
import (4
"bytes"4
"encoding/json"5
"encoding/json"5
"net/http"6
"net/http"7
"net/url"6
"strconv"8
"strconv"7
"strings"9
"strings"8
"time"10
"time"@@ -46,6 +48,7 @@ type JobLink struct {46
Name string48
Name string47
Status string49
Status string48
Label string50
Label string51
Queue string49
Current bool52
Current bool50
Stage string53
Stage string51
}54
}@@ -82,6 +85,7 @@ type JobPage struct {82
Environment string85
Environment string83
EnvironmentURL string86
EnvironmentURL string84
EnvironmentLink string87
EnvironmentLink string88
Queue string85
}89
}86
90
87
// LogBlock is een losse regel of een inklapbare sectie.91
// LogBlock is een losse regel of een inklapbare sectie.@@ -106,17 +110,42 @@ func (s *Server) fillPipelines(r *http.Request, v *View, repo store.Repo) {106
list, _ := s.Store.ListPipelines(r.Context(), repo.ID)110
list, _ := s.Store.ListPipelines(r.Context(), repo.ID)107
q := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("q")))111
q := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("q")))108
v.Query = r.URL.Query().Get("q")112
v.Query = r.URL.Query().Get("q")113
ranks := s.queueRanks(r.Context())109
users := map[string]store.User{}114
users := map[string]store.User{}110
for _, p := range list {115
for _, p := range list {111
row := s.pipeRow(r, lang, repo, p, users)116
row := s.pipeRow(r, lang, repo, p, users, ranks)112
if q != "" && !pipeMatches(row, q) {117
if q != "" && !pipeMatches(row, q) {113
continue118
continue114
}119
}120
if rowLive(row) {121
v.Live = true122
}115
v.PipeRows = append(v.PipeRows, row)123
v.PipeRows = append(v.PipeRows, row)116
}124
}125
v.LiveURL = repoURL(repo) + "/-/pipelines"126
if raw := strings.TrimSpace(r.URL.Query().Get("q")); raw != "" {127
v.LiveURL += "?q=" + url.QueryEscape(raw)128
}129
}130
131
func rowLive(row PipeRow) bool {132
if row.Status == "pending" || row.Status == "running" {133
return true134
}135
for _, st := range row.Stages {136
if st.Status == "pending" || st.Status == "running" {137
return true138
}139
for _, j := range st.Jobs {140
if j.Status == "pending" || j.Status == "running" {141
return true142
}143
}144
}145
return false117
}146
}118
147
119
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User) PipeRow {148
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User, ranks map[int64]int) PipeRow {120
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)149
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)121
name, kind := ci.SplitRef(p.Ref)150
name, kind := ci.SplitRef(p.Ref)122
status := displayStatus(p.Status, jobs)151
status := displayStatus(p.Status, jobs)@@ -138,7 +167,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto138
Duration: formatClock(end.Sub(start)), When: i18n.Ago(lang, p.CreatedAt.Unix()),167
Duration: formatClock(end.Sub(start)), When: i18n.Ago(lang, p.CreatedAt.Unix()),139
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),168
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),140
Ref: name, RefKind: kind, Actor: actor, Avatar: avatar, Initial: initial,169
Ref: name, RefKind: kind, Actor: actor, Avatar: avatar, Initial: initial,141
Stages: stageViews(lang, jobs, func(key string) string { return s.tr(r, key) }),170
Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),142
}171
}143
}172
}144
173
@@ -208,7 +237,7 @@ func displayStatus(pipe string, jobs []store.Job) string {208
return pipe237
return pipe209
}238
}210
239
211
func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []StageView {240
func stageViews(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []StageView {212
var order []string241
var order []string213
by := map[string][]store.Job{}242
by := map[string][]store.Job{}214
for _, j := range jobs {243
for _, j := range jobs {@@ -225,11 +254,13 @@ func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []Stag225
var links []JobLink254
var links []JobLink226
for _, j := range group {255
for _, j := range group {227
st := jobDisplay(j)256
st := jobDisplay(j)228
links = append(links, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage})257
links = append(links, JobLink{258
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,259
Queue: queueText(tr, ranks, j.ID),260
})229
}261
}230
out = append(out, StageView{Name: name, Status: status, Label: label, Tip: name + ": " + strings.ToLower(label), Jobs: links})262
out = append(out, StageView{Name: name, Status: status, Label: label, Tip: name + ": " + strings.ToLower(label), Jobs: links})231
}263
}232
_ = lang233
return out264
return out234
}265
}235
266
@@ -354,11 +385,18 @@ func (s *Server) jobLog(w http.ResponseWriter, r *http.Request) {354
if offset < 0 || offset > len(job.Log) {385
if offset < 0 || offset > len(job.Log) {355
offset = 0386
offset = 0356
}387
}388
queue := ""389
if job.Status == "queued" {390
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }391
queue = queueText(tr, s.queueRanks(r.Context()), job.ID)392
}357
w.Header().Set("Content-Type", "application/json")393
w.Header().Set("Content-Type", "application/json")394
w.Header().Set("Cache-Control", "no-store")358
_ = json.NewEncoder(w).Encode(map[string]any{395
_ = json.NewEncoder(w).Encode(map[string]any{359
"offset": len(job.Log),396
"offset": len(job.Log),360
"status": job.Status,397
"status": job.Status,361
"text": job.Log[offset:],398
"text": job.Log[offset:],399
"queue": queue,362
})400
})363
}401
}364
402
@@ -438,6 +476,8 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job438
if !end.IsZero() {476
if !end.IsZero() {439
finished = i18n.Ago(lang, end.Unix())477
finished = i18n.Ago(lang, end.Unix())440
}478
}479
ranks := s.queueRanks(r.Context())480
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }441
var stages []string481
var stages []string442
seen := map[string]bool{}482
seen := map[string]bool{}443
var related []JobLink483
var related []JobLink@@ -447,7 +487,10 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job447
stages = append(stages, j.Stage)487
stages = append(stages, j.Stage)448
}488
}449
st := jobDisplay(j)489
st := jobDisplay(j)450
related = append(related, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: s.tr(r, "pipe."+st), Current: j.ID == job.ID, Stage: j.Stage})490
related = append(related, JobLink{491
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Current: j.ID == job.ID, Stage: j.Stage,492
Queue: queueText(tr, ranks, j.ID),493
})451
}494
}452
sourceKey := "pipe.src." + p.Source495
sourceKey := "pipe.src." + p.Source453
source := s.tr(r, sourceKey)496
source := s.tr(r, sourceKey)@@ -462,6 +505,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job462
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),505
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),463
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",506
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",464
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),507
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),508
Queue: queueText(tr, ranks, job.ID),465
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),509
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),466
}510
}467
}511
}@@ -531,6 +575,114 @@ func parseLog(raw string) []LogBlock {531
return blocks575
return blocks532
}576
}533
577
578
func wantsJSON(r *http.Request) bool {579
return strings.Contains(r.Header.Get("Accept"), "application/json")580
}581
582
func jobsLive(pipe string, jobs []store.Job) bool {583
if pipe == "queued" || pipe == "running" {584
return true585
}586
for _, j := range jobs {587
if j.Status == "queued" || j.Status == "running" {588
return true589
}590
}591
return false592
}593
594
func linksFor(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []JobLink {595
out := make([]JobLink, 0, len(jobs))596
for _, j := range jobs {597
st := jobDisplay(j)598
out = append(out, JobLink{599
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,600
Queue: queueText(tr, ranks, j.ID),601
})602
}603
return out604
}605
606
func (s *Server) partial(name string, v View) string {607
var buf bytes.Buffer608
tmpl := s.byLang[v.Lang]609
if tmpl == nil {610
tmpl = s.tmpl611
}612
if tmpl == nil {613
return ""614
}615
if err := tmpl.ExecuteTemplate(&buf, name, v); err != nil && s.Log != nil {616
s.Log.Error("sjabloon", "name", name, "err", err)617
}618
return buf.String()619
}620
621
func (s *Server) writePipeList(w http.ResponseWriter, v View) {622
type job struct {623
ID int64 `json:"id"`624
Name string `json:"name"`625
Status string `json:"status"`626
Label string `json:"label"`627
Queue string `json:"queue"`628
}629
type stage struct {630
Name string `json:"name"`631
Status string `json:"status"`632
Tip string `json:"tip"`633
Jobs []job `json:"jobs"`634
}635
type row struct {636
ID int64 `json:"id"`637
Status string `json:"status"`638
Label string `json:"label"`639
Duration string `json:"duration"`640
When string `json:"when"`641
Stages []stage `json:"stages"`642
HTML string `json:"html"`643
}644
rows := make([]row, 0, len(v.PipeRows))645
for _, pr := range v.PipeRows {646
one := v647
one.PipeRows = []PipeRow{pr}648
item := row{649
ID: pr.ID, Status: pr.Status, Label: pr.Label, Duration: pr.Duration, When: pr.When,650
HTML: s.partial("pipe-rows", one),651
}652
for _, st := range pr.Stages {653
jobs := make([]job, 0, len(st.Jobs))654
for _, j := range st.Jobs {655
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Queue: j.Queue})656
}657
item.Stages = append(item.Stages, stage{Name: st.Name, Status: st.Status, Tip: st.Tip, Jobs: jobs})658
}659
rows = append(rows, item)660
}661
w.Header().Set("Content-Type", "application/json")662
w.Header().Set("Cache-Control", "no-store")663
_ = json.NewEncoder(w).Encode(map[string]any{"active": v.Live, "rows": rows})664
}665
666
func (s *Server) writePipeDetail(w http.ResponseWriter, v View) {667
type job struct {668
ID int64 `json:"id"`669
Name string `json:"name"`670
Status string `json:"status"`671
Label string `json:"label"`672
Stage string `json:"stage"`673
Queue string `json:"queue"`674
}675
jobs := make([]job, 0, len(v.PipeJobs))676
for _, j := range v.PipeJobs {677
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Stage: j.Stage, Queue: j.Queue})678
}679
w.Header().Set("Content-Type", "application/json")680
w.Header().Set("Cache-Control", "no-store")681
_ = json.NewEncoder(w).Encode(map[string]any{682
"active": v.Live, "status": v.PipeStatus, "label": v.PipeLabel, "jobs": jobs,683
})684
}685
534
func clockOf(ts string) string {686
func clockOf(ts string) string {535
if t, err := time.Parse(time.RFC3339, ts); err == nil {687
if t, err := time.Parse(time.RFC3339, ts); err == nil {536
return t.UTC().Format("15:04:05")688
return t.UTC().Format("15:04:05")@@ -139,7 +139,7 @@ func TestPipelinePages(t *testing.T) {
139
139
for _, want := range []string{
140
140
"Filter pipelines", "Show Pipeline ID", "Created by", "Stages",
141
141
"Warning", "Failed", "v0.0.26", "feat: groene run",
142
`data-tip="test: warning"`, `data-tip="deploy: skipped"`,
142
`data-tip="test: warning"`, `data-tip="deploy: skipped"`, `popover="manual"`,
143
143
"class=\"stage-dot failed\"", "flake", "build",
144
144
} {
145
145
if !strings.Contains(page, want) {
@@ -139,7 +139,7 @@ func TestPipelinePages(t *testing.T) {139
for _, want := range []string{139
for _, want := range []string{140
"Filter pipelines", "Show Pipeline ID", "Created by", "Stages",140
"Filter pipelines", "Show Pipeline ID", "Created by", "Stages",141
"Warning", "Failed", "v0.0.26", "feat: groene run",141
"Warning", "Failed", "v0.0.26", "feat: groene run",142
`data-tip="test: warning"`, `data-tip="deploy: skipped"`,142
`data-tip="test: warning"`, `data-tip="deploy: skipped"`, `popover="manual"`,143
"class=\"stage-dot failed\"", "flake", "build",143
"class=\"stage-dot failed\"", "flake", "build",144
} {144
} {145
if !strings.Contains(page, want) {145
if !strings.Contains(page, want) {@@ -1,6 +1,7 @@
1
1
package server
2
2
3
3
import (
4
"context"
4
5
"fmt"
5
6
"html/template"
6
7
"net/http"
@@ -23,6 +24,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
23
24
lang := i18n.Parse(v.Lang)
24
25
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
25
26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
27
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
26
28
v.Head = &rows[0]
27
29
}
28
30
}
@@ -82,6 +84,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
82
84
}
83
85
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
84
86
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
87
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
85
88
v.Head = &rows[0]
86
89
}
87
90
}
@@ -103,6 +106,21 @@ func (s *Server) branchList(r *http.Request, v *View, dir string) {
103
106
}
104
107
}
105
108
109
func (s *Server) attachHeadPipeline(ctx context.Context, repo store.Repo, row *CommitRow, lang i18n.Lang) {
110
if row == nil || row.SHA == "" || s.Store == nil {
111
return
112
}
113
p, err := s.Store.LatestPipelineByCommit(ctx, repo.ID, row.SHA)
114
if err != nil {
115
return
116
}
117
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)
118
status := displayStatus(p.Status, jobs)
119
row.PipeID = p.ID
120
row.PipeStatus = status
121
row.PipeLabel = i18n.T(lang, "pipe."+status)
122
}
123
106
124
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {
107
125
var out []FileRow
108
126
for _, e := range entries {
@@ -1,6 +1,7 @@1
package server1
package server2
2
3
import (3
import (4
"context"4
"fmt"5
"fmt"5
"html/template"6
"html/template"6
"net/http"7
"net/http"@@ -23,6 +24,7 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {23
lang := i18n.Parse(v.Lang)24
lang := i18n.Parse(v.Lang)24
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {25
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {26
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {27
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)26
v.Head = &rows[0]28
v.Head = &rows[0]27
}29
}28
}30
}@@ -82,6 +84,7 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string82
}84
}83
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {85
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {84
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {86
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {87
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)85
v.Head = &rows[0]88
v.Head = &rows[0]86
}89
}87
}90
}@@ -103,6 +106,21 @@ func (s *Server) branchList(r *http.Request, v *View, dir string) {103
}106
}104
}107
}105
108
109
func (s *Server) attachHeadPipeline(ctx context.Context, repo store.Repo, row *CommitRow, lang i18n.Lang) {110
if row == nil || row.SHA == "" || s.Store == nil {111
return112
}113
p, err := s.Store.LatestPipelineByCommit(ctx, repo.ID, row.SHA)114
if err != nil {115
return116
}117
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)118
status := displayStatus(p.Status, jobs)119
row.PipeID = p.ID120
row.PipeStatus = status121
row.PipeLabel = i18n.T(lang, "pipe."+status)122
}123
106
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {124
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {107
var out []FileRow125
var out []FileRow108
for _, e := range entries {126
for _, e := range entries {@@ -0,0 +1,103 @@
1
package server
2
3
import (
4
"context"
5
"fmt"
6
7
"gitlab.com/Timfa/bluegit/internal/ci"
8
"gitlab.com/Timfa/bluegit/internal/store"
9
)
10
11
// pipeSnap is één pipeline in de volgorde waarin Steve jobs oppakt.
12
type pipeSnap struct {
13
Jobs []store.Job
14
}
15
16
// queueRanks geeft elke startklare queued job zijn plek in Steves
17
// globale wachtrij. ci.concurrency beperkt hoeveel jobs tegelijk
18
// running worden; die lopende jobs houden hun slot en krijgen geen
19
// nummer. De wachtenden blijven 1, 2, 3, … tot er een slot vrijkomt.
20
// Een job die nog op een voorganger of een resourcegroep wacht, heeft
21
// geen plek: Steve slaat die over.
22
func (s *Server) queueRanks(ctx context.Context) map[int64]int {
23
pipes, err := s.Store.ActivePipelines(ctx)
24
if err != nil {
25
return map[int64]int{}
26
}
27
snaps := make([]pipeSnap, 0, len(pipes))
28
for _, p := range pipes {
29
jobs, err := s.Store.JobsByPipeline(ctx, p.ID)
30
if err != nil {
31
continue
32
}
33
snaps = append(snaps, pipeSnap{Jobs: jobs})
34
}
35
return rankQueue(snaps)
36
}
37
38
func queueText(tr func(string, ...any) string, ranks map[int64]int, id int64) string {
39
if ranks == nil {
40
return ""
41
}
42
n := ranks[id]
43
if n < 1 {
44
return ""
45
}
46
return tr("pipe.queuePos", n)
47
}
48
49
// rankQueue nummert startklare jobs vanaf 1. Pipelines staan op id,
50
// jobs daarbinnen op positie. Jobs die al running zijn vullen een
51
// concurrency-slot en staan niet in de telling, zodat de eerstvolgende
52
// wachtende job #1 is, ook als Steve al vol zit.
53
func rankQueue(pipes []pipeSnap) map[int64]int {
54
busy := map[string]bool{}
55
for _, p := range pipes {
56
for _, j := range p.Jobs {
57
if j.Status == "running" && j.ResourceGroup != "" {
58
busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] = true
59
}
60
}
61
}
62
ranks := map[int64]int{}
63
n := 0
64
for _, p := range pipes {
65
specs, status := ciSpecs(p.Jobs)
66
for _, j := range p.Jobs {
67
if j.Status != "queued" {
68
continue
69
}
70
if j.ResourceGroup != "" && busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] {
71
continue
72
}
73
if ci.Gate(specs, status, specs[indexJob(p.Jobs, j.Name)]) != "ready" {
74
continue
75
}
76
n++
77
ranks[j.ID] = n
78
}
79
}
80
return ranks
81
}
82
83
func ciSpecs(jobs []store.Job) ([]ci.Job, map[string]string) {
84
specs := make([]ci.Job, len(jobs))
85
status := map[string]string{}
86
for i, j := range jobs {
87
specs[i] = ci.Job{
88
Name: j.Name, Stage: j.Stage, Needs: j.Needs, Optional: j.Optional,
89
NeedsSet: j.NeedsSet, AllowFailure: j.AllowFailure, When: j.When,
90
}
91
status[j.Name] = j.Status
92
}
93
return specs, status
94
}
95
96
func indexJob(jobs []store.Job, name string) int {
97
for i, j := range jobs {
98
if j.Name == name {
99
return i
100
}
101
}
102
return 0
103
}
@@ -0,0 +1,103 @@1
package server2
3
import (4
"context"5
"fmt"6
7
"gitlab.com/Timfa/bluegit/internal/ci"8
"gitlab.com/Timfa/bluegit/internal/store"9
)10
11
// pipeSnap is één pipeline in de volgorde waarin Steve jobs oppakt.12
type pipeSnap struct {13
Jobs []store.Job14
}15
16
// queueRanks geeft elke startklare queued job zijn plek in Steves17
// globale wachtrij. ci.concurrency beperkt hoeveel jobs tegelijk18
// running worden; die lopende jobs houden hun slot en krijgen geen19
// nummer. De wachtenden blijven 1, 2, 3, … tot er een slot vrijkomt.20
// Een job die nog op een voorganger of een resourcegroep wacht, heeft21
// geen plek: Steve slaat die over.22
func (s *Server) queueRanks(ctx context.Context) map[int64]int {23
pipes, err := s.Store.ActivePipelines(ctx)24
if err != nil {25
return map[int64]int{}26
}27
snaps := make([]pipeSnap, 0, len(pipes))28
for _, p := range pipes {29
jobs, err := s.Store.JobsByPipeline(ctx, p.ID)30
if err != nil {31
continue32
}33
snaps = append(snaps, pipeSnap{Jobs: jobs})34
}35
return rankQueue(snaps)36
}37
38
func queueText(tr func(string, ...any) string, ranks map[int64]int, id int64) string {39
if ranks == nil {40
return ""41
}42
n := ranks[id]43
if n < 1 {44
return ""45
}46
return tr("pipe.queuePos", n)47
}48
49
// rankQueue nummert startklare jobs vanaf 1. Pipelines staan op id,50
// jobs daarbinnen op positie. Jobs die al running zijn vullen een51
// concurrency-slot en staan niet in de telling, zodat de eerstvolgende52
// wachtende job #1 is, ook als Steve al vol zit.53
func rankQueue(pipes []pipeSnap) map[int64]int {54
busy := map[string]bool{}55
for _, p := range pipes {56
for _, j := range p.Jobs {57
if j.Status == "running" && j.ResourceGroup != "" {58
busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] = true59
}60
}61
}62
ranks := map[int64]int{}63
n := 064
for _, p := range pipes {65
specs, status := ciSpecs(p.Jobs)66
for _, j := range p.Jobs {67
if j.Status != "queued" {68
continue69
}70
if j.ResourceGroup != "" && busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] {71
continue72
}73
if ci.Gate(specs, status, specs[indexJob(p.Jobs, j.Name)]) != "ready" {74
continue75
}76
n++77
ranks[j.ID] = n78
}79
}80
return ranks81
}82
83
func ciSpecs(jobs []store.Job) ([]ci.Job, map[string]string) {84
specs := make([]ci.Job, len(jobs))85
status := map[string]string{}86
for i, j := range jobs {87
specs[i] = ci.Job{88
Name: j.Name, Stage: j.Stage, Needs: j.Needs, Optional: j.Optional,89
NeedsSet: j.NeedsSet, AllowFailure: j.AllowFailure, When: j.When,90
}91
status[j.Name] = j.Status92
}93
return specs, status94
}95
96
func indexJob(jobs []store.Job, name string) int {97
for i, j := range jobs {98
if j.Name == name {99
return i100
}101
}102
return 0103
}@@ -0,0 +1,166 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"path/filepath"
9
"strconv"
10
"strings"
11
"testing"
12
13
"gitlab.com/Timfa/bluegit/internal/auth"
14
"gitlab.com/Timfa/bluegit/internal/config"
15
"gitlab.com/Timfa/bluegit/internal/store"
16
)
17
18
func TestRankQueueSkipsWaitersAndRunning(t *testing.T) {
19
first := pipeSnap{Jobs: []store.Job{
20
{ID: 1, Name: "lint", Stage: "test", Status: "queued", Position: 0},
21
{ID: 2, Name: "unit", Stage: "test", Status: "queued", Position: 1},
22
{ID: 3, Name: "ship", Stage: "deploy", Status: "queued", Position: 2},
23
}}
24
ranks := rankQueue([]pipeSnap{first})
25
if ranks[1] != 1 || ranks[2] != 2 || ranks[3] != 0 {
26
t.Fatalf("zelfde stage vóór deploy: %#v", ranks)
27
}
28
busy := []pipeSnap{{Jobs: []store.Job{
29
{ID: 10, RepoID: 1, Name: "hold", Stage: "test", Status: "running", ResourceGroup: "db"},
30
{ID: 11, RepoID: 1, Name: "wait", Stage: "test", Status: "queued", ResourceGroup: "db"},
31
{ID: 12, RepoID: 1, Name: "other", Stage: "test", Status: "queued"},
32
}}}
33
ranks = rankQueue(busy)
34
if ranks[10] != 0 || ranks[11] != 0 || ranks[12] != 1 {
35
t.Fatalf("running vult een slot, resourcegroep telt niet mee: %#v", ranks)
36
}
37
later := rankQueue([]pipeSnap{
38
{Jobs: []store.Job{{ID: 4, Name: "old", Stage: "test", Status: "queued"}}},
39
{Jobs: []store.Job{{ID: 5, Name: "new", Stage: "test", Status: "queued"}}},
40
})
41
if later[4] != 1 || later[5] != 2 {
42
t.Fatalf("oudere pipeline eerst: %#v", later)
43
}
44
}
45
46
func TestPipelineLiveQueue(t *testing.T) {
47
storage := t.TempDir()
48
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
49
if err != nil {
50
t.Fatal(err)
51
}
52
t.Cleanup(func() { _ = st.Close() })
53
cfg := config.Config{
54
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
55
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
56
Git: config.Git{Binary: "git", DefaultBranch: "master"},
57
CI: config.CI{Concurrency: 1},
58
}
59
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git"}
60
ts := httptest.NewServer(srv.Handler())
61
t.Cleanup(ts.Close)
62
jar, _ := cookiejar.New(nil)
63
client := &http.Client{Jar: jar}
64
res, err := client.Get(ts.URL + "/login")
65
if err != nil {
66
t.Fatal(err)
67
}
68
_ = res.Body.Close()
69
ctx := context.Background()
70
user, err := st.UserByUsername(ctx, "tim")
71
if err != nil {
72
t.Fatal(err)
73
}
74
repo, err := st.CreateRepo(ctx, "user", user.ID, "demo", "", "master", "private")
75
if err != nil {
76
t.Fatal(err)
77
}
78
sha := "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
79
id, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "tim", "wachtrij", []store.NewJob{
80
{Name: "lint", Stage: "test", Script: "exit 0"},
81
{Name: "unit", Stage: "test", Script: "exit 0"},
82
{Name: "ship", Stage: "deploy", Script: "exit 0"},
83
})
84
if err != nil {
85
t.Fatal(err)
86
}
87
jobs, err := st.JobsByPipeline(ctx, id)
88
if err != nil {
89
t.Fatal(err)
90
}
91
var lint, unit int64
92
for _, j := range jobs {
93
switch j.Name {
94
case "lint":
95
lint = j.ID
96
case "unit":
97
unit = j.ID
98
}
99
}
100
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines")
101
if err != nil {
102
t.Fatal(err)
103
}
104
page := read(t, res)
105
for _, want := range []string{
106
"In queue (#1)", "In queue (#2)", `data-live-on="1"`, `data-pipe="` + strconv.FormatInt(id, 10) + `"`,
107
} {
108
if !strings.Contains(page, want) {
109
t.Errorf("lijst mist %q", want)
110
}
111
}
112
if strings.Contains(page, "In queue (#3)") {
113
t.Fatal("deploy wacht op test en hoort geen plek te hebben")
114
}
115
req, _ := http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)
116
req.Header.Set("Accept", "application/json")
117
res, err = client.Do(req)
118
if err != nil {
119
t.Fatal(err)
120
}
121
body := read(t, res)
122
if !strings.Contains(body, `"active":true`) || !strings.Contains(body, `"queue":"In queue (#2)"`) {
123
t.Fatalf("live json:\n%s", body)
124
}
125
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10))
126
if err != nil {
127
t.Fatal(err)
128
}
129
detail := read(t, res)
130
if !strings.Contains(detail, "In queue (#1)") || !strings.Contains(detail, `data-live-on="1"`) {
131
t.Fatalf("detail:\n%s", detail)
132
}
133
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(lint, 10))
134
if err != nil {
135
t.Fatal(err)
136
}
137
jobPage := read(t, res)
138
if !strings.Contains(jobPage, "In queue (#1)") {
139
t.Fatalf("job:\n%s", jobPage)
140
}
141
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(unit, 10))
142
if err != nil {
143
t.Fatal(err)
144
}
145
if unitPage := read(t, res); !strings.Contains(unitPage, "In queue (#2)") {
146
t.Fatalf("tweede job:\n%s", unitPage)
147
}
148
for _, j := range jobs {
149
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
150
t.Fatal(err)
151
}
152
}
153
if _, err := st.RefreshPipelineStatus(ctx, id); err != nil {
154
t.Fatal(err)
155
}
156
req, _ = http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)
157
req.Header.Set("Accept", "application/json")
158
res, err = client.Do(req)
159
if err != nil {
160
t.Fatal(err)
161
}
162
done := read(t, res)
163
if !strings.Contains(done, `"active":false`) || strings.Contains(done, "In queue") {
164
t.Fatalf("stilgevallen:\n%s", done)
165
}
166
}
@@ -0,0 +1,166 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"path/filepath"9
"strconv"10
"strings"11
"testing"12
13
"gitlab.com/Timfa/bluegit/internal/auth"14
"gitlab.com/Timfa/bluegit/internal/config"15
"gitlab.com/Timfa/bluegit/internal/store"16
)17
18
func TestRankQueueSkipsWaitersAndRunning(t *testing.T) {19
first := pipeSnap{Jobs: []store.Job{20
{ID: 1, Name: "lint", Stage: "test", Status: "queued", Position: 0},21
{ID: 2, Name: "unit", Stage: "test", Status: "queued", Position: 1},22
{ID: 3, Name: "ship", Stage: "deploy", Status: "queued", Position: 2},23
}}24
ranks := rankQueue([]pipeSnap{first})25
if ranks[1] != 1 || ranks[2] != 2 || ranks[3] != 0 {26
t.Fatalf("zelfde stage vóór deploy: %#v", ranks)27
}28
busy := []pipeSnap{{Jobs: []store.Job{29
{ID: 10, RepoID: 1, Name: "hold", Stage: "test", Status: "running", ResourceGroup: "db"},30
{ID: 11, RepoID: 1, Name: "wait", Stage: "test", Status: "queued", ResourceGroup: "db"},31
{ID: 12, RepoID: 1, Name: "other", Stage: "test", Status: "queued"},32
}}}33
ranks = rankQueue(busy)34
if ranks[10] != 0 || ranks[11] != 0 || ranks[12] != 1 {35
t.Fatalf("running vult een slot, resourcegroep telt niet mee: %#v", ranks)36
}37
later := rankQueue([]pipeSnap{38
{Jobs: []store.Job{{ID: 4, Name: "old", Stage: "test", Status: "queued"}}},39
{Jobs: []store.Job{{ID: 5, Name: "new", Stage: "test", Status: "queued"}}},40
})41
if later[4] != 1 || later[5] != 2 {42
t.Fatalf("oudere pipeline eerst: %#v", later)43
}44
}45
46
func TestPipelineLiveQueue(t *testing.T) {47
storage := t.TempDir()48
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())49
if err != nil {50
t.Fatal(err)51
}52
t.Cleanup(func() { _ = st.Close() })53
cfg := config.Config{54
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,55
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},56
Git: config.Git{Binary: "git", DefaultBranch: "master"},57
CI: config.CI{Concurrency: 1},58
}59
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git"}60
ts := httptest.NewServer(srv.Handler())61
t.Cleanup(ts.Close)62
jar, _ := cookiejar.New(nil)63
client := &http.Client{Jar: jar}64
res, err := client.Get(ts.URL + "/login")65
if err != nil {66
t.Fatal(err)67
}68
_ = res.Body.Close()69
ctx := context.Background()70
user, err := st.UserByUsername(ctx, "tim")71
if err != nil {72
t.Fatal(err)73
}74
repo, err := st.CreateRepo(ctx, "user", user.ID, "demo", "", "master", "private")75
if err != nil {76
t.Fatal(err)77
}78
sha := "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"79
id, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "tim", "wachtrij", []store.NewJob{80
{Name: "lint", Stage: "test", Script: "exit 0"},81
{Name: "unit", Stage: "test", Script: "exit 0"},82
{Name: "ship", Stage: "deploy", Script: "exit 0"},83
})84
if err != nil {85
t.Fatal(err)86
}87
jobs, err := st.JobsByPipeline(ctx, id)88
if err != nil {89
t.Fatal(err)90
}91
var lint, unit int6492
for _, j := range jobs {93
switch j.Name {94
case "lint":95
lint = j.ID96
case "unit":97
unit = j.ID98
}99
}100
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines")101
if err != nil {102
t.Fatal(err)103
}104
page := read(t, res)105
for _, want := range []string{106
"In queue (#1)", "In queue (#2)", `data-live-on="1"`, `data-pipe="` + strconv.FormatInt(id, 10) + `"`,107
} {108
if !strings.Contains(page, want) {109
t.Errorf("lijst mist %q", want)110
}111
}112
if strings.Contains(page, "In queue (#3)") {113
t.Fatal("deploy wacht op test en hoort geen plek te hebben")114
}115
req, _ := http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)116
req.Header.Set("Accept", "application/json")117
res, err = client.Do(req)118
if err != nil {119
t.Fatal(err)120
}121
body := read(t, res)122
if !strings.Contains(body, `"active":true`) || !strings.Contains(body, `"queue":"In queue (#2)"`) {123
t.Fatalf("live json:\n%s", body)124
}125
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10))126
if err != nil {127
t.Fatal(err)128
}129
detail := read(t, res)130
if !strings.Contains(detail, "In queue (#1)") || !strings.Contains(detail, `data-live-on="1"`) {131
t.Fatalf("detail:\n%s", detail)132
}133
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(lint, 10))134
if err != nil {135
t.Fatal(err)136
}137
jobPage := read(t, res)138
if !strings.Contains(jobPage, "In queue (#1)") {139
t.Fatalf("job:\n%s", jobPage)140
}141
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(unit, 10))142
if err != nil {143
t.Fatal(err)144
}145
if unitPage := read(t, res); !strings.Contains(unitPage, "In queue (#2)") {146
t.Fatalf("tweede job:\n%s", unitPage)147
}148
for _, j := range jobs {149
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {150
t.Fatal(err)151
}152
}153
if _, err := st.RefreshPipelineStatus(ctx, id); err != nil {154
t.Fatal(err)155
}156
req, _ = http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)157
req.Header.Set("Accept", "application/json")158
res, err = client.Do(req)159
if err != nil {160
t.Fatal(err)161
}162
done := read(t, res)163
if !strings.Contains(done, `"active":false`) || strings.Contains(done, "In queue") {164
t.Fatalf("stilgevallen:\n%s", done)165
}166
}@@ -0,0 +1,345 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"net/url"
9
"os/exec"
10
"path/filepath"
11
"strings"
12
"testing"
13
"time"
14
15
"gitlab.com/Timfa/bluegit/internal/auth"
16
"gitlab.com/Timfa/bluegit/internal/config"
17
"gitlab.com/Timfa/bluegit/internal/gitrepo"
18
"gitlab.com/Timfa/bluegit/internal/store"
19
)
20
21
const receiveYML = "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo ok\n"
22
23
func TestPostReceiveStartsPipeline(t *testing.T) {
24
if _, err := exec.LookPath("git"); err != nil {
25
t.Skip("git ontbreekt")
26
}
27
storage := t.TempDir()
28
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
29
if err != nil {
30
t.Fatal(err)
31
}
32
t.Cleanup(func() { _ = st.Close() })
33
cfg := config.Config{
34
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
35
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
36
Git: config.Git{Binary: "git", DefaultBranch: "master"},
37
CI: config.CI{Enabled: true, Docker: "docker"},
38
}
39
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
40
ts := httptest.NewServer(srv.Handler())
41
t.Cleanup(ts.Close)
42
jar, _ := cookiejar.New(nil)
43
tim := &http.Client{Jar: jar}
44
res, err := tim.Get(ts.URL + "/login")
45
if err != nil {
46
t.Fatal(err)
47
}
48
page := read(t, res)
49
res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
50
"csrf": {csrfOf(t, page)}, "name": {"ontvangen"}, "visibility": {"public"},
51
})
52
if err != nil {
53
t.Fatal(err)
54
}
55
page = read(t, res)
56
ctx := context.Background()
57
repo, err := st.RepoByPath(ctx, "tim", "ontvangen")
58
if err != nil {
59
t.Fatal(err)
60
}
61
user, err := st.UserByUsername(ctx, "tim")
62
if err != nil {
63
t.Fatal(err)
64
}
65
hookID, err := st.CreateWebhook(ctx, store.Webhook{
66
ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",
67
URLTemplate: "http://127.0.0.1:9/hook", Events: []string{"push"},
68
})
69
if err != nil {
70
t.Fatal(err)
71
}
72
res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
73
if err != nil {
74
t.Fatal(err)
75
}
76
token := between(read(t, res), `<p class="code">`, "</p>")
77
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/ontvangen.git"
78
work := t.TempDir()
79
git(t, work, "init", "-b", "master")
80
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
81
git(t, work, "config", "user.name", "tim")
82
writeFile(t, filepath.Join(work, "README.md"), "hallo\n")
83
git(t, work, "add", "README.md")
84
git(t, work, "commit", "-m", "leesmij")
85
git(t, work, "remote", "add", "origin", remote)
86
git(t, work, "push", "-u", "origin", "master")
87
88
if n := pipelineCount(t, st, repo.ID); n != 0 {
89
t.Fatalf("readme zonder yml startte %d pipelines", n)
90
}
91
pushes := pushDeliveries(t, st, hookID)
92
acts := contribCount(t, st, user.ID, repo.ID)
93
if pushes < 1 || acts < 1 {
94
t.Fatalf("git push: webhooks %d activity %d", pushes, acts)
95
}
96
97
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")
98
if err != nil {
99
t.Fatal(err)
100
}
101
editor := read(t, res)
102
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{
103
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"master"},
104
"message": {"voeg blue-ci-cd.yml toe"}, "body": {receiveYML},
105
})
106
if err != nil {
107
t.Fatal(err)
108
}
109
if saved := read(t, res); !strings.Contains(saved, "Committed.") {
110
t.Fatalf("editor:\n%s", saved)
111
}
112
dir := gitrepo.Dir(storage, "tim", "ontvangen")
113
master := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))
114
pipe := pipelineFor(t, st, repo.ID, master, "refs/heads/master")
115
if pipe.Source != "push" || pipe.Status != "queued" {
116
t.Fatalf("editor-pipeline: %+v", pipe)
117
}
118
if jobs, err := st.JobsByPipeline(ctx, pipe.ID); err != nil || len(jobs) != 1 || jobs[0].Name != "unit" || jobs[0].Status != "queued" {
119
t.Fatalf("editor-jobs: %v %+v", err, jobs)
120
}
121
if pushDeliveries(t, st, hookID) < pushes+1 {
122
t.Fatal("editor startte geen webhook")
123
}
124
if contribCount(t, st, user.ID, repo.ID) < acts+1 {
125
t.Fatal("editor startte geen activity")
126
}
127
pushes = pushDeliveries(t, st, hookID)
128
acts = contribCount(t, st, user.ID, repo.ID)
129
130
list := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))
131
for _, want := range []string{`data-live-on="1"`, `class="stage-dot pending"`, "Pending"} {
132
if !strings.Contains(list, want) {
133
t.Errorf("lijst mist %q", want)
134
}
135
}
136
home := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))
137
if !strings.Contains(home, `class="status pending"`) || !strings.Contains(home, "Pending") {
138
t.Fatalf("overzicht mist pending:\n%s", home)
139
}
140
css := read(t, mustGet(t, tim, ts.URL+"/assets/style.css"))
141
for _, want := range []string{"@keyframes spin", ".stage-dot.pending .mark", "border-right-color: transparent"} {
142
if !strings.Contains(css, want) {
143
t.Errorf("css mist %q", want)
144
}
145
}
146
147
jobs, err := st.JobsByPipeline(ctx, pipe.ID)
148
if err != nil {
149
t.Fatal(err)
150
}
151
if ok, err := st.MarkJobRunning(ctx, jobs[0].ID); err != nil || !ok {
152
t.Fatalf("running: %v %v", ok, err)
153
}
154
home = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))
155
if !strings.Contains(home, `class="status running"`) || !strings.Contains(home, "Running") {
156
t.Fatalf("overzicht mist running:\n%s", home)
157
}
158
list = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))
159
if !strings.Contains(list, `class="stage-dot running"`) || !strings.Contains(list, `class="status running"`) {
160
t.Fatal("lijst mist het lopende icoon")
161
}
162
163
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/tags")
164
if err != nil {
165
t.Fatal(err)
166
}
167
tags := read(t, res)
168
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/tags", url.Values{
169
"csrf": {csrfOf(t, tags)}, "name": {"v1"}, "target": {"master"}, "message": {"eerste"},
170
})
171
if err != nil {
172
t.Fatal(err)
173
}
174
if page = read(t, res); !strings.Contains(page, "v1") {
175
t.Fatalf("tag:\n%s", page)
176
}
177
tagged := pipelineFor(t, st, repo.ID, master, "refs/tags/v1")
178
if tagged.Status != "queued" {
179
t.Fatalf("tag-pipeline: %+v", tagged)
180
}
181
if pushDeliveries(t, st, hookID) < pushes+1 || contribCount(t, st, user.ID, repo.ID) < acts+1 {
182
t.Fatal("tag mist webhook of activity")
183
}
184
185
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")
186
if err != nil {
187
t.Fatal(err)
188
}
189
editor = read(t, res)
190
featureYML := strings.Replace(receiveYML, "echo ok", "echo feature", 1)
191
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{
192
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"feature"},
193
"message": {"feature yml"}, "body": {featureYML},
194
})
195
if err != nil {
196
t.Fatal(err)
197
}
198
if saved := read(t, res); !strings.Contains(saved, "Committed.") {
199
t.Fatalf("feature:\n%s", saved)
200
}
201
feature := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))
202
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")
203
204
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests")
205
if err != nil {
206
t.Fatal(err)
207
}
208
page = read(t, res)
209
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests", url.Values{
210
"csrf": {csrfOf(t, page)}, "title": {"feature"}, "source": {"feature"}, "target": {"master"},
211
})
212
if err != nil {
213
t.Fatal(err)
214
}
215
page = read(t, res)
216
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/notes", url.Values{
217
"csrf": {csrfOf(t, page)}, "path": {"blue-ci-cd.yml"}, "line_start": {"7"}, "line_end": {"7"},
218
"body": {"```suggestion\n - echo toegepast\n```"},
219
})
220
if err != nil {
221
t.Fatal(err)
222
}
223
page = read(t, res)
224
ids := suggestionIDs(page)
225
if len(ids) != 1 {
226
t.Fatalf("suggestie-ids %v", ids)
227
}
228
beforeFeature := feature
229
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/suggestions", url.Values{
230
"csrf": {csrfOf(t, page)}, "id": {ids[0]}, "title": {"pas de regel aan"},
231
})
232
if err != nil {
233
t.Fatal(err)
234
}
235
if applied := read(t, res); !strings.Contains(applied, "Suggestions applied") {
236
t.Fatalf("suggestie:\n%s", applied)
237
}
238
feature = strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))
239
if feature == beforeFeature {
240
t.Fatal("suggestie maakte geen commit")
241
}
242
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")
243
244
if err := st.UpsertReview(ctx, repo.ID, 1, user.ID, "approved"); err != nil {
245
t.Fatal(err)
246
}
247
passPipelines(t, st, repo.ID)
248
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests/1")
249
if err != nil {
250
t.Fatal(err)
251
}
252
page = read(t, res)
253
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/merge", url.Values{"csrf": {csrfOf(t, page)}})
254
if err != nil {
255
t.Fatal(err)
256
}
257
if merged := read(t, res); !strings.Contains(merged, "Merged") && !strings.Contains(merged, "samengevoegd") && !strings.Contains(merged, "merged") {
258
t.Fatalf("merge:\n%s", merged)
259
}
260
mergedSHA := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))
261
if mergedSHA == master {
262
t.Fatal("merge verschoof master niet")
263
}
264
_ = pipelineFor(t, st, repo.ID, mergedSHA, "refs/heads/master")
265
passPipelines(t, st, repo.ID)
266
267
quiet := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))
268
if strings.Contains(quiet, `data-live-on="1"`) {
269
t.Fatal("afgeronde lijst blijft pollen")
270
}
271
}
272
273
func pipelineCount(t *testing.T, st *store.Store, repoID int64) int {
274
t.Helper()
275
pipes, err := st.ListPipelines(context.Background(), repoID)
276
if err != nil {
277
t.Fatal(err)
278
}
279
return len(pipes)
280
}
281
282
func pipelineFor(t *testing.T, st *store.Store, repoID int64, sha, ref string) store.Pipeline {
283
t.Helper()
284
pipes, err := st.ListPipelines(context.Background(), repoID)
285
if err != nil {
286
t.Fatal(err)
287
}
288
for _, p := range pipes {
289
if p.CommitSHA == sha && p.Ref == ref {
290
return p
291
}
292
}
293
t.Fatalf("geen pipeline voor %s %s in %d stuks", ref, sha, len(pipes))
294
return store.Pipeline{}
295
}
296
297
func pushDeliveries(t *testing.T, st *store.Store, hookID int64) int {
298
t.Helper()
299
rows, err := st.RecentDeliveries(context.Background(), hookID)
300
if err != nil {
301
t.Fatal(err)
302
}
303
n := 0
304
for _, row := range rows {
305
if row.EventType == "push" {
306
n++
307
}
308
}
309
return n
310
}
311
312
func contribCount(t *testing.T, st *store.Store, userID, repoID int64) int {
313
t.Helper()
314
times, err := st.ContributionTimes(context.Background(), userID, []int64{repoID}, time.Unix(0, 0))
315
if err != nil {
316
t.Fatal(err)
317
}
318
return len(times)
319
}
320
321
func passPipelines(t *testing.T, st *store.Store, repoID int64) {
322
t.Helper()
323
ctx := context.Background()
324
pipes, err := st.ListPipelines(ctx, repoID)
325
if err != nil {
326
t.Fatal(err)
327
}
328
for _, p := range pipes {
329
jobs, err := st.JobsByPipeline(ctx, p.ID)
330
if err != nil {
331
t.Fatal(err)
332
}
333
for _, j := range jobs {
334
if j.Status == "success" || j.Status == "failed" || j.Status == "canceled" || j.Status == "skipped" {
335
continue
336
}
337
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
338
t.Fatal(err)
339
}
340
}
341
if _, err := st.RefreshPipelineStatus(ctx, p.ID); err != nil {
342
t.Fatal(err)
343
}
344
}
345
}
@@ -0,0 +1,345 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"net/url"9
"os/exec"10
"path/filepath"11
"strings"12
"testing"13
"time"14
15
"gitlab.com/Timfa/bluegit/internal/auth"16
"gitlab.com/Timfa/bluegit/internal/config"17
"gitlab.com/Timfa/bluegit/internal/gitrepo"18
"gitlab.com/Timfa/bluegit/internal/store"19
)20
21
const receiveYML = "stages:\n - test\nunit:\n stage: test\n image: alpine:3.20\n script:\n - echo ok\n"22
23
func TestPostReceiveStartsPipeline(t *testing.T) {24
if _, err := exec.LookPath("git"); err != nil {25
t.Skip("git ontbreekt")26
}27
storage := t.TempDir()28
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())29
if err != nil {30
t.Fatal(err)31
}32
t.Cleanup(func() { _ = st.Close() })33
cfg := config.Config{34
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,35
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},36
Git: config.Git{Binary: "git", DefaultBranch: "master"},37
CI: config.CI{Enabled: true, Docker: "docker"},38
}39
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}40
ts := httptest.NewServer(srv.Handler())41
t.Cleanup(ts.Close)42
jar, _ := cookiejar.New(nil)43
tim := &http.Client{Jar: jar}44
res, err := tim.Get(ts.URL + "/login")45
if err != nil {46
t.Fatal(err)47
}48
page := read(t, res)49
res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{50
"csrf": {csrfOf(t, page)}, "name": {"ontvangen"}, "visibility": {"public"},51
})52
if err != nil {53
t.Fatal(err)54
}55
page = read(t, res)56
ctx := context.Background()57
repo, err := st.RepoByPath(ctx, "tim", "ontvangen")58
if err != nil {59
t.Fatal(err)60
}61
user, err := st.UserByUsername(ctx, "tim")62
if err != nil {63
t.Fatal(err)64
}65
hookID, err := st.CreateWebhook(ctx, store.Webhook{66
ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",67
URLTemplate: "http://127.0.0.1:9/hook", Events: []string{"push"},68
})69
if err != nil {70
t.Fatal(err)71
}72
res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})73
if err != nil {74
t.Fatal(err)75
}76
token := between(read(t, res), `<p class="code">`, "</p>")77
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/ontvangen.git"78
work := t.TempDir()79
git(t, work, "init", "-b", "master")80
git(t, work, "config", "user.email", "tim@users.git.timfalken.com")81
git(t, work, "config", "user.name", "tim")82
writeFile(t, filepath.Join(work, "README.md"), "hallo\n")83
git(t, work, "add", "README.md")84
git(t, work, "commit", "-m", "leesmij")85
git(t, work, "remote", "add", "origin", remote)86
git(t, work, "push", "-u", "origin", "master")87
88
if n := pipelineCount(t, st, repo.ID); n != 0 {89
t.Fatalf("readme zonder yml startte %d pipelines", n)90
}91
pushes := pushDeliveries(t, st, hookID)92
acts := contribCount(t, st, user.ID, repo.ID)93
if pushes < 1 || acts < 1 {94
t.Fatalf("git push: webhooks %d activity %d", pushes, acts)95
}96
97
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")98
if err != nil {99
t.Fatal(err)100
}101
editor := read(t, res)102
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{103
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"master"},104
"message": {"voeg blue-ci-cd.yml toe"}, "body": {receiveYML},105
})106
if err != nil {107
t.Fatal(err)108
}109
if saved := read(t, res); !strings.Contains(saved, "Committed.") {110
t.Fatalf("editor:\n%s", saved)111
}112
dir := gitrepo.Dir(storage, "tim", "ontvangen")113
master := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))114
pipe := pipelineFor(t, st, repo.ID, master, "refs/heads/master")115
if pipe.Source != "push" || pipe.Status != "queued" {116
t.Fatalf("editor-pipeline: %+v", pipe)117
}118
if jobs, err := st.JobsByPipeline(ctx, pipe.ID); err != nil || len(jobs) != 1 || jobs[0].Name != "unit" || jobs[0].Status != "queued" {119
t.Fatalf("editor-jobs: %v %+v", err, jobs)120
}121
if pushDeliveries(t, st, hookID) < pushes+1 {122
t.Fatal("editor startte geen webhook")123
}124
if contribCount(t, st, user.ID, repo.ID) < acts+1 {125
t.Fatal("editor startte geen activity")126
}127
pushes = pushDeliveries(t, st, hookID)128
acts = contribCount(t, st, user.ID, repo.ID)129
130
list := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))131
for _, want := range []string{`data-live-on="1"`, `class="stage-dot pending"`, "Pending"} {132
if !strings.Contains(list, want) {133
t.Errorf("lijst mist %q", want)134
}135
}136
home := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))137
if !strings.Contains(home, `class="status pending"`) || !strings.Contains(home, "Pending") {138
t.Fatalf("overzicht mist pending:\n%s", home)139
}140
css := read(t, mustGet(t, tim, ts.URL+"/assets/style.css"))141
for _, want := range []string{"@keyframes spin", ".stage-dot.pending .mark", "border-right-color: transparent"} {142
if !strings.Contains(css, want) {143
t.Errorf("css mist %q", want)144
}145
}146
147
jobs, err := st.JobsByPipeline(ctx, pipe.ID)148
if err != nil {149
t.Fatal(err)150
}151
if ok, err := st.MarkJobRunning(ctx, jobs[0].ID); err != nil || !ok {152
t.Fatalf("running: %v %v", ok, err)153
}154
home = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen"))155
if !strings.Contains(home, `class="status running"`) || !strings.Contains(home, "Running") {156
t.Fatalf("overzicht mist running:\n%s", home)157
}158
list = read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))159
if !strings.Contains(list, `class="stage-dot running"`) || !strings.Contains(list, `class="status running"`) {160
t.Fatal("lijst mist het lopende icoon")161
}162
163
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/tags")164
if err != nil {165
t.Fatal(err)166
}167
tags := read(t, res)168
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/tags", url.Values{169
"csrf": {csrfOf(t, tags)}, "name": {"v1"}, "target": {"master"}, "message": {"eerste"},170
})171
if err != nil {172
t.Fatal(err)173
}174
if page = read(t, res); !strings.Contains(page, "v1") {175
t.Fatalf("tag:\n%s", page)176
}177
tagged := pipelineFor(t, st, repo.ID, master, "refs/tags/v1")178
if tagged.Status != "queued" {179
t.Fatalf("tag-pipeline: %+v", tagged)180
}181
if pushDeliveries(t, st, hookID) < pushes+1 || contribCount(t, st, user.ID, repo.ID) < acts+1 {182
t.Fatal("tag mist webhook of activity")183
}184
185
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/ci/editor?ref=master")186
if err != nil {187
t.Fatal(err)188
}189
editor = read(t, res)190
featureYML := strings.Replace(receiveYML, "echo ok", "echo feature", 1)191
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/ci/editor", url.Values{192
"csrf": {csrfOf(t, editor)}, "base": {"master"}, "branch": {"feature"},193
"message": {"feature yml"}, "body": {featureYML},194
})195
if err != nil {196
t.Fatal(err)197
}198
if saved := read(t, res); !strings.Contains(saved, "Committed.") {199
t.Fatalf("feature:\n%s", saved)200
}201
feature := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))202
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")203
204
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests")205
if err != nil {206
t.Fatal(err)207
}208
page = read(t, res)209
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests", url.Values{210
"csrf": {csrfOf(t, page)}, "title": {"feature"}, "source": {"feature"}, "target": {"master"},211
})212
if err != nil {213
t.Fatal(err)214
}215
page = read(t, res)216
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/notes", url.Values{217
"csrf": {csrfOf(t, page)}, "path": {"blue-ci-cd.yml"}, "line_start": {"7"}, "line_end": {"7"},218
"body": {"```suggestion\n - echo toegepast\n```"},219
})220
if err != nil {221
t.Fatal(err)222
}223
page = read(t, res)224
ids := suggestionIDs(page)225
if len(ids) != 1 {226
t.Fatalf("suggestie-ids %v", ids)227
}228
beforeFeature := feature229
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/suggestions", url.Values{230
"csrf": {csrfOf(t, page)}, "id": {ids[0]}, "title": {"pas de regel aan"},231
})232
if err != nil {233
t.Fatal(err)234
}235
if applied := read(t, res); !strings.Contains(applied, "Suggestions applied") {236
t.Fatalf("suggestie:\n%s", applied)237
}238
feature = strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/feature"))239
if feature == beforeFeature {240
t.Fatal("suggestie maakte geen commit")241
}242
_ = pipelineFor(t, st, repo.ID, feature, "refs/heads/feature")243
244
if err := st.UpsertReview(ctx, repo.ID, 1, user.ID, "approved"); err != nil {245
t.Fatal(err)246
}247
passPipelines(t, st, repo.ID)248
res, err = tim.Get(ts.URL + "/tim/ontvangen/-/merge-requests/1")249
if err != nil {250
t.Fatal(err)251
}252
page = read(t, res)253
res, err = tim.PostForm(ts.URL+"/tim/ontvangen/-/merge-requests/1/merge", url.Values{"csrf": {csrfOf(t, page)}})254
if err != nil {255
t.Fatal(err)256
}257
if merged := read(t, res); !strings.Contains(merged, "Merged") && !strings.Contains(merged, "samengevoegd") && !strings.Contains(merged, "merged") {258
t.Fatalf("merge:\n%s", merged)259
}260
mergedSHA := strings.TrimSpace(mustGit(t, dir, "rev-parse", "refs/heads/master"))261
if mergedSHA == master {262
t.Fatal("merge verschoof master niet")263
}264
_ = pipelineFor(t, st, repo.ID, mergedSHA, "refs/heads/master")265
passPipelines(t, st, repo.ID)266
267
quiet := read(t, mustGet(t, tim, ts.URL+"/tim/ontvangen/-/pipelines"))268
if strings.Contains(quiet, `data-live-on="1"`) {269
t.Fatal("afgeronde lijst blijft pollen")270
}271
}272
273
func pipelineCount(t *testing.T, st *store.Store, repoID int64) int {274
t.Helper()275
pipes, err := st.ListPipelines(context.Background(), repoID)276
if err != nil {277
t.Fatal(err)278
}279
return len(pipes)280
}281
282
func pipelineFor(t *testing.T, st *store.Store, repoID int64, sha, ref string) store.Pipeline {283
t.Helper()284
pipes, err := st.ListPipelines(context.Background(), repoID)285
if err != nil {286
t.Fatal(err)287
}288
for _, p := range pipes {289
if p.CommitSHA == sha && p.Ref == ref {290
return p291
}292
}293
t.Fatalf("geen pipeline voor %s %s in %d stuks", ref, sha, len(pipes))294
return store.Pipeline{}295
}296
297
func pushDeliveries(t *testing.T, st *store.Store, hookID int64) int {298
t.Helper()299
rows, err := st.RecentDeliveries(context.Background(), hookID)300
if err != nil {301
t.Fatal(err)302
}303
n := 0304
for _, row := range rows {305
if row.EventType == "push" {306
n++307
}308
}309
return n310
}311
312
func contribCount(t *testing.T, st *store.Store, userID, repoID int64) int {313
t.Helper()314
times, err := st.ContributionTimes(context.Background(), userID, []int64{repoID}, time.Unix(0, 0))315
if err != nil {316
t.Fatal(err)317
}318
return len(times)319
}320
321
func passPipelines(t *testing.T, st *store.Store, repoID int64) {322
t.Helper()323
ctx := context.Background()324
pipes, err := st.ListPipelines(ctx, repoID)325
if err != nil {326
t.Fatal(err)327
}328
for _, p := range pipes {329
jobs, err := st.JobsByPipeline(ctx, p.ID)330
if err != nil {331
t.Fatal(err)332
}333
for _, j := range jobs {334
if j.Status == "success" || j.Status == "failed" || j.Status == "canceled" || j.Status == "skipped" {335
continue336
}337
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {338
t.Fatal(err)339
}340
}341
if _, err := st.RefreshPipelineStatus(ctx, p.ID); err != nil {342
t.Fatal(err)343
}344
}345
}@@ -148,25 +148,17 @@ func (s *Server) commit(w http.ResponseWriter, r *http.Request) {
148
148
}
149
149
v := s.repoView(w, r, repo, role, c.Subject)
150
150
v.Page = "commit"
151
rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, i18n.Parse(v.Lang))
151
v.Wide = true
152
lang := i18n.Parse(v.Lang)
153
rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang)
154
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
152
155
v.Commit = &rows[0]
153
s.render(w, "commit", v)
154
}
155
156
func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
157
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)
158
if !ok {
159
return
160
}
161
v := s.repoView(w, r, repo, role, "title.branches")
162
v.Page = "branches"
163
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
164
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
165
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
166
for _, name := range names {
167
v.Branches = append(v.Branches, BranchRow{Name: name, Protected: access.BranchProtected(patterns, name)})
156
parents, files, err := gitrepo.CommitPatch(r.Context(), s.Git, dir, c.SHA)
157
if err != nil && s.Log != nil {
158
s.Log.Warn("commitdiff", "sha", c.SHA, "err", err)
168
159
}
169
s.render(w, "branches", v)
160
v.CommitDiff = presentCommitDiff(repo.FullPath(), c.SHA, parents, files)
161
s.render(w, "commit", v)
170
162
}
171
163
172
164
func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
@@ -207,6 +199,9 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
207
199
}
208
200
num := strconv.FormatInt(mr.Number, 10)
209
201
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
202
if r.FormValue("draft") == "1" {
203
_ = s.Store.SetDraft(r.Context(), mr.ID, true)
204
}
210
205
if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+source); sha != "" {
211
206
s.startOneMergePipeline(r.Context(), repo, sha, u.Username, "", mr)
212
207
}
@@ -246,14 +241,7 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
246
241
v.CanClose = mr.Status == "open" && mine
247
242
v.CanReopen = mr.Status == "closed" && mine
248
243
}
249
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
250
diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
251
if err == nil {
252
v.Diff = diff
253
}
254
files, _ := gitrepo.DiffFiles(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
255
notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
256
v.Notes, v.DiffFiles = arrangeNotes(notes, files, s.langOf(r))
244
s.finishMR(r, &v, repo, mr, u)
257
245
s.render(w, "mr", v)
258
246
}
259
247
@@ -278,8 +266,15 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
278
266
return
279
267
}
280
268
if path == "" {
281
if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
282
s.redirect(w, r, back, "", s.trErr(r, err))
269
parent, _ := strconv.ParseInt(r.FormValue("parent"), 10, 64)
270
var noteErr error
271
if parent > 0 {
272
_, noteErr = s.Store.AddReply(r.Context(), repo.ID, mr.ID, u.ID, parent, r.FormValue("body"))
273
} else {
274
_, noteErr = s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body"))
275
}
276
if noteErr != nil {
277
s.redirect(w, r, back, "", s.trErr(r, noteErr))
283
278
return
284
279
}
285
280
s.redirect(w, r, back, s.tr(r, "flash.note"), "")
@@ -328,7 +323,6 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
328
323
return
329
324
}
330
325
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
331
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
332
326
work, err := s.scratchDir("merge")
333
327
if err != nil {
334
328
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
@@ -337,13 +331,14 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
337
331
defer os.RemoveAll(work)
338
332
email := u.Username + "@users.git.timfalken.com"
339
333
msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
340
if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {
334
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
335
return gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns)
336
}); err != nil {
341
337
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))
342
338
return
343
339
}
344
340
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
345
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
346
s.AfterPush(repo, u, before, after)
341
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "merged", "")
347
342
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
348
343
}
349
344
@@ -362,6 +357,7 @@ func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
362
357
return
363
358
}
364
359
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
360
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "closed", "")
365
361
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")
366
362
}
367
363
@@ -388,6 +384,10 @@ func (s *Server) pipelines(w http.ResponseWriter, r *http.Request) {
388
384
v.Wide = true
389
385
v.Page = "pipelines"
390
386
s.fillPipelines(r, &v, repo)
387
if wantsJSON(r) {
388
s.writePipeList(w, v)
389
return
390
}
391
391
s.render(w, "pipelines", v)
392
392
}
393
393
@@ -410,7 +410,19 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {
410
410
v.Wide = true
411
411
v.Page = "pipelines"
412
412
v.Pipe = &p
413
v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)
413
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
414
v.Jobs = jobs
415
ranks := s.queueRanks(r.Context())
416
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
417
v.PipeStatus = displayStatus(p.Status, jobs)
418
v.PipeLabel = tr("pipe." + v.PipeStatus)
419
v.PipeJobs = linksFor(jobs, ranks, tr)
420
v.Live = jobsLive(p.Status, jobs)
421
v.LiveURL = repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10)
422
if wantsJSON(r) {
423
s.writePipeDetail(w, v)
424
return
425
}
414
426
s.render(w, "pipeline", v)
415
427
}
416
428
@@ -148,25 +148,17 @@ func (s *Server) commit(w http.ResponseWriter, r *http.Request) {148
}148
}149
v := s.repoView(w, r, repo, role, c.Subject)149
v := s.repoView(w, r, repo, role, c.Subject)150
v.Page = "commit"150
v.Page = "commit"151
rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, i18n.Parse(v.Lang))151
v.Wide = true152
lang := i18n.Parse(v.Lang)153
rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang)154
s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)152
v.Commit = &rows[0]155
v.Commit = &rows[0]153
s.render(w, "commit", v)156
parents, files, err := gitrepo.CommitPatch(r.Context(), s.Git, dir, c.SHA)154
}157
if err != nil && s.Log != nil {155
158
s.Log.Warn("commitdiff", "sha", c.SHA, "err", err)156
func (s *Server) branches(w http.ResponseWriter, r *http.Request) {157
_, repo, role, ok := s.guard(w, r, access.RoleReadonly)158
if !ok {159
return160
}161
v := s.repoView(w, r, repo, role, "title.branches")162
v.Page = "branches"163
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)164
names, _ := gitrepo.Branches(r.Context(), s.Git, dir)165
patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)166
for _, name := range names {167
v.Branches = append(v.Branches, BranchRow{Name: name, Protected: access.BranchProtected(patterns, name)})168
}159
}169
s.render(w, "branches", v)160
v.CommitDiff = presentCommitDiff(repo.FullPath(), c.SHA, parents, files)161
s.render(w, "commit", v)170
}162
}171
163
172
func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {164
func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {@@ -207,6 +199,9 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {207
}199
}208
num := strconv.FormatInt(mr.Number, 10)200
num := strconv.FormatInt(mr.Number, 10)209
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)201
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)202
if r.FormValue("draft") == "1" {203
_ = s.Store.SetDraft(r.Context(), mr.ID, true)204
}210
if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+source); sha != "" {205
if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+source); sha != "" {211
s.startOneMergePipeline(r.Context(), repo, sha, u.Username, "", mr)206
s.startOneMergePipeline(r.Context(), repo, sha, u.Username, "", mr)212
}207
}@@ -246,14 +241,7 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {246
v.CanClose = mr.Status == "open" && mine241
v.CanClose = mr.Status == "open" && mine247
v.CanReopen = mr.Status == "closed" && mine242
v.CanReopen = mr.Status == "closed" && mine248
}243
}249
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)244
s.finishMR(r, &v, repo, mr, u)250
diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)251
if err == nil {252
v.Diff = diff253
}254
files, _ := gitrepo.DiffFiles(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)255
notes, _ := s.Store.ListNotes(r.Context(), mr.ID)256
v.Notes, v.DiffFiles = arrangeNotes(notes, files, s.langOf(r))257
s.render(w, "mr", v)245
s.render(w, "mr", v)258
}246
}259
247
@@ -278,8 +266,15 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {278
return266
return279
}267
}280
if path == "" {268
if path == "" {281
if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {269
parent, _ := strconv.ParseInt(r.FormValue("parent"), 10, 64)282
s.redirect(w, r, back, "", s.trErr(r, err))270
var noteErr error271
if parent > 0 {272
_, noteErr = s.Store.AddReply(r.Context(), repo.ID, mr.ID, u.ID, parent, r.FormValue("body"))273
} else {274
_, noteErr = s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body"))275
}276
if noteErr != nil {277
s.redirect(w, r, back, "", s.trErr(r, noteErr))283
return278
return284
}279
}285
s.redirect(w, r, back, s.tr(r, "flash.note"), "")280
s.redirect(w, r, back, s.tr(r, "flash.note"), "")@@ -328,7 +323,6 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {328
return323
return329
}324
}330
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)325
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)331
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)332
work, err := s.scratchDir("merge")326
work, err := s.scratchDir("merge")333
if err != nil {327
if err != nil {334
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))328
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))@@ -337,13 +331,14 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {337
defer os.RemoveAll(work)331
defer os.RemoveAll(work)338
email := u.Username + "@users.git.timfalken.com"332
email := u.Username + "@users.git.timfalken.com"339
msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"333
msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"340
if err := gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns); err != nil {334
if err := s.postReceive(r.Context(), repo, u, dir, func() error {335
return gitrepo.Merge(r.Context(), s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, u.Username, email, msg, role, patterns)336
}); err != nil {341
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))337
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), "", s.commitProblem(r, err))342
return338
return343
}339
}344
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")340
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")345
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)341
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "merged", "")346
s.AfterPush(repo, u, before, after)347
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")342
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")348
}343
}349
344
@@ -362,6 +357,7 @@ func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {362
return357
return363
}358
}364
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")359
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")360
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "closed", "")365
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")361
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")366
}362
}367
363
@@ -388,6 +384,10 @@ func (s *Server) pipelines(w http.ResponseWriter, r *http.Request) {388
v.Wide = true384
v.Wide = true389
v.Page = "pipelines"385
v.Page = "pipelines"390
s.fillPipelines(r, &v, repo)386
s.fillPipelines(r, &v, repo)387
if wantsJSON(r) {388
s.writePipeList(w, v)389
return390
}391
s.render(w, "pipelines", v)391
s.render(w, "pipelines", v)392
}392
}393
393
@@ -410,7 +410,19 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {410
v.Wide = true410
v.Wide = true411
v.Page = "pipelines"411
v.Page = "pipelines"412
v.Pipe = &p412
v.Pipe = &p413
v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)413
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)414
v.Jobs = jobs415
ranks := s.queueRanks(r.Context())416
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }417
v.PipeStatus = displayStatus(p.Status, jobs)418
v.PipeLabel = tr("pipe." + v.PipeStatus)419
v.PipeJobs = linksFor(jobs, ranks, tr)420
v.Live = jobsLive(p.Status, jobs)421
v.LiveURL = repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10)422
if wantsJSON(r) {423
s.writePipeDetail(w, v)424
return425
}414
s.render(w, "pipeline", v)426
s.render(w, "pipeline", v)415
}427
}416
428
@@ -285,6 +285,7 @@ func (s *Server) reopenMR(w http.ResponseWriter, r *http.Request) {
285
285
return
286
286
}
287
287
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")
288
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "reopened", "")
288
289
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")
289
290
}
290
291
@@ -285,6 +285,7 @@ func (s *Server) reopenMR(w http.ResponseWriter, r *http.Request) {285
return285
return286
}286
}287
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")287
_ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")288
_ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "reopened", "")288
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")289
s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")289
}290
}290
291
@@ -19,6 +19,7 @@ import (
19
19
"gitlab.com/Timfa/bluegit/internal/access"
20
20
"gitlab.com/Timfa/bluegit/internal/activity"
21
21
"gitlab.com/Timfa/bluegit/internal/auth"
22
"gitlab.com/Timfa/bluegit/internal/cispec"
22
23
"gitlab.com/Timfa/bluegit/internal/config"
23
24
"gitlab.com/Timfa/bluegit/internal/i18n"
24
25
"gitlab.com/Timfa/bluegit/internal/realip"
@@ -65,6 +66,8 @@ func (s *Server) Handler() http.Handler {
65
66
s.mustTemplates()
66
67
mux := http.NewServeMux()
67
68
mux.HandleFunc("GET /assets/{file}", s.asset)
69
mux.HandleFunc("GET /-/info", s.infoPage)
70
mux.HandleFunc("GET /api/v1/ci/spec", s.ciSpec)
68
71
mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
69
72
w.WriteHeader(http.StatusOK)
70
73
_, _ = w.Write([]byte("ok\n"))
@@ -116,9 +119,16 @@ func (s *Server) Handler() http.Handler {
116
119
mux.HandleFunc("GET /{owner}/{repo}/-/tags/archive", s.tagArchive)
117
120
mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)
118
121
mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)
122
mux.HandleFunc("POST /{owner}/{repo}/-/branches", s.createBranch)
123
mux.HandleFunc("POST /{owner}/{repo}/-/branches/delete", s.deleteBranch)
124
mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)
125
mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)
126
mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)
119
127
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)
128
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)
120
129
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)
121
130
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
131
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}", s.updateMR)
122
132
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
123
133
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
124
134
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)
@@ -446,6 +456,7 @@ type View struct {
446
456
CanApply bool
447
457
Commits []CommitRow
448
458
Commit *CommitRow
459
CommitDiff *CommitDiff
449
460
Entries []EntryRow
450
461
TreePath string
451
462
Blob string
@@ -470,6 +481,11 @@ type View struct {
470
481
Pipes []store.Pipeline
471
482
PipeRows []PipeRow
472
483
Pipe *store.Pipeline
484
PipeStatus string
485
PipeLabel string
486
PipeJobs []JobLink
487
Live bool
488
LiveURL string
473
489
Jobs []store.Job
474
490
JobPage *JobPage
475
491
Editor *CIEditor
@@ -494,6 +510,9 @@ type View struct {
494
510
StorageTotal string
495
511
MinFree string
496
512
Wide bool
513
Info bool
514
Spec cispec.Doc
515
SpecJSON template.JS
497
516
Page string
498
517
Lang string
499
518
HTMLLang string
@@ -521,6 +540,13 @@ type View struct {
521
540
Heat *activity.Calendar
522
541
Notes []NoteRow
523
542
Profile *store.User
543
DescHTML template.HTML
544
Timeline []TimelineItem
545
CompareFrom string
546
CompareTo string
547
FormTitle string
548
Labels []string
549
CanEditMR bool
524
550
}
525
551
526
552
// LangChoice is één taal in de instellingen.
@@ -542,6 +568,10 @@ type NoteRow struct {
542
568
Author, Body, When, Path string
543
569
Start, End int
544
570
HasSuggestion bool
571
ParentID int64
572
HTML template.HTML
573
Replies []NoteRow
574
At time.Time
545
575
}
546
576
547
577
// DiffFileView is één bestand in de merge-request-diff.
@@ -586,6 +616,8 @@ type CodeLine struct {
586
616
type CommitRow struct {
587
617
SHA, Short, Author, Date, Subject, Body, When string
588
618
UserURL, Avatar, Initial, RawName, PushedBy string
619
PipeID int64
620
PipeStatus, PipeLabel string
589
621
}
590
622
591
623
// EntryRow is een bestand of map.
@@ -595,8 +627,26 @@ type EntryRow struct {
595
627
596
628
// BranchRow is een branch, met of zonder bescherming.
597
629
type BranchRow struct {
598
Name string
599
Protected bool
630
Name, SHA, Short, Subject, When string
631
Protected, Default bool
632
Ahead, Behind int
633
PipeID int64
634
PipeStatus, PipeLabel string
635
MRNumber int64
636
}
637
638
// TimelineItem is één gebeurtenis of reactie op een merge request.
639
type TimelineItem struct {
640
ID int64
641
Kind string
642
Actor, Text string
643
When string
644
Body string
645
HTML template.HTML
646
URL string
647
Replies []TimelineItem
648
At time.Time
649
Rank int
600
650
}
601
651
602
652
// HookView is een webhook plus de laatste pogingen.
@@ -19,6 +19,7 @@ import (19
"gitlab.com/Timfa/bluegit/internal/access"19
"gitlab.com/Timfa/bluegit/internal/access"20
"gitlab.com/Timfa/bluegit/internal/activity"20
"gitlab.com/Timfa/bluegit/internal/activity"21
"gitlab.com/Timfa/bluegit/internal/auth"21
"gitlab.com/Timfa/bluegit/internal/auth"22
"gitlab.com/Timfa/bluegit/internal/cispec"22
"gitlab.com/Timfa/bluegit/internal/config"23
"gitlab.com/Timfa/bluegit/internal/config"23
"gitlab.com/Timfa/bluegit/internal/i18n"24
"gitlab.com/Timfa/bluegit/internal/i18n"24
"gitlab.com/Timfa/bluegit/internal/realip"25
"gitlab.com/Timfa/bluegit/internal/realip"@@ -65,6 +66,8 @@ func (s *Server) Handler() http.Handler {65
s.mustTemplates()66
s.mustTemplates()66
mux := http.NewServeMux()67
mux := http.NewServeMux()67
mux.HandleFunc("GET /assets/{file}", s.asset)68
mux.HandleFunc("GET /assets/{file}", s.asset)69
mux.HandleFunc("GET /-/info", s.infoPage)70
mux.HandleFunc("GET /api/v1/ci/spec", s.ciSpec)68
mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {71
mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {69
w.WriteHeader(http.StatusOK)72
w.WriteHeader(http.StatusOK)70
_, _ = w.Write([]byte("ok\n"))73
_, _ = w.Write([]byte("ok\n"))@@ -116,9 +119,16 @@ func (s *Server) Handler() http.Handler {116
mux.HandleFunc("GET /{owner}/{repo}/-/tags/archive", s.tagArchive)119
mux.HandleFunc("GET /{owner}/{repo}/-/tags/archive", s.tagArchive)117
mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)120
mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)118
mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)121
mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)122
mux.HandleFunc("POST /{owner}/{repo}/-/branches", s.createBranch)123
mux.HandleFunc("POST /{owner}/{repo}/-/branches/delete", s.deleteBranch)124
mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)125
mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)126
mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)119
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)127
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)128
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)120
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)129
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)121
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)130
mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)131
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}", s.updateMR)122
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)132
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)123
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)133
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)124
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)134
mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)@@ -446,6 +456,7 @@ type View struct {446
CanApply bool456
CanApply bool447
Commits []CommitRow457
Commits []CommitRow448
Commit *CommitRow458
Commit *CommitRow459
CommitDiff *CommitDiff449
Entries []EntryRow460
Entries []EntryRow450
TreePath string461
TreePath string451
Blob string462
Blob string@@ -470,6 +481,11 @@ type View struct {470
Pipes []store.Pipeline481
Pipes []store.Pipeline471
PipeRows []PipeRow482
PipeRows []PipeRow472
Pipe *store.Pipeline483
Pipe *store.Pipeline484
PipeStatus string485
PipeLabel string486
PipeJobs []JobLink487
Live bool488
LiveURL string473
Jobs []store.Job489
Jobs []store.Job474
JobPage *JobPage490
JobPage *JobPage475
Editor *CIEditor491
Editor *CIEditor@@ -494,6 +510,9 @@ type View struct {494
StorageTotal string510
StorageTotal string495
MinFree string511
MinFree string496
Wide bool512
Wide bool513
Info bool514
Spec cispec.Doc515
SpecJSON template.JS497
Page string516
Page string498
Lang string517
Lang string499
HTMLLang string518
HTMLLang string@@ -521,6 +540,13 @@ type View struct {521
Heat *activity.Calendar540
Heat *activity.Calendar522
Notes []NoteRow541
Notes []NoteRow523
Profile *store.User542
Profile *store.User543
DescHTML template.HTML544
Timeline []TimelineItem545
CompareFrom string546
CompareTo string547
FormTitle string548
Labels []string549
CanEditMR bool524
}550
}525
551
526
// LangChoice is één taal in de instellingen.552
// LangChoice is één taal in de instellingen.@@ -542,6 +568,10 @@ type NoteRow struct {542
Author, Body, When, Path string568
Author, Body, When, Path string543
Start, End int569
Start, End int544
HasSuggestion bool570
HasSuggestion bool571
ParentID int64572
HTML template.HTML573
Replies []NoteRow574
At time.Time545
}575
}546
576
547
// DiffFileView is één bestand in de merge-request-diff.577
// DiffFileView is één bestand in de merge-request-diff.@@ -586,6 +616,8 @@ type CodeLine struct {586
type CommitRow struct {616
type CommitRow struct {587
SHA, Short, Author, Date, Subject, Body, When string617
SHA, Short, Author, Date, Subject, Body, When string588
UserURL, Avatar, Initial, RawName, PushedBy string618
UserURL, Avatar, Initial, RawName, PushedBy string619
PipeID int64620
PipeStatus, PipeLabel string589
}621
}590
622
591
// EntryRow is een bestand of map.623
// EntryRow is een bestand of map.@@ -595,8 +627,26 @@ type EntryRow struct {595
627
596
// BranchRow is een branch, met of zonder bescherming.628
// BranchRow is een branch, met of zonder bescherming.597
type BranchRow struct {629
type BranchRow struct {598
Name string630
Name, SHA, Short, Subject, When string599
Protected bool631
Protected, Default bool632
Ahead, Behind int633
PipeID int64634
PipeStatus, PipeLabel string635
MRNumber int64636
}637
638
// TimelineItem is één gebeurtenis of reactie op een merge request.639
type TimelineItem struct {640
ID int64641
Kind string642
Actor, Text string643
When string644
Body string645
HTML template.HTML646
URL string647
Replies []TimelineItem648
At time.Time649
Rank int600
}650
}601
651
602
// HookView is een webhook plus de laatste pogingen.652
// HookView is een webhook plus de laatste pogingen.@@ -16,7 +16,7 @@ func (s *Server) noStorageText(r *http.Request) string {
16
16
17
17
func allowsWithoutStorage(r *http.Request) bool {
18
18
switch r.URL.Path {
19
case "/healthz", "/login", "/auth/callback", "/logout", "/setup":
19
case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec":
20
20
return true
21
21
}
22
22
return strings.HasPrefix(r.URL.Path, "/assets/")
@@ -16,7 +16,7 @@ func (s *Server) noStorageText(r *http.Request) string {16
16
17
func allowsWithoutStorage(r *http.Request) bool {17
func allowsWithoutStorage(r *http.Request) bool {18
switch r.URL.Path {18
switch r.URL.Path {19
case "/healthz", "/login", "/auth/callback", "/logout", "/setup":19
case "/healthz", "/login", "/auth/callback", "/logout", "/setup", "/-/info", "/api/v1/ci/spec":20
return true20
return true21
}21
}22
return strings.HasPrefix(r.URL.Path, "/assets/")22
return strings.HasPrefix(r.URL.Path, "/assets/")@@ -0,0 +1,58 @@
1
(function () {
2
function dialog(name) {
3
return document.querySelector('[data-branch-dialog="' + name + '"]');
4
}
5
function fill(el, pattern, name) {
6
if (!el) return;
7
var text = el.getAttribute("data-pattern") || pattern || "";
8
el.textContent = text.replace("%s", name);
9
}
10
document.querySelectorAll("[data-branch-open]").forEach(function (btn) {
11
btn.addEventListener("click", function () {
12
var box = dialog(btn.getAttribute("data-branch-open"));
13
if (box && box.showModal) box.showModal();
14
});
15
});
16
document.querySelectorAll("[data-dialog-close]").forEach(function (btn) {
17
btn.addEventListener("click", function () {
18
var box = btn.closest("dialog");
19
if (box) box.close();
20
});
21
});
22
document.querySelectorAll("[data-delete]").forEach(function (btn) {
23
btn.addEventListener("click", function () {
24
var name = btn.getAttribute("data-delete");
25
var box = dialog("delete");
26
if (!box) return;
27
box.querySelector("[data-delete-name]").value = name;
28
fill(box.querySelector("[data-delete-ask]"), "", name);
29
var confirm = box.querySelector('[name="confirm"]');
30
if (confirm) confirm.value = "";
31
box.showModal();
32
});
33
});
34
document.querySelectorAll("[data-rename]").forEach(function (btn) {
35
btn.addEventListener("click", function () {
36
var name = btn.getAttribute("data-rename");
37
var box = dialog("rename");
38
if (!box) return;
39
box.querySelector("[data-rename-name]").value = name;
40
fill(box.querySelector("[data-rename-ask]"), "", name);
41
var next = box.querySelector('[name="new_name"]');
42
var confirm = box.querySelector('[name="confirm"]');
43
if (next) next.value = name;
44
if (confirm) confirm.value = "";
45
box.showModal();
46
});
47
});
48
var filter = document.querySelector("[data-branch-filter]");
49
if (filter) {
50
filter.addEventListener("input", function () {
51
var q = filter.value.trim().toLowerCase();
52
document.querySelectorAll("[data-branch-row]").forEach(function (row) {
53
var name = (row.getAttribute("data-name") || "").toLowerCase();
54
row.hidden = q !== "" && name.indexOf(q) < 0;
55
});
56
});
57
}
58
})();
@@ -0,0 +1,58 @@1
(function () {2
function dialog(name) {3
return document.querySelector('[data-branch-dialog="' + name + '"]');4
}5
function fill(el, pattern, name) {6
if (!el) return;7
var text = el.getAttribute("data-pattern") || pattern || "";8
el.textContent = text.replace("%s", name);9
}10
document.querySelectorAll("[data-branch-open]").forEach(function (btn) {11
btn.addEventListener("click", function () {12
var box = dialog(btn.getAttribute("data-branch-open"));13
if (box && box.showModal) box.showModal();14
});15
});16
document.querySelectorAll("[data-dialog-close]").forEach(function (btn) {17
btn.addEventListener("click", function () {18
var box = btn.closest("dialog");19
if (box) box.close();20
});21
});22
document.querySelectorAll("[data-delete]").forEach(function (btn) {23
btn.addEventListener("click", function () {24
var name = btn.getAttribute("data-delete");25
var box = dialog("delete");26
if (!box) return;27
box.querySelector("[data-delete-name]").value = name;28
fill(box.querySelector("[data-delete-ask]"), "", name);29
var confirm = box.querySelector('[name="confirm"]');30
if (confirm) confirm.value = "";31
box.showModal();32
});33
});34
document.querySelectorAll("[data-rename]").forEach(function (btn) {35
btn.addEventListener("click", function () {36
var name = btn.getAttribute("data-rename");37
var box = dialog("rename");38
if (!box) return;39
box.querySelector("[data-rename-name]").value = name;40
fill(box.querySelector("[data-rename-ask]"), "", name);41
var next = box.querySelector('[name="new_name"]');42
var confirm = box.querySelector('[name="confirm"]');43
if (next) next.value = name;44
if (confirm) confirm.value = "";45
box.showModal();46
});47
});48
var filter = document.querySelector("[data-branch-filter]");49
if (filter) {50
filter.addEventListener("input", function () {51
var q = filter.value.trim().toLowerCase();52
document.querySelectorAll("[data-branch-row]").forEach(function (row) {53
var name = (row.getAttribute("data-name") || "").toLowerCase();54
row.hidden = q !== "" && name.indexOf(q) < 0;55
});56
});57
}58
})();@@ -0,0 +1,13 @@
1
(function () {
2
var box = document.getElementById("commitdiff");
3
if (!box) {
4
return;
5
}
6
var mode = "inline";
7
try {
8
if (localStorage.getItem("bluegit-diff") === "side") {
9
mode = "side";
10
}
11
} catch (e) {}
12
box.setAttribute("data-mode", mode);
13
})();
@@ -0,0 +1,13 @@1
(function () {2
var box = document.getElementById("commitdiff");3
if (!box) {4
return;5
}6
var mode = "inline";7
try {8
if (localStorage.getItem("bluegit-diff") === "side") {9
mode = "side";10
}11
} catch (e) {}12
box.setAttribute("data-mode", mode);13
})();@@ -0,0 +1,39 @@
1
(function () {
2
var root = document.querySelector("[data-commit-diff]");
3
if (!root) {
4
return;
5
}
6
function mark() {
7
var mode = root.getAttribute("data-mode") === "side" ? "side" : "inline";
8
root.querySelectorAll("[data-diff-mode]").forEach(function (btn) {
9
var on = btn.getAttribute("data-diff-mode") === mode;
10
btn.classList.toggle("on", on);
11
btn.setAttribute("aria-pressed", on ? "true" : "false");
12
});
13
}
14
mark();
15
root.addEventListener("click", function (ev) {
16
var modeBtn = ev.target.closest("[data-diff-mode]");
17
if (modeBtn && root.contains(modeBtn)) {
18
var next = modeBtn.getAttribute("data-diff-mode") === "side" ? "side" : "inline";
19
root.setAttribute("data-mode", next);
20
try {
21
localStorage.setItem("bluegit-diff", next);
22
} catch (e) {}
23
mark();
24
return;
25
}
26
var tog = ev.target.closest("[data-toggle-diff]");
27
if (!tog || !root.contains(tog)) {
28
return;
29
}
30
var file = tog.closest(".commitfile");
31
if (!file) {
32
return;
33
}
34
var open = file.getAttribute("data-collapsed") === "1";
35
file.setAttribute("data-collapsed", open ? "0" : "1");
36
tog.setAttribute("aria-expanded", open ? "true" : "false");
37
tog.textContent = open ? tog.getAttribute("data-hide") : tog.getAttribute("data-show");
38
});
39
})();
@@ -0,0 +1,39 @@1
(function () {2
var root = document.querySelector("[data-commit-diff]");3
if (!root) {4
return;5
}6
function mark() {7
var mode = root.getAttribute("data-mode") === "side" ? "side" : "inline";8
root.querySelectorAll("[data-diff-mode]").forEach(function (btn) {9
var on = btn.getAttribute("data-diff-mode") === mode;10
btn.classList.toggle("on", on);11
btn.setAttribute("aria-pressed", on ? "true" : "false");12
});13
}14
mark();15
root.addEventListener("click", function (ev) {16
var modeBtn = ev.target.closest("[data-diff-mode]");17
if (modeBtn && root.contains(modeBtn)) {18
var next = modeBtn.getAttribute("data-diff-mode") === "side" ? "side" : "inline";19
root.setAttribute("data-mode", next);20
try {21
localStorage.setItem("bluegit-diff", next);22
} catch (e) {}23
mark();24
return;25
}26
var tog = ev.target.closest("[data-toggle-diff]");27
if (!tog || !root.contains(tog)) {28
return;29
}30
var file = tog.closest(".commitfile");31
if (!file) {32
return;33
}34
var open = file.getAttribute("data-collapsed") === "1";35
file.setAttribute("data-collapsed", open ? "0" : "1");36
tog.setAttribute("aria-expanded", open ? "true" : "false");37
tog.textContent = open ? tog.getAttribute("data-hide") : tog.getAttribute("data-show");38
});39
})();@@ -0,0 +1,259 @@
1
(function () {
2
var GAP = 8;
3
var tracked = [];
4
5
function layer(el) {
6
return el && typeof el.showPopover === "function";
7
}
8
9
function openLayer(el) {
10
if (!el) {
11
return;
12
}
13
if (layer(el)) {
14
if (!el.hasAttribute("popover")) {
15
el.setAttribute("popover", "manual");
16
}
17
if (!el.matches(":popover-open")) {
18
el.showPopover();
19
}
20
return;
21
}
22
if (el.parentNode !== document.body) {
23
el._home = el.parentNode;
24
document.body.appendChild(el);
25
}
26
el.hidden = false;
27
}
28
29
function closeLayer(el) {
30
if (!el) {
31
return;
32
}
33
if (layer(el) && el.hasAttribute("popover")) {
34
if (el.matches(":popover-open")) {
35
el.hidePopover();
36
}
37
return;
38
}
39
el.hidden = true;
40
}
41
42
function isOpen(el) {
43
if (!el) {
44
return false;
45
}
46
if (el.hasAttribute("popover")) {
47
return el.matches(":popover-open");
48
}
49
return !el.hidden;
50
}
51
52
function place(el, anchor, mode) {
53
var rect = anchor.getBoundingClientRect();
54
el.style.left = "0px";
55
el.style.top = "0px";
56
var w = el.offsetWidth;
57
var h = el.offsetHeight;
58
var vw = document.documentElement.clientWidth;
59
var vh = document.documentElement.clientHeight;
60
var left;
61
var top;
62
if (mode === "above-center") {
63
left = rect.left + (rect.width - w) / 2;
64
top = rect.top - GAP - h;
65
if (top < GAP) {
66
top = rect.bottom + GAP;
67
}
68
} else if (mode === "below-end") {
69
left = rect.right - w;
70
top = rect.bottom + GAP;
71
if (top + h > vh - GAP && rect.top - GAP - h >= GAP) {
72
top = rect.top - GAP - h;
73
}
74
} else {
75
left = rect.left;
76
top = rect.bottom + GAP;
77
if (top + h > vh - GAP && rect.top - GAP - h >= GAP) {
78
top = rect.top - GAP - h;
79
}
80
}
81
if (left + w > vw - GAP) {
82
left = vw - GAP - w;
83
}
84
if (left < GAP) {
85
left = GAP;
86
}
87
if (top + h > vh - GAP) {
88
top = Math.max(GAP, vh - GAP - h);
89
}
90
if (top < GAP) {
91
top = GAP;
92
}
93
el.style.left = Math.round(left) + "px";
94
el.style.top = Math.round(top) + "px";
95
}
96
97
function track(el, anchor, mode) {
98
tracked = tracked.filter(function (item) { return item.el !== el; });
99
tracked.push({ el: el, anchor: anchor, mode: mode });
100
place(el, anchor, mode);
101
}
102
103
function untrack(el) {
104
tracked = tracked.filter(function (item) { return item.el !== el; });
105
}
106
107
function reposition() {
108
tracked.forEach(function (item) {
109
if (isOpen(item.el)) {
110
place(item.el, item.anchor, item.mode);
111
}
112
});
113
}
114
window.addEventListener("scroll", reposition, true);
115
window.addEventListener("resize", reposition);
116
117
var tip = document.createElement("div");
118
tip.className = "float-tip";
119
tip.setAttribute("role", "tooltip");
120
tip.setAttribute("popover", "manual");
121
document.body.appendChild(tip);
122
var tipAnchor = null;
123
124
function restoreTitle(el) {
125
if (el && el.hasAttribute("data-native-title")) {
126
el.setAttribute("title", el.getAttribute("data-native-title"));
127
el.removeAttribute("data-native-title");
128
}
129
}
130
131
function hideTip() {
132
restoreTitle(tipAnchor);
133
tipAnchor = null;
134
closeLayer(tip);
135
untrack(tip);
136
}
137
138
function showTip(el) {
139
if (!el || el.closest(".stage-pop, .float-tip")) {
140
return;
141
}
142
var stage = el.closest(".stage");
143
if (stage && stage.classList.contains("open") && el.matches(".stage-dot")) {
144
return;
145
}
146
var text = el.getAttribute("data-tip") || "";
147
if (!text && (el.hasAttribute("title") || el.hasAttribute("data-native-title"))) {
148
text = el.getAttribute("data-native-title") || el.getAttribute("title") || "";
149
if (el.hasAttribute("title")) {
150
el.setAttribute("data-native-title", text);
151
el.removeAttribute("title");
152
}
153
}
154
if (!text) {
155
return;
156
}
157
if (tipAnchor && tipAnchor !== el) {
158
restoreTitle(tipAnchor);
159
}
160
tipAnchor = el;
161
tip.textContent = text;
162
tip.classList.toggle("heat", el.classList.contains("sq"));
163
openLayer(tip);
164
track(tip, el, "above-center");
165
}
166
167
document.addEventListener("pointerover", function (ev) {
168
var el = ev.target.closest("[data-tip], .sq[title], .sq[data-native-title]");
169
if (el) {
170
showTip(el);
171
}
172
});
173
document.addEventListener("pointerout", function (ev) {
174
if (!tipAnchor) {
175
return;
176
}
177
if (ev.target === tipAnchor || tipAnchor.contains(ev.target)) {
178
if (!tipAnchor.contains(ev.relatedTarget)) {
179
hideTip();
180
}
181
}
182
});
183
document.addEventListener("focusin", function (ev) {
184
var el = ev.target.closest("[data-tip], .sq[title], .sq[data-native-title]");
185
if (el) {
186
showTip(el);
187
}
188
});
189
document.addEventListener("focusout", function (ev) {
190
if (tipAnchor && (ev.target === tipAnchor || tipAnchor.contains(ev.target))) {
191
hideTip();
192
}
193
});
194
195
function popOf(stage) {
196
return stage.querySelector(".stage-pop") || stage._pop || null;
197
}
198
199
function closeStages() {
200
document.querySelectorAll(".stage.open").forEach(function (stage) {
201
stage.classList.remove("open");
202
var pop = popOf(stage);
203
closeLayer(pop);
204
untrack(pop);
205
});
206
}
207
208
document.addEventListener("click", function (ev) {
209
var btn = ev.target.closest("button.stage-dot[data-tip]");
210
if (btn) {
211
ev.stopPropagation();
212
var stage = btn.parentElement;
213
var pop = popOf(stage);
214
if (pop) {
215
stage._pop = pop;
216
}
217
var was = stage.classList.contains("open");
218
hideTip();
219
closeStages();
220
if (!was && pop) {
221
stage.classList.add("open");
222
openLayer(pop);
223
track(pop, btn, "below-start");
224
}
225
return;
226
}
227
if (ev.target.closest(".stage-pop")) {
228
return;
229
}
230
closeStages();
231
});
232
document.addEventListener("keydown", function (ev) {
233
if (ev.key === "Escape") {
234
hideTip();
235
closeStages();
236
}
237
});
238
239
document.querySelectorAll("details").forEach(function (det) {
240
var panel = det.querySelector(":scope > .menu-panel, :scope > form");
241
if (!panel) {
242
return;
243
}
244
if (!panel.classList.contains("menu-panel") && !det.classList.contains("showid")) {
245
return;
246
}
247
panel.setAttribute("popover", "manual");
248
det.addEventListener("toggle", function () {
249
var summary = det.querySelector("summary");
250
if (det.open && summary) {
251
openLayer(panel);
252
track(panel, summary, "below-end");
253
} else {
254
closeLayer(panel);
255
untrack(panel);
256
}
257
});
258
});
259
})();
@@ -0,0 +1,259 @@1
(function () {2
var GAP = 8;3
var tracked = [];4
5
function layer(el) {6
return el && typeof el.showPopover === "function";7
}8
9
function openLayer(el) {10
if (!el) {11
return;12
}13
if (layer(el)) {14
if (!el.hasAttribute("popover")) {15
el.setAttribute("popover", "manual");16
}17
if (!el.matches(":popover-open")) {18
el.showPopover();19
}20
return;21
}22
if (el.parentNode !== document.body) {23
el._home = el.parentNode;24
document.body.appendChild(el);25
}26
el.hidden = false;27
}28
29
function closeLayer(el) {30
if (!el) {31
return;32
}33
if (layer(el) && el.hasAttribute("popover")) {34
if (el.matches(":popover-open")) {35
el.hidePopover();36
}37
return;38
}39
el.hidden = true;40
}41
42
function isOpen(el) {43
if (!el) {44
return false;45
}46
if (el.hasAttribute("popover")) {47
return el.matches(":popover-open");48
}49
return !el.hidden;50
}51
52
function place(el, anchor, mode) {53
var rect = anchor.getBoundingClientRect();54
el.style.left = "0px";55
el.style.top = "0px";56
var w = el.offsetWidth;57
var h = el.offsetHeight;58
var vw = document.documentElement.clientWidth;59
var vh = document.documentElement.clientHeight;60
var left;61
var top;62
if (mode === "above-center") {63
left = rect.left + (rect.width - w) / 2;64
top = rect.top - GAP - h;65
if (top < GAP) {66
top = rect.bottom + GAP;67
}68
} else if (mode === "below-end") {69
left = rect.right - w;70
top = rect.bottom + GAP;71
if (top + h > vh - GAP && rect.top - GAP - h >= GAP) {72
top = rect.top - GAP - h;73
}74
} else {75
left = rect.left;76
top = rect.bottom + GAP;77
if (top + h > vh - GAP && rect.top - GAP - h >= GAP) {78
top = rect.top - GAP - h;79
}80
}81
if (left + w > vw - GAP) {82
left = vw - GAP - w;83
}84
if (left < GAP) {85
left = GAP;86
}87
if (top + h > vh - GAP) {88
top = Math.max(GAP, vh - GAP - h);89
}90
if (top < GAP) {91
top = GAP;92
}93
el.style.left = Math.round(left) + "px";94
el.style.top = Math.round(top) + "px";95
}96
97
function track(el, anchor, mode) {98
tracked = tracked.filter(function (item) { return item.el !== el; });99
tracked.push({ el: el, anchor: anchor, mode: mode });100
place(el, anchor, mode);101
}102
103
function untrack(el) {104
tracked = tracked.filter(function (item) { return item.el !== el; });105
}106
107
function reposition() {108
tracked.forEach(function (item) {109
if (isOpen(item.el)) {110
place(item.el, item.anchor, item.mode);111
}112
});113
}114
window.addEventListener("scroll", reposition, true);115
window.addEventListener("resize", reposition);116
117
var tip = document.createElement("div");118
tip.className = "float-tip";119
tip.setAttribute("role", "tooltip");120
tip.setAttribute("popover", "manual");121
document.body.appendChild(tip);122
var tipAnchor = null;123
124
function restoreTitle(el) {125
if (el && el.hasAttribute("data-native-title")) {126
el.setAttribute("title", el.getAttribute("data-native-title"));127
el.removeAttribute("data-native-title");128
}129
}130
131
function hideTip() {132
restoreTitle(tipAnchor);133
tipAnchor = null;134
closeLayer(tip);135
untrack(tip);136
}137
138
function showTip(el) {139
if (!el || el.closest(".stage-pop, .float-tip")) {140
return;141
}142
var stage = el.closest(".stage");143
if (stage && stage.classList.contains("open") && el.matches(".stage-dot")) {144
return;145
}146
var text = el.getAttribute("data-tip") || "";147
if (!text && (el.hasAttribute("title") || el.hasAttribute("data-native-title"))) {148
text = el.getAttribute("data-native-title") || el.getAttribute("title") || "";149
if (el.hasAttribute("title")) {150
el.setAttribute("data-native-title", text);151
el.removeAttribute("title");152
}153
}154
if (!text) {155
return;156
}157
if (tipAnchor && tipAnchor !== el) {158
restoreTitle(tipAnchor);159
}160
tipAnchor = el;161
tip.textContent = text;162
tip.classList.toggle("heat", el.classList.contains("sq"));163
openLayer(tip);164
track(tip, el, "above-center");165
}166
167
document.addEventListener("pointerover", function (ev) {168
var el = ev.target.closest("[data-tip], .sq[title], .sq[data-native-title]");169
if (el) {170
showTip(el);171
}172
});173
document.addEventListener("pointerout", function (ev) {174
if (!tipAnchor) {175
return;176
}177
if (ev.target === tipAnchor || tipAnchor.contains(ev.target)) {178
if (!tipAnchor.contains(ev.relatedTarget)) {179
hideTip();180
}181
}182
});183
document.addEventListener("focusin", function (ev) {184
var el = ev.target.closest("[data-tip], .sq[title], .sq[data-native-title]");185
if (el) {186
showTip(el);187
}188
});189
document.addEventListener("focusout", function (ev) {190
if (tipAnchor && (ev.target === tipAnchor || tipAnchor.contains(ev.target))) {191
hideTip();192
}193
});194
195
function popOf(stage) {196
return stage.querySelector(".stage-pop") || stage._pop || null;197
}198
199
function closeStages() {200
document.querySelectorAll(".stage.open").forEach(function (stage) {201
stage.classList.remove("open");202
var pop = popOf(stage);203
closeLayer(pop);204
untrack(pop);205
});206
}207
208
document.addEventListener("click", function (ev) {209
var btn = ev.target.closest("button.stage-dot[data-tip]");210
if (btn) {211
ev.stopPropagation();212
var stage = btn.parentElement;213
var pop = popOf(stage);214
if (pop) {215
stage._pop = pop;216
}217
var was = stage.classList.contains("open");218
hideTip();219
closeStages();220
if (!was && pop) {221
stage.classList.add("open");222
openLayer(pop);223
track(pop, btn, "below-start");224
}225
return;226
}227
if (ev.target.closest(".stage-pop")) {228
return;229
}230
closeStages();231
});232
document.addEventListener("keydown", function (ev) {233
if (ev.key === "Escape") {234
hideTip();235
closeStages();236
}237
});238
239
document.querySelectorAll("details").forEach(function (det) {240
var panel = det.querySelector(":scope > .menu-panel, :scope > form");241
if (!panel) {242
return;243
}244
if (!panel.classList.contains("menu-panel") && !det.classList.contains("showid")) {245
return;246
}247
panel.setAttribute("popover", "manual");248
det.addEventListener("toggle", function () {249
var summary = det.querySelector("summary");250
if (det.open && summary) {251
openLayer(panel);252
track(panel, summary, "below-end");253
} else {254
closeLayer(panel);255
untrack(panel);256
}257
});258
});259
})();@@ -0,0 +1,70 @@
1
(function () {
2
var pick = document.querySelector("[data-mr-pick]");
3
if (pick) {
4
pick.addEventListener("change", function (ev) {
5
if (!ev.target || !ev.target.matches || !ev.target.matches("select")) return;
6
pick.requestSubmit ? pick.requestSubmit() : pick.submit();
7
});
8
}
9
document.querySelectorAll("[data-md-box]").forEach(function (box) {
10
var write = box.querySelector("[data-md-write]");
11
var area = box.querySelector("textarea");
12
var preview = box.querySelector("[data-md-preview]");
13
var url = box.getAttribute("data-md-url");
14
if (!write || !area || !preview) return;
15
function show(which) {
16
var editing = which === "write";
17
write.hidden = !editing;
18
preview.hidden = editing;
19
box.querySelectorAll("[data-md-tab]").forEach(function (btn) {
20
var on = btn.getAttribute("data-md-tab") === which;
21
btn.setAttribute("aria-selected", on ? "true" : "false");
22
});
23
}
24
box.querySelectorAll("[data-md-tab]").forEach(function (btn) {
25
btn.addEventListener("click", function () {
26
var which = btn.getAttribute("data-md-tab");
27
if (which === "preview") {
28
var csrf = "";
29
var form = box.closest("form");
30
var token = form && form.querySelector('[name="csrf"]');
31
if (token) csrf = token.value;
32
var body = new URLSearchParams();
33
body.set("csrf", csrf);
34
body.set("body", area.value);
35
preview.textContent = "";
36
fetch(url, {
37
method: "POST",
38
headers: { "Content-Type": "application/x-www-form-urlencoded" },
39
body: body.toString(),
40
credentials: "same-origin"
41
}).then(function (res) {
42
return res.text();
43
}).then(function (html) {
44
preview.innerHTML = html;
45
show("preview");
46
}).catch(function () {
47
show("preview");
48
});
49
return;
50
}
51
show("write");
52
});
53
});
54
});
55
document.querySelectorAll("[data-reply]").forEach(function (btn) {
56
btn.addEventListener("click", function () {
57
var form = document.getElementById("comment-form");
58
if (!form) return;
59
var parent = form.querySelector("[data-reply-parent]");
60
var label = form.querySelector("[data-reply-label]");
61
if (parent) parent.value = btn.getAttribute("data-reply") || "";
62
if (label) {
63
label.hidden = false;
64
label.textContent = btn.getAttribute("data-reply-name") || "";
65
}
66
var area = form.querySelector("textarea");
67
if (area) area.focus();
68
});
69
});
70
})();
@@ -0,0 +1,70 @@1
(function () {2
var pick = document.querySelector("[data-mr-pick]");3
if (pick) {4
pick.addEventListener("change", function (ev) {5
if (!ev.target || !ev.target.matches || !ev.target.matches("select")) return;6
pick.requestSubmit ? pick.requestSubmit() : pick.submit();7
});8
}9
document.querySelectorAll("[data-md-box]").forEach(function (box) {10
var write = box.querySelector("[data-md-write]");11
var area = box.querySelector("textarea");12
var preview = box.querySelector("[data-md-preview]");13
var url = box.getAttribute("data-md-url");14
if (!write || !area || !preview) return;15
function show(which) {16
var editing = which === "write";17
write.hidden = !editing;18
preview.hidden = editing;19
box.querySelectorAll("[data-md-tab]").forEach(function (btn) {20
var on = btn.getAttribute("data-md-tab") === which;21
btn.setAttribute("aria-selected", on ? "true" : "false");22
});23
}24
box.querySelectorAll("[data-md-tab]").forEach(function (btn) {25
btn.addEventListener("click", function () {26
var which = btn.getAttribute("data-md-tab");27
if (which === "preview") {28
var csrf = "";29
var form = box.closest("form");30
var token = form && form.querySelector('[name="csrf"]');31
if (token) csrf = token.value;32
var body = new URLSearchParams();33
body.set("csrf", csrf);34
body.set("body", area.value);35
preview.textContent = "";36
fetch(url, {37
method: "POST",38
headers: { "Content-Type": "application/x-www-form-urlencoded" },39
body: body.toString(),40
credentials: "same-origin"41
}).then(function (res) {42
return res.text();43
}).then(function (html) {44
preview.innerHTML = html;45
show("preview");46
}).catch(function () {47
show("preview");48
});49
return;50
}51
show("write");52
});53
});54
});55
document.querySelectorAll("[data-reply]").forEach(function (btn) {56
btn.addEventListener("click", function () {57
var form = document.getElementById("comment-form");58
if (!form) return;59
var parent = form.querySelector("[data-reply-parent]");60
var label = form.querySelector("[data-reply-label]");61
if (parent) parent.value = btn.getAttribute("data-reply") || "";62
if (label) {63
label.hidden = false;64
label.textContent = btn.getAttribute("data-reply-name") || "";65
}66
var area = form.querySelector("textarea");67
if (area) area.focus();68
});69
});70
})();@@ -1,40 +1,4 @@
1
1
(function () {
2
function closeStages(except) {
3
document.querySelectorAll(".stage.open").forEach(function (stage) {
4
if (stage === except) {
5
return;
6
}
7
stage.classList.remove("open");
8
var pop = stage.querySelector(".stage-pop");
9
if (pop) {
10
pop.hidden = true;
11
}
12
});
13
}
14
15
document.querySelectorAll(".stage-dot[data-tip]").forEach(function (btn) {
16
btn.addEventListener("click", function (ev) {
17
ev.stopPropagation();
18
var stage = btn.parentElement;
19
var pop = stage.querySelector(".stage-pop");
20
var open = stage.classList.contains("open");
21
closeStages(null);
22
if (!open && pop) {
23
stage.classList.add("open");
24
pop.hidden = false;
25
}
26
});
27
});
28
29
document.addEventListener("click", function () {
30
closeStages(null);
31
});
32
document.addEventListener("keydown", function (ev) {
33
if (ev.key === "Escape") {
34
closeStages(null);
35
}
36
});
37
38
2
document.querySelectorAll(".section-toggle").forEach(function (btn) {
39
3
btn.addEventListener("click", function () {
40
4
var sec = btn.parentElement;
@@ -103,8 +67,10 @@
103
67
}
104
68
var wrapBtn = document.querySelector("[data-log-wrap]");
105
69
if (wrapBtn && log) {
70
wrapBtn.setAttribute("aria-pressed", log.classList.contains("nowrap") ? "false" : "true");
106
71
wrapBtn.addEventListener("click", function () {
107
log.classList.toggle("wrap");
72
var off = log.classList.toggle("nowrap");
73
wrapBtn.setAttribute("aria-pressed", off ? "false" : "true");
108
74
});
109
75
}
110
76
var topBtn = document.querySelector("[data-log-top]");
@@ -143,6 +109,237 @@
143
109
});
144
110
}
145
111
112
function rowElement(html) {
113
var wrap = document.createElement("tbody");
114
wrap.innerHTML = (html || "").trim();
115
return wrap.querySelector("tr");
116
}
117
118
function findStage(root, name) {
119
var buttons = root.querySelectorAll("button.stage-dot[data-stage]");
120
for (var i = 0; i < buttons.length; i++) {
121
if (buttons[i].getAttribute("data-stage") === name) {
122
return buttons[i];
123
}
124
}
125
return null;
126
}
127
128
function setQueue(root, text) {
129
var q = root.querySelector("[data-queue]");
130
if (!text) {
131
if (q) {
132
q.remove();
133
}
134
return;
135
}
136
if (!q) {
137
q = document.createElement("span");
138
q.className = "queue";
139
q.setAttribute("data-queue", "");
140
var anchor = root.querySelector("a");
141
if (anchor && anchor.parentElement === root) {
142
anchor.insertAdjacentElement("afterend", q);
143
} else {
144
(anchor || root).appendChild(q);
145
}
146
}
147
q.textContent = text;
148
}
149
150
function patchPipeRow(live, row) {
151
var status = live.querySelector("[data-pipe-status]");
152
if (status) {
153
status.className = "status " + row.status;
154
var label = status.querySelector("[data-pipe-label]");
155
if (label) {
156
label.textContent = row.label || "";
157
}
158
}
159
var dur = live.querySelector("[data-pipe-duration]");
160
if (dur) {
161
dur.textContent = row.duration || "";
162
}
163
var when = live.querySelector("[data-pipe-when]");
164
if (when) {
165
when.textContent = row.when || "";
166
}
167
var stages = live.querySelector(".stages");
168
if (!stages) {
169
return;
170
}
171
var buttons = stages.querySelectorAll(":scope > .stage > button.stage-dot[data-stage]");
172
var next = row.stages || [];
173
var same = buttons.length === next.length;
174
for (var i = 0; same && i < buttons.length; i++) {
175
if (buttons[i].getAttribute("data-stage") !== next[i].name) {
176
same = false;
177
}
178
}
179
if (!same) {
180
var fresh = rowElement(row.html);
181
if (!fresh) {
182
return;
183
}
184
var openName = "";
185
var openPop = live.querySelector(".stage-pop:popover-open");
186
if (openPop) {
187
var openBtn = openPop.parentElement.querySelector("button.stage-dot");
188
openName = openBtn ? openBtn.getAttribute("data-stage") : "";
189
}
190
stages.innerHTML = fresh.querySelector(".stages").innerHTML;
191
if (openName) {
192
var again = findStage(live, openName);
193
if (again) {
194
again.click();
195
}
196
}
197
return;
198
}
199
next.forEach(function (st) {
200
var btn = findStage(live, st.name);
201
if (!btn) {
202
return;
203
}
204
btn.className = "stage-dot " + st.status;
205
btn.setAttribute("data-tip", st.tip || "");
206
btn.setAttribute("aria-label", st.tip || "");
207
var pop = btn.parentElement.querySelector(".stage-pop");
208
if (!pop) {
209
return;
210
}
211
(st.jobs || []).forEach(function (job) {
212
var li = pop.querySelector('[data-job="' + job.id + '"]');
213
if (!li) {
214
return;
215
}
216
var dot = li.querySelector(".stage-dot");
217
if (dot) {
218
dot.className = "stage-dot sm " + job.status;
219
}
220
setQueue(li, job.queue);
221
});
222
});
223
}
224
225
function applyPipeRows(rows, scrollX, scrollY, box, left) {
226
var body = document.querySelector("table.pipes tbody");
227
if (!body) {
228
return;
229
}
230
var ids = {};
231
rows.forEach(function (row) {
232
ids[String(row.id)] = true;
233
});
234
body.querySelectorAll("tr[data-pipe]").forEach(function (tr) {
235
if (ids[tr.getAttribute("data-pipe")]) {
236
return;
237
}
238
var rect = tr.getBoundingClientRect();
239
var h = tr.offsetHeight;
240
tr.remove();
241
if (rect.bottom <= 0) {
242
scrollY -= h;
243
}
244
});
245
rows.forEach(function (row, index) {
246
var live = body.querySelector('tr[data-pipe="' + row.id + '"]');
247
if (!live) {
248
var fresh = rowElement(row.html);
249
if (!fresh) {
250
return;
251
}
252
var existing = body.querySelectorAll("tr[data-pipe]");
253
var before = existing[index] || null;
254
if (before) {
255
body.insertBefore(fresh, before);
256
} else {
257
body.appendChild(fresh);
258
}
259
if (scrollY > 0) {
260
scrollY += fresh.offsetHeight;
261
}
262
return;
263
}
264
patchPipeRow(live, row);
265
var existing = body.querySelectorAll("tr[data-pipe]");
266
if (existing[index] && existing[index] !== live) {
267
body.insertBefore(live, existing[index]);
268
}
269
});
270
window.scrollTo(scrollX, scrollY);
271
if (box) {
272
box.scrollLeft = left;
273
}
274
}
275
276
function applyDetail(data) {
277
var pill = document.querySelector("[data-pipe-status]");
278
if (pill && data.status) {
279
pill.className = "status " + data.status;
280
var label = pill.querySelector("[data-pipe-label]");
281
if (label) {
282
label.textContent = data.label || "";
283
}
284
}
285
(data.jobs || []).forEach(function (job) {
286
var li = document.querySelector('.clean li[data-job="' + job.id + '"]');
287
if (!li) {
288
return;
289
}
290
var st = li.querySelector("[data-job-status]");
291
if (st) {
292
st.className = "status " + job.status;
293
var lab = st.querySelector("[data-job-label]");
294
if (lab) {
295
lab.textContent = job.label || "";
296
}
297
}
298
setQueue(li, job.queue);
299
});
300
}
301
302
var liveEl = document.querySelector("[data-live-on]");
303
if (liveEl) {
304
var liveURL = liveEl.getAttribute("data-live");
305
var liveTimer = function () {
306
if (document.hidden) {
307
setTimeout(liveTimer, 3000);
308
return;
309
}
310
var box = document.querySelector(".hscroll");
311
var scrollX = window.scrollX;
312
var scrollY = window.scrollY;
313
var left = box ? box.scrollLeft : 0;
314
fetch(liveURL, { headers: { Accept: "application/json" }, credentials: "same-origin", cache: "no-store" })
315
.then(function (res) {
316
if (!res.ok) {
317
throw new Error("live");
318
}
319
return res.json();
320
})
321
.then(function (data) {
322
if (data.rows) {
323
applyPipeRows(data.rows, scrollX, scrollY, box, left);
324
} else {
325
applyDetail(data);
326
window.scrollTo(scrollX, scrollY);
327
if (box) {
328
box.scrollLeft = left;
329
}
330
}
331
window.dispatchEvent(new Event("resize"));
332
if (data.active) {
333
setTimeout(liveTimer, 3000);
334
}
335
})
336
.catch(function () {
337
setTimeout(liveTimer, 3000);
338
});
339
};
340
setTimeout(liveTimer, 3000);
341
}
342
146
343
if (!wrapBox || wrapBox.getAttribute("data-running") !== "1" || !log) {
147
344
return;
148
345
}
@@ -364,6 +561,11 @@
364
561
}
365
562
});
366
563
offset = data.offset || offset;
564
var qEl = document.querySelector(".jobhead [data-queue]");
565
if (qEl) {
566
qEl.textContent = data.queue || "";
567
qEl.hidden = !data.queue;
568
}
367
569
if (data.status === "running" || data.status === "queued") {
368
570
setTimeout(poll, 1500);
369
571
return;
@@ -1,40 +1,4 @@1
(function () {1
(function () {2
function closeStages(except) {3
document.querySelectorAll(".stage.open").forEach(function (stage) {4
if (stage === except) {5
return;6
}7
stage.classList.remove("open");8
var pop = stage.querySelector(".stage-pop");9
if (pop) {10
pop.hidden = true;11
}12
});13
}14
15
document.querySelectorAll(".stage-dot[data-tip]").forEach(function (btn) {16
btn.addEventListener("click", function (ev) {17
ev.stopPropagation();18
var stage = btn.parentElement;19
var pop = stage.querySelector(".stage-pop");20
var open = stage.classList.contains("open");21
closeStages(null);22
if (!open && pop) {23
stage.classList.add("open");24
pop.hidden = false;25
}26
});27
});28
29
document.addEventListener("click", function () {30
closeStages(null);31
});32
document.addEventListener("keydown", function (ev) {33
if (ev.key === "Escape") {34
closeStages(null);35
}36
});37
38
document.querySelectorAll(".section-toggle").forEach(function (btn) {2
document.querySelectorAll(".section-toggle").forEach(function (btn) {39
btn.addEventListener("click", function () {3
btn.addEventListener("click", function () {40
var sec = btn.parentElement;4
var sec = btn.parentElement;@@ -103,8 +67,10 @@103
}67
}104
var wrapBtn = document.querySelector("[data-log-wrap]");68
var wrapBtn = document.querySelector("[data-log-wrap]");105
if (wrapBtn && log) {69
if (wrapBtn && log) {70
wrapBtn.setAttribute("aria-pressed", log.classList.contains("nowrap") ? "false" : "true");106
wrapBtn.addEventListener("click", function () {71
wrapBtn.addEventListener("click", function () {107
log.classList.toggle("wrap");72
var off = log.classList.toggle("nowrap");73
wrapBtn.setAttribute("aria-pressed", off ? "false" : "true");108
});74
});109
}75
}110
var topBtn = document.querySelector("[data-log-top]");76
var topBtn = document.querySelector("[data-log-top]");@@ -143,6 +109,237 @@143
});109
});144
}110
}145
111
112
function rowElement(html) {113
var wrap = document.createElement("tbody");114
wrap.innerHTML = (html || "").trim();115
return wrap.querySelector("tr");116
}117
118
function findStage(root, name) {119
var buttons = root.querySelectorAll("button.stage-dot[data-stage]");120
for (var i = 0; i < buttons.length; i++) {121
if (buttons[i].getAttribute("data-stage") === name) {122
return buttons[i];123
}124
}125
return null;126
}127
128
function setQueue(root, text) {129
var q = root.querySelector("[data-queue]");130
if (!text) {131
if (q) {132
q.remove();133
}134
return;135
}136
if (!q) {137
q = document.createElement("span");138
q.className = "queue";139
q.setAttribute("data-queue", "");140
var anchor = root.querySelector("a");141
if (anchor && anchor.parentElement === root) {142
anchor.insertAdjacentElement("afterend", q);143
} else {144
(anchor || root).appendChild(q);145
}146
}147
q.textContent = text;148
}149
150
function patchPipeRow(live, row) {151
var status = live.querySelector("[data-pipe-status]");152
if (status) {153
status.className = "status " + row.status;154
var label = status.querySelector("[data-pipe-label]");155
if (label) {156
label.textContent = row.label || "";157
}158
}159
var dur = live.querySelector("[data-pipe-duration]");160
if (dur) {161
dur.textContent = row.duration || "";162
}163
var when = live.querySelector("[data-pipe-when]");164
if (when) {165
when.textContent = row.when || "";166
}167
var stages = live.querySelector(".stages");168
if (!stages) {169
return;170
}171
var buttons = stages.querySelectorAll(":scope > .stage > button.stage-dot[data-stage]");172
var next = row.stages || [];173
var same = buttons.length === next.length;174
for (var i = 0; same && i < buttons.length; i++) {175
if (buttons[i].getAttribute("data-stage") !== next[i].name) {176
same = false;177
}178
}179
if (!same) {180
var fresh = rowElement(row.html);181
if (!fresh) {182
return;183
}184
var openName = "";185
var openPop = live.querySelector(".stage-pop:popover-open");186
if (openPop) {187
var openBtn = openPop.parentElement.querySelector("button.stage-dot");188
openName = openBtn ? openBtn.getAttribute("data-stage") : "";189
}190
stages.innerHTML = fresh.querySelector(".stages").innerHTML;191
if (openName) {192
var again = findStage(live, openName);193
if (again) {194
again.click();195
}196
}197
return;198
}199
next.forEach(function (st) {200
var btn = findStage(live, st.name);201
if (!btn) {202
return;203
}204
btn.className = "stage-dot " + st.status;205
btn.setAttribute("data-tip", st.tip || "");206
btn.setAttribute("aria-label", st.tip || "");207
var pop = btn.parentElement.querySelector(".stage-pop");208
if (!pop) {209
return;210
}211
(st.jobs || []).forEach(function (job) {212
var li = pop.querySelector('[data-job="' + job.id + '"]');213
if (!li) {214
return;215
}216
var dot = li.querySelector(".stage-dot");217
if (dot) {218
dot.className = "stage-dot sm " + job.status;219
}220
setQueue(li, job.queue);221
});222
});223
}224
225
function applyPipeRows(rows, scrollX, scrollY, box, left) {226
var body = document.querySelector("table.pipes tbody");227
if (!body) {228
return;229
}230
var ids = {};231
rows.forEach(function (row) {232
ids[String(row.id)] = true;233
});234
body.querySelectorAll("tr[data-pipe]").forEach(function (tr) {235
if (ids[tr.getAttribute("data-pipe")]) {236
return;237
}238
var rect = tr.getBoundingClientRect();239
var h = tr.offsetHeight;240
tr.remove();241
if (rect.bottom <= 0) {242
scrollY -= h;243
}244
});245
rows.forEach(function (row, index) {246
var live = body.querySelector('tr[data-pipe="' + row.id + '"]');247
if (!live) {248
var fresh = rowElement(row.html);249
if (!fresh) {250
return;251
}252
var existing = body.querySelectorAll("tr[data-pipe]");253
var before = existing[index] || null;254
if (before) {255
body.insertBefore(fresh, before);256
} else {257
body.appendChild(fresh);258
}259
if (scrollY > 0) {260
scrollY += fresh.offsetHeight;261
}262
return;263
}264
patchPipeRow(live, row);265
var existing = body.querySelectorAll("tr[data-pipe]");266
if (existing[index] && existing[index] !== live) {267
body.insertBefore(live, existing[index]);268
}269
});270
window.scrollTo(scrollX, scrollY);271
if (box) {272
box.scrollLeft = left;273
}274
}275
276
function applyDetail(data) {277
var pill = document.querySelector("[data-pipe-status]");278
if (pill && data.status) {279
pill.className = "status " + data.status;280
var label = pill.querySelector("[data-pipe-label]");281
if (label) {282
label.textContent = data.label || "";283
}284
}285
(data.jobs || []).forEach(function (job) {286
var li = document.querySelector('.clean li[data-job="' + job.id + '"]');287
if (!li) {288
return;289
}290
var st = li.querySelector("[data-job-status]");291
if (st) {292
st.className = "status " + job.status;293
var lab = st.querySelector("[data-job-label]");294
if (lab) {295
lab.textContent = job.label || "";296
}297
}298
setQueue(li, job.queue);299
});300
}301
302
var liveEl = document.querySelector("[data-live-on]");303
if (liveEl) {304
var liveURL = liveEl.getAttribute("data-live");305
var liveTimer = function () {306
if (document.hidden) {307
setTimeout(liveTimer, 3000);308
return;309
}310
var box = document.querySelector(".hscroll");311
var scrollX = window.scrollX;312
var scrollY = window.scrollY;313
var left = box ? box.scrollLeft : 0;314
fetch(liveURL, { headers: { Accept: "application/json" }, credentials: "same-origin", cache: "no-store" })315
.then(function (res) {316
if (!res.ok) {317
throw new Error("live");318
}319
return res.json();320
})321
.then(function (data) {322
if (data.rows) {323
applyPipeRows(data.rows, scrollX, scrollY, box, left);324
} else {325
applyDetail(data);326
window.scrollTo(scrollX, scrollY);327
if (box) {328
box.scrollLeft = left;329
}330
}331
window.dispatchEvent(new Event("resize"));332
if (data.active) {333
setTimeout(liveTimer, 3000);334
}335
})336
.catch(function () {337
setTimeout(liveTimer, 3000);338
});339
};340
setTimeout(liveTimer, 3000);341
}342
146
if (!wrapBox || wrapBox.getAttribute("data-running") !== "1" || !log) {343
if (!wrapBox || wrapBox.getAttribute("data-running") !== "1" || !log) {147
return;344
return;148
}345
}@@ -364,6 +561,11 @@364
}561
}365
});562
});366
offset = data.offset || offset;563
offset = data.offset || offset;564
var qEl = document.querySelector(".jobhead [data-queue]");565
if (qEl) {566
qEl.textContent = data.queue || "";567
qEl.hidden = !data.queue;568
}367
if (data.status === "running" || data.status === "queued") {569
if (data.status === "running" || data.status === "queued") {368
setTimeout(poll, 1500);570
setTimeout(poll, 1500);369
return;571
return;@@ -186,6 +186,18 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px
186
186
background: white; border: 1px solid var(--line); border-radius: 12px; padding: 0.8rem;
187
187
box-shadow: var(--shadow);
188
188
}
189
.menu-panel[popover]:popover-open,
190
.showid form[popover]:popover-open,
191
.stage-pop:popover-open,
192
.float-tip:popover-open {
193
position: fixed;
194
inset: auto;
195
margin: 0;
196
width: max-content;
197
max-width: min(420px, calc(100vw - 16px));
198
height: auto;
199
}
200
.menu-panel[popover]:popover-open { width: min(420px, calc(100vw - 16px)); }
189
201
.copyline { display: flex; gap: 0.4rem; }
190
202
.copyline input { font-family: ui-monospace, monospace; font-size: 0.85rem; }
191
203
.commitbar {
@@ -267,12 +279,6 @@ table.code td.src { white-space: pre; }
267
279
}
268
280
.heat-col { display: grid; grid-auto-rows: 11px; row-gap: 3px; }
269
281
.sq { width: 11px; height: 11px; border-radius: 2px; display: block; position: relative; }
270
.sq[title]:hover::after, .sq[title]:focus::after {
271
content: attr(title);
272
position: absolute; left: 50%; bottom: calc(100% + 4px); transform: translateX(-50%);
273
background: #142033; color: white; padding: 0.28rem 0.5rem; border-radius: 6px;
274
font-size: 0.78rem; line-height: 1.2; white-space: nowrap; z-index: 5; pointer-events: none;
275
}
276
282
.sq.off { background: transparent; }
277
283
.sq.lv0 { background: #e6edf5; }
278
284
.sq.lv1 { background: #b9d4f6; }
@@ -409,6 +415,8 @@ label.sugcheck input { width: auto; }
409
415
display: flex; gap: 0.4rem; width: 18rem; padding: 0.6rem;
410
416
background: white; border: 1px solid var(--line); border-radius: 10px; box-shadow: var(--shadow);
411
417
}
418
.showid form[popover]:not(:popover-open) { display: none; }
419
.showid form[popover]:popover-open { display: flex; width: min(18rem, calc(100vw - 16px)); }
412
420
.showid form input { width: auto; flex: 1; }
413
421
table.pipes td { padding: var(--sp-2) var(--sp-3); }
414
422
table.pipes .pipeid { font-weight: 700; }
@@ -456,10 +464,22 @@ svg.ico { width: 14px; height: 14px; flex: none; }
456
464
.skipped .mark::after, .canceled .mark::after {
457
465
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;
458
466
}
467
.status.pending .mark, .status.created .mark,
468
.stage-dot.pending .mark, .stage-dot.created .mark {
469
background: transparent;
470
box-shadow: inset 0 0 0 2px #8c959f;
471
}
459
472
.running .mark::after {
460
content: ""; position: absolute; left: 4px; top: 4px; width: 8px; height: 8px;
473
content: ""; position: absolute; left: 3px; top: 3px; width: 10px; height: 10px;
461
474
border: 2px solid #fff; border-radius: 50%; border-right-color: transparent; box-sizing: border-box;
475
animation: spin 0.8s linear infinite;
476
}
477
.stage-dot.sm.running .mark::after { left: 2px; top: 2px; width: 8px; height: 8px; }
478
@keyframes spin { to { transform: rotate(1turn); } }
479
@media (prefers-reduced-motion: reduce) {
480
.running .mark::after { animation: none; }
462
481
}
482
.commitbar a.status { flex: none; text-decoration: none; }
463
483
.stages { display: flex; align-items: center; }
464
484
.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }
465
485
.danger-modal {
@@ -480,21 +500,21 @@ button.stage-dot {
480
500
width: 26px; height: 26px; min-height: 0; padding: 0; border: 0; border-radius: 50%;
481
501
background: transparent; display: grid; place-items: center; position: relative;
482
502
}
483
button.stage-dot:hover::after, button.stage-dot:focus-visible::after {
484
content: attr(data-tip);
485
position: absolute; bottom: calc(100% + 8px); left: 50%; transform: translateX(-50%);
503
.stage.open button.stage-dot { box-shadow: 0 0 0 2px #fff, 0 0 0 4px #1f75cb; }
504
.float-tip {
505
border: 0; padding: 0.28rem 0.5rem; border-radius: 6px;
486
506
background: #24292f; color: white; font-size: 0.75rem; font-weight: 600;
487
padding: 0.28rem 0.5rem; border-radius: 6px; white-space: nowrap; z-index: 7;
507
line-height: 1.2; white-space: nowrap; pointer-events: none;
488
508
}
489
.stage.open button.stage-dot { box-shadow: 0 0 0 2px #fff, 0 0 0 4px #1f75cb; }
509
.float-tip.heat { background: #142033; font-size: 0.78rem; font-weight: 400; }
490
510
.stage-pop {
491
position: absolute; top: calc(100% + 10px); left: 0; z-index: 8; min-width: 220px;
511
min-width: min(220px, calc(100vw - 16px));
492
512
background: white; border: 1px solid var(--line); border-radius: 8px;
493
513
box-shadow: var(--shadow); padding: 0.7rem 0.85rem;
494
514
}
495
.stage-pop[hidden] { display: none; }
496
515
.stage-pop ul { list-style: none; margin: 0.35rem 0 0; padding: 0; }
497
516
.stage-pop a, .related a { display: flex; align-items: center; gap: 0.4rem; text-decoration: none; padding: 0.22rem 0; color: var(--ink); }
517
.queue { color: var(--muted); font-weight: 500; }
498
518
.stage-dot.sm { width: 16px; height: 16px; display: inline-grid; place-items: center; }
499
519
.stage-dot.sm .mark { width: 14px; height: 14px; }
500
520
.stage-dot.sm.passed .mark::after { left: 4px; top: 2px; width: 3px; height: 6px; }
@@ -510,10 +530,11 @@ button.stage-dot:hover::after, button.stage-dot:focus-visible::after {
510
530
.contools .ghost, .contools a.ghost { padding: 0.3rem 0.55rem; background: white; }
511
531
.console {
512
532
color: #e6edf3; font-family: ui-monospace, monospace; font-size: 0.82rem;
513
max-height: 68vh; overflow: auto; padding: 0.35rem 0 0.8rem;
533
max-height: 68vh; overflow-x: hidden; overflow-y: auto; padding: 0.35rem 0 0.8rem;
514
534
}
515
.console.wrap code { white-space: pre-wrap; word-break: break-word; }
516
.console code { white-space: pre; }
535
.console.nowrap { overflow-x: auto; }
536
.console code { min-width: 0; white-space: pre-wrap; overflow-wrap: anywhere; }
537
.console.nowrap code { white-space: pre; overflow-wrap: normal; }
517
538
.ansi-bold { font-weight: 700; }
518
539
.ansi-dim { opacity: 0.65; }
519
540
.ansi-italic { font-style: italic; }
@@ -553,7 +574,7 @@ button.stage-dot:hover::after, button.stage-dot:focus-visible::after {
553
574
.lognote { margin: 0.2rem 0.8rem 0.45rem; color: #8b949e; font-family: inherit; }
554
575
.logline, .logsec ol li {
555
576
display: grid; grid-template-columns: 3rem 5.4rem minmax(0, 1fr);
556
gap: 0.45rem; padding: 0 0.7rem; line-height: 1.45;
577
gap: 0.45rem; padding: 0 0.7rem; line-height: 1.45; min-width: 0;
557
578
}
558
579
.logsec ol { list-style: none; margin: 0; padding: 0; display: none; }
559
580
.logsec.open ol { display: block; }
@@ -562,10 +583,14 @@ button.stage-dot:hover::after, button.stage-dot:focus-visible::after {
562
583
.logline.hit, .logsec li.hit { background: #3d3416; }
563
584
.logline.hit.on, .logsec li.hit.on { background: #6b5710; }
564
585
button.section-toggle {
565
width: 100%; min-height: 0; background: transparent; color: #9ecbff; border: 0; border-radius: 0;
586
position: sticky; left: 0; z-index: 2; box-sizing: border-box;
587
width: 100%; max-width: 100%;
588
min-height: 0; background: #1e1e1e; color: #9ecbff; border: 0; border-radius: 0;
566
589
display: flex; align-items: center; gap: 0.45rem; padding: 0.4rem 0.7rem; text-align: left; font-weight: 650;
567
590
}
568
.section-toggle .pill { margin-left: auto; background: #2d333b; color: #d0d7de; border-color: #444c56; }
591
.section-toggle .sectitle { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
592
.section-toggle .pill { flex: none; margin-left: auto; background: #2d333b; color: #d0d7de; border-color: #444c56; }
593
.contools .ghost[aria-pressed="true"] { background: var(--blue-soft); color: var(--blue-deep); border-color: var(--blue); }
569
594
.chev {
570
595
width: 0; height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent;
571
596
border-left: 6px solid currentColor; display: inline-block;
@@ -598,16 +623,17 @@ button.section-toggle {
598
623
}
599
624
.ci-gutter span { display: block; }
600
625
.ci-gutter span.bad { background: #fde8e8; color: var(--bad); font-weight: 700; }
601
.ci-stage { position: relative; height: 24rem; }
626
.ci-stage { position: relative; display: grid; align-items: stretch; }
602
627
.ci-back, .ciedit textarea {
628
grid-area: 1 / 1;
603
629
font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45;
604
630
padding: 0.55rem 0.7rem; margin: 0; white-space: pre; tab-size: 2;
605
631
}
606
.ci-back { position: absolute; inset: 0; overflow: hidden; color: var(--ink); pointer-events: none; }
632
.ci-back { position: relative; overflow: hidden; color: var(--ink); pointer-events: none; }
607
633
.codeline { min-height: 1.45em; }
608
634
.codeline.bad { background: #fff5f5; }
609
635
.ciedit textarea {
610
position: relative; width: 100%; height: 100%; border: 0; border-radius: 0;
636
position: relative; width: 100%; height: auto; align-self: stretch; border: 0; border-radius: 0;
611
637
background: transparent; color: transparent; caret-color: var(--ink); resize: none; overflow: auto;
612
638
}
613
639
.ciedit textarea::selection { background: rgba(31, 111, 235, 0.25); }
@@ -636,6 +662,147 @@ button.section-toggle {
636
662
}
637
663
.sidenav-links a.on { background: transparent; font-weight: 400; box-shadow: inset 0 -2px 0 var(--blue); }
638
664
}
665
.spec h2 { scroll-margin-top: calc(var(--top-h) + 12px); margin: 1.6rem 0 0.6rem; }
666
.spec .lead { margin-top: 0; }
667
.spec-example {
668
background: #142033; color: #e7f0ff; border-radius: var(--radius-lg);
669
padding: 0.85rem 1rem; overflow: auto; font-family: var(--mono); font-size: 0.88rem;
670
line-height: 1.45;
671
}
672
.spec-table { width: 100%; border-collapse: collapse; background: var(--card); }
673
.spec-table th, .spec-table td {
674
border-bottom: 1px solid var(--line); text-align: left; vertical-align: top;
675
padding: 0.45rem 0.7rem;
676
}
677
.spec-table th { font-size: var(--fs-sm); color: var(--muted); font-weight: 650; }
678
.spec-table code { font-family: var(--mono); font-size: 0.92em; }
679
.spec-list { margin: 0.2rem 0 0; padding-left: 1.2rem; }
680
.spec-list li { margin: 0.35rem 0; }
681
main.wide:has(.commitpage) { width: min(100%, 1440px); max-width: 1440px; }
682
.commithead h1 { white-space: normal; overflow-wrap: anywhere; }
683
pre.commitmsg {
684
background: var(--card); color: var(--ink); border: 1px solid var(--line);
685
white-space: pre-wrap; overflow-wrap: anywhere; margin: 0 0 var(--sp-3);
686
}
687
.commitmeta { margin-top: 0; }
688
.commitfacts { display: grid; gap: 0.55rem; margin: 0.9rem 0 0; }
689
.commitfacts div { display: grid; grid-template-columns: 11rem minmax(0, 1fr); gap: 0.7rem; align-items: center; }
690
.commitfacts dt, .commitfacts dd { margin: 0; }
691
.commitfacts dt { color: var(--muted); }
692
.commitfacts code.sha { word-break: break-all; }
693
.commitfacts .parents { display: flex; flex-wrap: wrap; gap: 0.45rem; }
694
.commitfacts a.status { text-decoration: none; width: fit-content; }
695
.diffbar { margin-top: 0; }
696
.diffswitch { display: inline-flex; border: 1px solid var(--line); border-radius: var(--radius); overflow: hidden; flex: none; }
697
.diffswitch button { background: white; color: var(--ink); border: 0; border-radius: 0; min-width: 7.5rem; }
698
.diffswitch button + button { border-left: 1px solid var(--line); }
699
.commitdiff[data-mode="inline"] [data-diff-mode="inline"],
700
.commitdiff[data-mode="side"] [data-diff-mode="side"] { background: var(--blue-soft); color: var(--blue-deep); }
701
.commitlayout { display: grid; grid-template-columns: minmax(16rem, 22rem) minmax(0, 1fr); gap: 1rem; align-items: start; }
702
.commitfiles {
703
position: sticky; top: calc(var(--top-h) + 8px); max-height: calc(100vh - var(--top-h) - 16px);
704
overflow: auto; background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
705
padding: 0.7rem 0.75rem;
706
}
707
.commitfiles h2 { margin: 0 0 0.4rem; font-size: var(--fs-sm); color: var(--muted); }
708
.commitfiles ul { list-style: none; margin: 0; padding: 0; }
709
.commitfiles li {
710
display: flex; align-items: center; gap: 0.35rem; min-height: 1.7rem;
711
font-variant-numeric: tabular-nums;
712
}
713
.commitfiles li.d1 { padding-left: 0.9rem; }
714
.commitfiles li.d2 { padding-left: 1.8rem; }
715
.commitfiles li.d3 { padding-left: 2.7rem; }
716
.commitfiles li.d4 { padding-left: 3.6rem; }
717
.commitfiles li.d5 { padding-left: 4.5rem; }
718
.commitfiles li.d6 { padding-left: 5.4rem; }
719
.commitfiles li.d7 { padding-left: 6.3rem; }
720
.commitfiles li.d8 { padding-left: 7.2rem; }
721
.commitfiles a { display: inline-flex; align-items: center; min-width: 0; color: inherit; text-decoration: none; }
722
.commitfiles .name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
723
.addstat { color: var(--ok); font-variant-numeric: tabular-nums; }
724
.delstat { color: var(--bad); font-variant-numeric: tabular-nums; }
725
.commitdiffs { min-width: 0; }
726
.commitfile {
727
background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
728
margin: 0 0 0.8rem; scroll-margin-top: calc(var(--top-h) + 12px); min-width: 0;
729
}
730
.commitfile > header {
731
display: flex; align-items: center; gap: 0.5rem; min-height: 44px;
732
padding: 0.35rem 0.7rem; background: #f6f8fa; border-bottom: 1px solid var(--line);
733
border-radius: var(--radius-lg) var(--radius-lg) 0 0; position: sticky; top: var(--top-h); z-index: 2;
734
}
735
.commitfile > header .path { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
736
.commitfile > header .oldpath { color: var(--muted); text-decoration: line-through; }
737
.commitfile > header .counts { flex: none; }
738
.commitfile > header button[data-toggle-diff] { flex: none; min-width: 7.5rem; }
739
.commitfile[data-collapsed="1"] > header { border-bottom: 0; border-radius: var(--radius-lg); }
740
.commitfile[data-collapsed="1"] .diffbody { display: none; }
741
.commitdiff[data-mode="inline"] .split { display: none; }
742
.commitdiff[data-mode="side"] .unified { display: none; }
743
.commitline, .half {
744
display: grid; grid-template-columns: 3.2rem 3.2rem minmax(0, 1fr);
745
font-family: var(--mono); font-size: 0.84rem; line-height: 1.45; min-width: 0;
746
}
747
.half { grid-template-columns: 3.2rem minmax(0, 1fr); }
748
.commitline code, .half code {
749
display: block; white-space: pre; overflow-x: auto; min-width: 0;
750
padding: 0 0.7rem; font-family: inherit;
751
}
752
.commitline .ln, .half .ln { color: #8c959f; text-align: right; padding: 0 0.45rem; user-select: none; }
753
.commitline.kind-add, .half.kind-add { background: #e6ffec; }
754
.commitline.kind-del, .half.kind-del { background: #ffebe9; }
755
.commitline.kind-hunk { grid-template-columns: minmax(0, 1fr); color: #8c959f; background: #f6f8fa; }
756
.half.kind-empty { background: #f6f8fa; }
757
.pair { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }
758
.pair .half + .half { border-left: 1px solid var(--line); }
759
.binaryhint { margin: 0; padding: 0.8rem 0.9rem; }
760
a.btn { text-decoration: none; }
761
.branchsearch { display: block; margin: 0 0 0.8rem; }
762
.branchsearch input { width: min(100%, 24rem); }
763
.branchtable { width: 100%; border-collapse: collapse; background: var(--card); }
764
.branchtable th, .branchtable td {
765
border-bottom: 1px solid var(--line); text-align: left; vertical-align: middle;
766
padding: 0.45rem 0.7rem; height: 3rem;
767
}
768
.branchtable th { font-size: var(--fs-sm); color: var(--muted); font-weight: 650; }
769
.branchtable .nums, .branchtable .addstat, .branchtable .delstat { font-variant-numeric: tabular-nums; white-space: nowrap; }
770
.branchacts { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; min-height: 2.4rem; }
771
.branchacts a { white-space: nowrap; }
772
.branch-dialog {
773
border: 0; border-radius: var(--radius-lg); padding: 1.2rem 1.3rem;
774
max-width: 32rem; width: calc(100% - 2rem);
775
}
776
.branch-dialog::backdrop { background: rgba(8, 16, 32, 0.45); }
777
.branch-dialog p { min-height: 1.5rem; }
778
.mdbox { margin: 0 0 0.8rem; }
779
.mdtabs { display: flex; min-height: 2.4rem; }
780
.mdtabs button { background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 0; }
781
.mdtabs button + button { border-left: 0; }
782
.mdtabs button[aria-selected="true"] { background: var(--blue-soft); color: var(--blue-deep); }
783
.mdbox [data-md-write] textarea,
784
.mdbox [data-md-preview] {
785
display: block; width: 100%; height: 9rem; min-height: 9rem; max-height: 9rem;
786
overflow: auto; box-sizing: border-box; margin: 0;
787
}
788
.fieldlabel { margin: 0.6rem 0 0.3rem; }
789
.timeline { list-style: none; margin: 0; padding: 0; }
790
.timeline > li {
791
border-left: 2px solid var(--line); margin: 0 0 0 0.4rem; padding: 0.35rem 0 0.8rem 0.9rem;
792
min-height: 2.4rem;
793
}
794
.timeline .pushlist, .reply {
795
background: var(--card); border: 1px solid var(--line); border-radius: var(--radius);
796
padding: 0.45rem 0.7rem; margin: 0.35rem 0;
797
}
798
.commitline.with-gutter { grid-template-columns: 16px 3.2rem 3.2rem minmax(0, 1fr); }
799
.commitline.with-gutter.kind-hunk { grid-template-columns: minmax(0, 1fr); }
800
.commitline.picked { box-shadow: inset 3px 0 0 var(--blue); }
801
tr[hidden] { display: none; }
802
@media (max-width: 900px) {
803
.commitlayout { grid-template-columns: minmax(0, 1fr); }
804
.commitfiles { position: static; max-height: 16rem; }
805
}
639
806
@media (max-width: 800px) {
640
807
.proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
641
808
.proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
@@ -186,6 +186,18 @@ td, th { text-align: left; padding: var(--sp-2) var(--sp-3); border-bottom: 1px186
background: white; border: 1px solid var(--line); border-radius: 12px; padding: 0.8rem;186
background: white; border: 1px solid var(--line); border-radius: 12px; padding: 0.8rem;187
box-shadow: var(--shadow);187
box-shadow: var(--shadow);188
}188
}189
.menu-panel[popover]:popover-open,190
.showid form[popover]:popover-open,191
.stage-pop:popover-open,192
.float-tip:popover-open {193
position: fixed;194
inset: auto;195
margin: 0;196
width: max-content;197
max-width: min(420px, calc(100vw - 16px));198
height: auto;199
}200
.menu-panel[popover]:popover-open { width: min(420px, calc(100vw - 16px)); }189
.copyline { display: flex; gap: 0.4rem; }201
.copyline { display: flex; gap: 0.4rem; }190
.copyline input { font-family: ui-monospace, monospace; font-size: 0.85rem; }202
.copyline input { font-family: ui-monospace, monospace; font-size: 0.85rem; }191
.commitbar {203
.commitbar {@@ -267,12 +279,6 @@ table.code td.src { white-space: pre; }267
}279
}268
.heat-col { display: grid; grid-auto-rows: 11px; row-gap: 3px; }280
.heat-col { display: grid; grid-auto-rows: 11px; row-gap: 3px; }269
.sq { width: 11px; height: 11px; border-radius: 2px; display: block; position: relative; }281
.sq { width: 11px; height: 11px; border-radius: 2px; display: block; position: relative; }270
.sq[title]:hover::after, .sq[title]:focus::after {271
content: attr(title);272
position: absolute; left: 50%; bottom: calc(100% + 4px); transform: translateX(-50%);273
background: #142033; color: white; padding: 0.28rem 0.5rem; border-radius: 6px;274
font-size: 0.78rem; line-height: 1.2; white-space: nowrap; z-index: 5; pointer-events: none;275
}276
.sq.off { background: transparent; }282
.sq.off { background: transparent; }277
.sq.lv0 { background: #e6edf5; }283
.sq.lv0 { background: #e6edf5; }278
.sq.lv1 { background: #b9d4f6; }284
.sq.lv1 { background: #b9d4f6; }@@ -409,6 +415,8 @@ label.sugcheck input { width: auto; }409
display: flex; gap: 0.4rem; width: 18rem; padding: 0.6rem;415
display: flex; gap: 0.4rem; width: 18rem; padding: 0.6rem;410
background: white; border: 1px solid var(--line); border-radius: 10px; box-shadow: var(--shadow);416
background: white; border: 1px solid var(--line); border-radius: 10px; box-shadow: var(--shadow);411
}417
}418
.showid form[popover]:not(:popover-open) { display: none; }419
.showid form[popover]:popover-open { display: flex; width: min(18rem, calc(100vw - 16px)); }412
.showid form input { width: auto; flex: 1; }420
.showid form input { width: auto; flex: 1; }413
table.pipes td { padding: var(--sp-2) var(--sp-3); }421
table.pipes td { padding: var(--sp-2) var(--sp-3); }414
table.pipes .pipeid { font-weight: 700; }422
table.pipes .pipeid { font-weight: 700; }@@ -456,10 +464,22 @@ svg.ico { width: 14px; height: 14px; flex: none; }456
.skipped .mark::after, .canceled .mark::after {464
.skipped .mark::after, .canceled .mark::after {457
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;465
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;458
}466
}467
.status.pending .mark, .status.created .mark,468
.stage-dot.pending .mark, .stage-dot.created .mark {469
background: transparent;470
box-shadow: inset 0 0 0 2px #8c959f;471
}459
.running .mark::after {472
.running .mark::after {460
content: ""; position: absolute; left: 4px; top: 4px; width: 8px; height: 8px;473
content: ""; position: absolute; left: 3px; top: 3px; width: 10px; height: 10px;461
border: 2px solid #fff; border-radius: 50%; border-right-color: transparent; box-sizing: border-box;474
border: 2px solid #fff; border-radius: 50%; border-right-color: transparent; box-sizing: border-box;475
animation: spin 0.8s linear infinite;476
}477
.stage-dot.sm.running .mark::after { left: 2px; top: 2px; width: 8px; height: 8px; }478
@keyframes spin { to { transform: rotate(1turn); } }479
@media (prefers-reduced-motion: reduce) {480
.running .mark::after { animation: none; }462
}481
}482
.commitbar a.status { flex: none; text-decoration: none; }463
.stages { display: flex; align-items: center; }483
.stages { display: flex; align-items: center; }464
.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }484
.mrpipe { display: flex; align-items: center; gap: 0.8rem; margin: 0.2rem 0 1rem; }465
.danger-modal {485
.danger-modal {@@ -480,21 +500,21 @@ button.stage-dot {480
width: 26px; height: 26px; min-height: 0; padding: 0; border: 0; border-radius: 50%;500
width: 26px; height: 26px; min-height: 0; padding: 0; border: 0; border-radius: 50%;481
background: transparent; display: grid; place-items: center; position: relative;501
background: transparent; display: grid; place-items: center; position: relative;482
}502
}483
button.stage-dot:hover::after, button.stage-dot:focus-visible::after {503
.stage.open button.stage-dot { box-shadow: 0 0 0 2px #fff, 0 0 0 4px #1f75cb; }484
content: attr(data-tip);504
.float-tip {485
position: absolute; bottom: calc(100% + 8px); left: 50%; transform: translateX(-50%);505
border: 0; padding: 0.28rem 0.5rem; border-radius: 6px;486
background: #24292f; color: white; font-size: 0.75rem; font-weight: 600;506
background: #24292f; color: white; font-size: 0.75rem; font-weight: 600;487
padding: 0.28rem 0.5rem; border-radius: 6px; white-space: nowrap; z-index: 7;507
line-height: 1.2; white-space: nowrap; pointer-events: none;488
}508
}489
.stage.open button.stage-dot { box-shadow: 0 0 0 2px #fff, 0 0 0 4px #1f75cb; }509
.float-tip.heat { background: #142033; font-size: 0.78rem; font-weight: 400; }490
.stage-pop {510
.stage-pop {491
position: absolute; top: calc(100% + 10px); left: 0; z-index: 8; min-width: 220px;511
min-width: min(220px, calc(100vw - 16px));492
background: white; border: 1px solid var(--line); border-radius: 8px;512
background: white; border: 1px solid var(--line); border-radius: 8px;493
box-shadow: var(--shadow); padding: 0.7rem 0.85rem;513
box-shadow: var(--shadow); padding: 0.7rem 0.85rem;494
}514
}495
.stage-pop[hidden] { display: none; }496
.stage-pop ul { list-style: none; margin: 0.35rem 0 0; padding: 0; }515
.stage-pop ul { list-style: none; margin: 0.35rem 0 0; padding: 0; }497
.stage-pop a, .related a { display: flex; align-items: center; gap: 0.4rem; text-decoration: none; padding: 0.22rem 0; color: var(--ink); }516
.stage-pop a, .related a { display: flex; align-items: center; gap: 0.4rem; text-decoration: none; padding: 0.22rem 0; color: var(--ink); }517
.queue { color: var(--muted); font-weight: 500; }498
.stage-dot.sm { width: 16px; height: 16px; display: inline-grid; place-items: center; }518
.stage-dot.sm { width: 16px; height: 16px; display: inline-grid; place-items: center; }499
.stage-dot.sm .mark { width: 14px; height: 14px; }519
.stage-dot.sm .mark { width: 14px; height: 14px; }500
.stage-dot.sm.passed .mark::after { left: 4px; top: 2px; width: 3px; height: 6px; }520
.stage-dot.sm.passed .mark::after { left: 4px; top: 2px; width: 3px; height: 6px; }@@ -510,10 +530,11 @@ button.stage-dot:hover::after, button.stage-dot:focus-visible::after {510
.contools .ghost, .contools a.ghost { padding: 0.3rem 0.55rem; background: white; }530
.contools .ghost, .contools a.ghost { padding: 0.3rem 0.55rem; background: white; }511
.console {531
.console {512
color: #e6edf3; font-family: ui-monospace, monospace; font-size: 0.82rem;532
color: #e6edf3; font-family: ui-monospace, monospace; font-size: 0.82rem;513
max-height: 68vh; overflow: auto; padding: 0.35rem 0 0.8rem;533
max-height: 68vh; overflow-x: hidden; overflow-y: auto; padding: 0.35rem 0 0.8rem;514
}534
}515
.console.wrap code { white-space: pre-wrap; word-break: break-word; }535
.console.nowrap { overflow-x: auto; }516
.console code { white-space: pre; }536
.console code { min-width: 0; white-space: pre-wrap; overflow-wrap: anywhere; }537
.console.nowrap code { white-space: pre; overflow-wrap: normal; }517
.ansi-bold { font-weight: 700; }538
.ansi-bold { font-weight: 700; }518
.ansi-dim { opacity: 0.65; }539
.ansi-dim { opacity: 0.65; }519
.ansi-italic { font-style: italic; }540
.ansi-italic { font-style: italic; }@@ -553,7 +574,7 @@ button.stage-dot:hover::after, button.stage-dot:focus-visible::after {553
.lognote { margin: 0.2rem 0.8rem 0.45rem; color: #8b949e; font-family: inherit; }574
.lognote { margin: 0.2rem 0.8rem 0.45rem; color: #8b949e; font-family: inherit; }554
.logline, .logsec ol li {575
.logline, .logsec ol li {555
display: grid; grid-template-columns: 3rem 5.4rem minmax(0, 1fr);576
display: grid; grid-template-columns: 3rem 5.4rem minmax(0, 1fr);556
gap: 0.45rem; padding: 0 0.7rem; line-height: 1.45;577
gap: 0.45rem; padding: 0 0.7rem; line-height: 1.45; min-width: 0;557
}578
}558
.logsec ol { list-style: none; margin: 0; padding: 0; display: none; }579
.logsec ol { list-style: none; margin: 0; padding: 0; display: none; }559
.logsec.open ol { display: block; }580
.logsec.open ol { display: block; }@@ -562,10 +583,14 @@ button.stage-dot:hover::after, button.stage-dot:focus-visible::after {562
.logline.hit, .logsec li.hit { background: #3d3416; }583
.logline.hit, .logsec li.hit { background: #3d3416; }563
.logline.hit.on, .logsec li.hit.on { background: #6b5710; }584
.logline.hit.on, .logsec li.hit.on { background: #6b5710; }564
button.section-toggle {585
button.section-toggle {565
width: 100%; min-height: 0; background: transparent; color: #9ecbff; border: 0; border-radius: 0;586
position: sticky; left: 0; z-index: 2; box-sizing: border-box;587
width: 100%; max-width: 100%;588
min-height: 0; background: #1e1e1e; color: #9ecbff; border: 0; border-radius: 0;566
display: flex; align-items: center; gap: 0.45rem; padding: 0.4rem 0.7rem; text-align: left; font-weight: 650;589
display: flex; align-items: center; gap: 0.45rem; padding: 0.4rem 0.7rem; text-align: left; font-weight: 650;567
}590
}568
.section-toggle .pill { margin-left: auto; background: #2d333b; color: #d0d7de; border-color: #444c56; }591
.section-toggle .sectitle { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }592
.section-toggle .pill { flex: none; margin-left: auto; background: #2d333b; color: #d0d7de; border-color: #444c56; }593
.contools .ghost[aria-pressed="true"] { background: var(--blue-soft); color: var(--blue-deep); border-color: var(--blue); }569
.chev {594
.chev {570
width: 0; height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent;595
width: 0; height: 0; border-top: 5px solid transparent; border-bottom: 5px solid transparent;571
border-left: 6px solid currentColor; display: inline-block;596
border-left: 6px solid currentColor; display: inline-block;@@ -598,16 +623,17 @@ button.section-toggle {598
}623
}599
.ci-gutter span { display: block; }624
.ci-gutter span { display: block; }600
.ci-gutter span.bad { background: #fde8e8; color: var(--bad); font-weight: 700; }625
.ci-gutter span.bad { background: #fde8e8; color: var(--bad); font-weight: 700; }601
.ci-stage { position: relative; height: 24rem; }626
.ci-stage { position: relative; display: grid; align-items: stretch; }602
.ci-back, .ciedit textarea {627
.ci-back, .ciedit textarea {628
grid-area: 1 / 1;603
font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45;629
font-family: ui-monospace, monospace; font-size: 0.86rem; line-height: 1.45;604
padding: 0.55rem 0.7rem; margin: 0; white-space: pre; tab-size: 2;630
padding: 0.55rem 0.7rem; margin: 0; white-space: pre; tab-size: 2;605
}631
}606
.ci-back { position: absolute; inset: 0; overflow: hidden; color: var(--ink); pointer-events: none; }632
.ci-back { position: relative; overflow: hidden; color: var(--ink); pointer-events: none; }607
.codeline { min-height: 1.45em; }633
.codeline { min-height: 1.45em; }608
.codeline.bad { background: #fff5f5; }634
.codeline.bad { background: #fff5f5; }609
.ciedit textarea {635
.ciedit textarea {610
position: relative; width: 100%; height: 100%; border: 0; border-radius: 0;636
position: relative; width: 100%; height: auto; align-self: stretch; border: 0; border-radius: 0;611
background: transparent; color: transparent; caret-color: var(--ink); resize: none; overflow: auto;637
background: transparent; color: transparent; caret-color: var(--ink); resize: none; overflow: auto;612
}638
}613
.ciedit textarea::selection { background: rgba(31, 111, 235, 0.25); }639
.ciedit textarea::selection { background: rgba(31, 111, 235, 0.25); }@@ -636,6 +662,147 @@ button.section-toggle {636
}662
}637
.sidenav-links a.on { background: transparent; font-weight: 400; box-shadow: inset 0 -2px 0 var(--blue); }663
.sidenav-links a.on { background: transparent; font-weight: 400; box-shadow: inset 0 -2px 0 var(--blue); }638
}664
}665
.spec h2 { scroll-margin-top: calc(var(--top-h) + 12px); margin: 1.6rem 0 0.6rem; }666
.spec .lead { margin-top: 0; }667
.spec-example {668
background: #142033; color: #e7f0ff; border-radius: var(--radius-lg);669
padding: 0.85rem 1rem; overflow: auto; font-family: var(--mono); font-size: 0.88rem;670
line-height: 1.45;671
}672
.spec-table { width: 100%; border-collapse: collapse; background: var(--card); }673
.spec-table th, .spec-table td {674
border-bottom: 1px solid var(--line); text-align: left; vertical-align: top;675
padding: 0.45rem 0.7rem;676
}677
.spec-table th { font-size: var(--fs-sm); color: var(--muted); font-weight: 650; }678
.spec-table code { font-family: var(--mono); font-size: 0.92em; }679
.spec-list { margin: 0.2rem 0 0; padding-left: 1.2rem; }680
.spec-list li { margin: 0.35rem 0; }681
main.wide:has(.commitpage) { width: min(100%, 1440px); max-width: 1440px; }682
.commithead h1 { white-space: normal; overflow-wrap: anywhere; }683
pre.commitmsg {684
background: var(--card); color: var(--ink); border: 1px solid var(--line);685
white-space: pre-wrap; overflow-wrap: anywhere; margin: 0 0 var(--sp-3);686
}687
.commitmeta { margin-top: 0; }688
.commitfacts { display: grid; gap: 0.55rem; margin: 0.9rem 0 0; }689
.commitfacts div { display: grid; grid-template-columns: 11rem minmax(0, 1fr); gap: 0.7rem; align-items: center; }690
.commitfacts dt, .commitfacts dd { margin: 0; }691
.commitfacts dt { color: var(--muted); }692
.commitfacts code.sha { word-break: break-all; }693
.commitfacts .parents { display: flex; flex-wrap: wrap; gap: 0.45rem; }694
.commitfacts a.status { text-decoration: none; width: fit-content; }695
.diffbar { margin-top: 0; }696
.diffswitch { display: inline-flex; border: 1px solid var(--line); border-radius: var(--radius); overflow: hidden; flex: none; }697
.diffswitch button { background: white; color: var(--ink); border: 0; border-radius: 0; min-width: 7.5rem; }698
.diffswitch button + button { border-left: 1px solid var(--line); }699
.commitdiff[data-mode="inline"] [data-diff-mode="inline"],700
.commitdiff[data-mode="side"] [data-diff-mode="side"] { background: var(--blue-soft); color: var(--blue-deep); }701
.commitlayout { display: grid; grid-template-columns: minmax(16rem, 22rem) minmax(0, 1fr); gap: 1rem; align-items: start; }702
.commitfiles {703
position: sticky; top: calc(var(--top-h) + 8px); max-height: calc(100vh - var(--top-h) - 16px);704
overflow: auto; background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);705
padding: 0.7rem 0.75rem;706
}707
.commitfiles h2 { margin: 0 0 0.4rem; font-size: var(--fs-sm); color: var(--muted); }708
.commitfiles ul { list-style: none; margin: 0; padding: 0; }709
.commitfiles li {710
display: flex; align-items: center; gap: 0.35rem; min-height: 1.7rem;711
font-variant-numeric: tabular-nums;712
}713
.commitfiles li.d1 { padding-left: 0.9rem; }714
.commitfiles li.d2 { padding-left: 1.8rem; }715
.commitfiles li.d3 { padding-left: 2.7rem; }716
.commitfiles li.d4 { padding-left: 3.6rem; }717
.commitfiles li.d5 { padding-left: 4.5rem; }718
.commitfiles li.d6 { padding-left: 5.4rem; }719
.commitfiles li.d7 { padding-left: 6.3rem; }720
.commitfiles li.d8 { padding-left: 7.2rem; }721
.commitfiles a { display: inline-flex; align-items: center; min-width: 0; color: inherit; text-decoration: none; }722
.commitfiles .name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }723
.addstat { color: var(--ok); font-variant-numeric: tabular-nums; }724
.delstat { color: var(--bad); font-variant-numeric: tabular-nums; }725
.commitdiffs { min-width: 0; }726
.commitfile {727
background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);728
margin: 0 0 0.8rem; scroll-margin-top: calc(var(--top-h) + 12px); min-width: 0;729
}730
.commitfile > header {731
display: flex; align-items: center; gap: 0.5rem; min-height: 44px;732
padding: 0.35rem 0.7rem; background: #f6f8fa; border-bottom: 1px solid var(--line);733
border-radius: var(--radius-lg) var(--radius-lg) 0 0; position: sticky; top: var(--top-h); z-index: 2;734
}735
.commitfile > header .path { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }736
.commitfile > header .oldpath { color: var(--muted); text-decoration: line-through; }737
.commitfile > header .counts { flex: none; }738
.commitfile > header button[data-toggle-diff] { flex: none; min-width: 7.5rem; }739
.commitfile[data-collapsed="1"] > header { border-bottom: 0; border-radius: var(--radius-lg); }740
.commitfile[data-collapsed="1"] .diffbody { display: none; }741
.commitdiff[data-mode="inline"] .split { display: none; }742
.commitdiff[data-mode="side"] .unified { display: none; }743
.commitline, .half {744
display: grid; grid-template-columns: 3.2rem 3.2rem minmax(0, 1fr);745
font-family: var(--mono); font-size: 0.84rem; line-height: 1.45; min-width: 0;746
}747
.half { grid-template-columns: 3.2rem minmax(0, 1fr); }748
.commitline code, .half code {749
display: block; white-space: pre; overflow-x: auto; min-width: 0;750
padding: 0 0.7rem; font-family: inherit;751
}752
.commitline .ln, .half .ln { color: #8c959f; text-align: right; padding: 0 0.45rem; user-select: none; }753
.commitline.kind-add, .half.kind-add { background: #e6ffec; }754
.commitline.kind-del, .half.kind-del { background: #ffebe9; }755
.commitline.kind-hunk { grid-template-columns: minmax(0, 1fr); color: #8c959f; background: #f6f8fa; }756
.half.kind-empty { background: #f6f8fa; }757
.pair { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }758
.pair .half + .half { border-left: 1px solid var(--line); }759
.binaryhint { margin: 0; padding: 0.8rem 0.9rem; }760
a.btn { text-decoration: none; }761
.branchsearch { display: block; margin: 0 0 0.8rem; }762
.branchsearch input { width: min(100%, 24rem); }763
.branchtable { width: 100%; border-collapse: collapse; background: var(--card); }764
.branchtable th, .branchtable td {765
border-bottom: 1px solid var(--line); text-align: left; vertical-align: middle;766
padding: 0.45rem 0.7rem; height: 3rem;767
}768
.branchtable th { font-size: var(--fs-sm); color: var(--muted); font-weight: 650; }769
.branchtable .nums, .branchtable .addstat, .branchtable .delstat { font-variant-numeric: tabular-nums; white-space: nowrap; }770
.branchacts { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; min-height: 2.4rem; }771
.branchacts a { white-space: nowrap; }772
.branch-dialog {773
border: 0; border-radius: var(--radius-lg); padding: 1.2rem 1.3rem;774
max-width: 32rem; width: calc(100% - 2rem);775
}776
.branch-dialog::backdrop { background: rgba(8, 16, 32, 0.45); }777
.branch-dialog p { min-height: 1.5rem; }778
.mdbox { margin: 0 0 0.8rem; }779
.mdtabs { display: flex; min-height: 2.4rem; }780
.mdtabs button { background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 0; }781
.mdtabs button + button { border-left: 0; }782
.mdtabs button[aria-selected="true"] { background: var(--blue-soft); color: var(--blue-deep); }783
.mdbox [data-md-write] textarea,784
.mdbox [data-md-preview] {785
display: block; width: 100%; height: 9rem; min-height: 9rem; max-height: 9rem;786
overflow: auto; box-sizing: border-box; margin: 0;787
}788
.fieldlabel { margin: 0.6rem 0 0.3rem; }789
.timeline { list-style: none; margin: 0; padding: 0; }790
.timeline > li {791
border-left: 2px solid var(--line); margin: 0 0 0 0.4rem; padding: 0.35rem 0 0.8rem 0.9rem;792
min-height: 2.4rem;793
}794
.timeline .pushlist, .reply {795
background: var(--card); border: 1px solid var(--line); border-radius: var(--radius);796
padding: 0.45rem 0.7rem; margin: 0.35rem 0;797
}798
.commitline.with-gutter { grid-template-columns: 16px 3.2rem 3.2rem minmax(0, 1fr); }799
.commitline.with-gutter.kind-hunk { grid-template-columns: minmax(0, 1fr); }800
.commitline.picked { box-shadow: inset 3px 0 0 var(--blue); }801
tr[hidden] { display: none; }802
@media (max-width: 900px) {803
.commitlayout { grid-template-columns: minmax(0, 1fr); }804
.commitfiles { position: static; max-height: 16rem; }805
}639
@media (max-width: 800px) {806
@media (max-width: 800px) {640
.proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }807
.proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }641
.proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }808
.proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }@@ -8,7 +8,7 @@
8
8
var file = null;
9
9
10
10
function rowsOf(section) {
11
return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line]"));
11
return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line], .commitline[data-line]"));
12
12
}
13
13
function clearSel() {
14
14
root.querySelectorAll(".picked").forEach(function (el) {
@@ -65,8 +65,8 @@
65
65
if (ev.target.closest("form, button, input, textarea, a, label")) return;
66
66
var gutter = ev.target.closest(".gutter");
67
67
if (!gutter || gutter.classList.contains("off")) return;
68
var row = gutter.closest(".diffline");
69
file = gutter.closest(".difffile");
68
var row = gutter.closest(".diffline, .commitline");
69
file = gutter.closest(".difffile, .commitfile");
70
70
anchor = Number(row.getAttribute("data-line"));
71
71
dragging = true;
72
72
form.hidden = true;
@@ -78,8 +78,8 @@
78
78
if (!dragging || !file) return;
79
79
var el = document.elementFromPoint(ev.clientX, ev.clientY);
80
80
if (!el) return;
81
var row = el.closest(".diffline[data-line]");
82
if (!row || row.closest(".difffile") !== file) return;
81
var row = el.closest(".diffline[data-line], .commitline[data-line]");
82
if (!row || row.closest(".difffile, .commitfile") !== file) return;
83
83
selectFrom(file, anchor, Number(row.getAttribute("data-line")));
84
84
});
85
85
window.addEventListener("mouseup", function () {
@@ -8,7 +8,7 @@8
var file = null;8
var file = null;9
9
10
function rowsOf(section) {10
function rowsOf(section) {11
return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line]"));11
return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line], .commitline[data-line]"));12
}12
}13
function clearSel() {13
function clearSel() {14
root.querySelectorAll(".picked").forEach(function (el) {14
root.querySelectorAll(".picked").forEach(function (el) {@@ -65,8 +65,8 @@65
if (ev.target.closest("form, button, input, textarea, a, label")) return;65
if (ev.target.closest("form, button, input, textarea, a, label")) return;66
var gutter = ev.target.closest(".gutter");66
var gutter = ev.target.closest(".gutter");67
if (!gutter || gutter.classList.contains("off")) return;67
if (!gutter || gutter.classList.contains("off")) return;68
var row = gutter.closest(".diffline");68
var row = gutter.closest(".diffline, .commitline");69
file = gutter.closest(".difffile");69
file = gutter.closest(".difffile, .commitfile");70
anchor = Number(row.getAttribute("data-line"));70
anchor = Number(row.getAttribute("data-line"));71
dragging = true;71
dragging = true;72
form.hidden = true;72
form.hidden = true;@@ -78,8 +78,8 @@78
if (!dragging || !file) return;78
if (!dragging || !file) return;79
var el = document.elementFromPoint(ev.clientX, ev.clientY);79
var el = document.elementFromPoint(ev.clientX, ev.clientY);80
if (!el) return;80
if (!el) return;81
var row = el.closest(".diffline[data-line]");81
var row = el.closest(".diffline[data-line], .commitline[data-line]");82
if (!row || row.closest(".difffile") !== file) return;82
if (!row || row.closest(".difffile, .commitfile") !== file) return;83
selectFrom(file, anchor, Number(row.getAttribute("data-line")));83
selectFrom(file, anchor, Number(row.getAttribute("data-line")));84
});84
});85
window.addEventListener("mouseup", function () {85
window.addEventListener("mouseup", function () {@@ -1,6 +1,7 @@
1
1
package server
2
2
3
3
import (
4
"html/template"
4
5
"net/http"
5
6
"os"
6
7
"strconv"
@@ -9,18 +10,39 @@ import (
9
10
"gitlab.com/Timfa/bluegit/internal/access"
10
11
"gitlab.com/Timfa/bluegit/internal/gitrepo"
11
12
"gitlab.com/Timfa/bluegit/internal/i18n"
13
"gitlab.com/Timfa/bluegit/internal/markdown"
12
14
"gitlab.com/Timfa/bluegit/internal/store"
13
15
)
14
16
15
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
17
func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
16
18
rows := make([]NoteRow, len(notes))
19
index := map[int64]int{}
17
20
for i, n := range notes {
18
21
rows[i] = NoteRow{
19
22
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
20
23
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
21
When: i18n.FormatDate(lang, n.CreatedAt),
24
When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
25
HTML: template.HTML(markdown.Render(n.Body, "", "")),
26
}
27
index[n.ID] = i
28
}
29
for i := range rows {
30
parent := rows[i].ParentID
31
if parent == 0 {
32
continue
33
}
34
pi, ok := index[parent]
35
if !ok || rows[pi].ParentID != 0 {
36
rows[i].ParentID = 0
37
continue
22
38
}
39
rows[pi].Replies = append(rows[pi].Replies, rows[i])
23
40
}
41
return rows
42
}
43
44
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
45
rows := buildNoteRows(notes, lang)
24
46
placed := map[int64]bool{}
25
47
var views []DiffFileView
26
48
for _, f := range files {
@@ -29,6 +51,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)
29
51
row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
30
52
if ln.New > 0 {
31
53
for _, note := range rows {
54
if note.ParentID != 0 {
55
continue
56
}
32
57
if note.Path == f.Path && note.End == ln.New {
33
58
row.Notes = append(row.Notes, note)
34
59
placed[note.ID] = true
@@ -41,6 +66,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)
41
66
}
42
67
var general []NoteRow
43
68
for _, note := range rows {
69
if note.ParentID != 0 {
70
continue
71
}
44
72
if note.Path == "" || !placed[note.ID] {
45
73
general = append(general, note)
46
74
}
@@ -143,7 +171,6 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
143
171
s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
144
172
return
145
173
}
146
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
147
174
work, err := s.scratchDir("suggest")
148
175
if err != nil {
149
176
s.redirect(w, r, back, "", s.commitProblem(r, err))
@@ -151,11 +178,11 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
151
178
}
152
179
defer os.RemoveAll(work)
153
180
email := u.Username + "@users.git.timfalken.com"
154
if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
181
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
182
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns)
183
}); err != nil {
155
184
s.redirect(w, r, back, "", s.commitProblem(r, err))
156
185
return
157
186
}
158
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
159
s.AfterPush(repo, u, before, after)
160
187
s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
161
188
}
@@ -1,6 +1,7 @@1
package server1
package server2
2
3
import (3
import (4
"html/template"4
"net/http"5
"net/http"5
"os"6
"os"6
"strconv"7
"strconv"@@ -9,18 +10,39 @@ import (9
"gitlab.com/Timfa/bluegit/internal/access"10
"gitlab.com/Timfa/bluegit/internal/access"10
"gitlab.com/Timfa/bluegit/internal/gitrepo"11
"gitlab.com/Timfa/bluegit/internal/gitrepo"11
"gitlab.com/Timfa/bluegit/internal/i18n"12
"gitlab.com/Timfa/bluegit/internal/i18n"13
"gitlab.com/Timfa/bluegit/internal/markdown"12
"gitlab.com/Timfa/bluegit/internal/store"14
"gitlab.com/Timfa/bluegit/internal/store"13
)15
)14
16
15
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {17
func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {16
rows := make([]NoteRow, len(notes))18
rows := make([]NoteRow, len(notes))19
index := map[int64]int{}17
for i, n := range notes {20
for i, n := range notes {18
rows[i] = NoteRow{21
rows[i] = NoteRow{19
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,22
ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,20
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",23
Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",21
When: i18n.FormatDate(lang, n.CreatedAt),24
When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,25
HTML: template.HTML(markdown.Render(n.Body, "", "")),26
}27
index[n.ID] = i28
}29
for i := range rows {30
parent := rows[i].ParentID31
if parent == 0 {32
continue33
}34
pi, ok := index[parent]35
if !ok || rows[pi].ParentID != 0 {36
rows[i].ParentID = 037
continue22
}38
}39
rows[pi].Replies = append(rows[pi].Replies, rows[i])23
}40
}41
return rows42
}43
44
func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {45
rows := buildNoteRows(notes, lang)24
placed := map[int64]bool{}46
placed := map[int64]bool{}25
var views []DiffFileView47
var views []DiffFileView26
for _, f := range files {48
for _, f := range files {@@ -29,6 +51,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)29
row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}51
row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}30
if ln.New > 0 {52
if ln.New > 0 {31
for _, note := range rows {53
for _, note := range rows {54
if note.ParentID != 0 {55
continue56
}32
if note.Path == f.Path && note.End == ln.New {57
if note.Path == f.Path && note.End == ln.New {33
row.Notes = append(row.Notes, note)58
row.Notes = append(row.Notes, note)34
placed[note.ID] = true59
placed[note.ID] = true@@ -41,6 +66,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)41
}66
}42
var general []NoteRow67
var general []NoteRow43
for _, note := range rows {68
for _, note := range rows {69
if note.ParentID != 0 {70
continue71
}44
if note.Path == "" || !placed[note.ID] {72
if note.Path == "" || !placed[note.ID] {45
general = append(general, note)73
general = append(general, note)46
}74
}@@ -143,7 +171,6 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {143
s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))171
s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))144
return172
return145
}173
}146
before, _ := gitrepo.Refs(r.Context(), s.Git, dir)147
work, err := s.scratchDir("suggest")174
work, err := s.scratchDir("suggest")148
if err != nil {175
if err != nil {149
s.redirect(w, r, back, "", s.commitProblem(r, err))176
s.redirect(w, r, back, "", s.commitProblem(r, err))@@ -151,11 +178,11 @@ func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {151
}178
}152
defer os.RemoveAll(work)179
defer os.RemoveAll(work)153
email := u.Username + "@users.git.timfalken.com"180
email := u.Username + "@users.git.timfalken.com"154
if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {181
if err := s.postReceive(r.Context(), repo, u, dir, func() error {182
return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns)183
}); err != nil {155
s.redirect(w, r, back, "", s.commitProblem(r, err))184
s.redirect(w, r, back, "", s.commitProblem(r, err))156
return185
return157
}186
}158
after, _ := gitrepo.Refs(r.Context(), s.Git, dir)159
s.AfterPush(repo, u, before, after)160
s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")187
s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")161
}188
}@@ -81,7 +81,9 @@ func (s *Server) createTag(w http.ResponseWriter, r *http.Request) {
81
81
target = repo.DefaultBranch
82
82
}
83
83
email := u.Username + "@users.git.timfalken.com"
84
if err := gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email); err != nil {
84
if err := s.postReceive(r.Context(), repo, u, dir, func() error {
85
return gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email)
86
}); err != nil {
85
87
s.redirect(w, r, back, "", s.trErr(r, err))
86
88
return
87
89
}
@@ -81,7 +81,9 @@ func (s *Server) createTag(w http.ResponseWriter, r *http.Request) {81
target = repo.DefaultBranch81
target = repo.DefaultBranch82
}82
}83
email := u.Username + "@users.git.timfalken.com"83
email := u.Username + "@users.git.timfalken.com"84
if err := gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email); err != nil {84
if err := s.postReceive(r.Context(), repo, u, dir, func() error {85
return gitrepo.CreateTag(r.Context(), s.Git, dir, name, target, r.FormValue("message"), u.Username, email)86
}); err != nil {85
s.redirect(w, r, back, "", s.trErr(r, err))87
s.redirect(w, r, back, "", s.trErr(r, err))86
return88
return87
}89
}@@ -0,0 +1,109 @@
1
{{define "branches"}}
2
{{template "layout-start" .}}
3
<header class="pagehead">
4
<h1>{{t "title.branches"}}</h1>
5
{{if .CanWrite}}<button type="button" data-branch-open="create">{{t "branch.create"}}</button>{{end}}
6
</header>
7
<label class="branchsearch">{{t "branch.search"}}
8
<input type="search" data-branch-filter autocomplete="off" placeholder="{{t "branch.search"}}">
9
</label>
10
<table class="branchtable">
11
<thead>
12
<tr>
13
<th>{{t "branch.name"}}</th>
14
<th>{{t "branch.last"}}</th>
15
<th>{{t "branch.compare"}}</th>
16
<th>{{t "mr.pipeline"}}</th>
17
<th>{{t "mr.title"}}</th>
18
<th>{{t "branch.actions"}}</th>
19
</tr>
20
</thead>
21
<tbody>
22
{{range .Branches}}
23
<tr data-branch-row data-name="{{.Name}}">
24
<td>
25
<a href="/{{$.Repo.FullPath}}?rev={{urlquery .Name}}">{{.Name}}</a>
26
{{if .Default}}<span class="pill">{{t "branch.default"}}</span>{{end}}
27
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
28
</td>
29
<td>
30
{{if .SHA}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a> {{.Subject}} <span class="muted">{{.When}}</span>{{end}}
31
</td>
32
<td class="nums">
33
{{if and (eq .Ahead 0) (eq .Behind 0)}}<span class="muted">{{t "branch.even"}}</span>{{else}}
34
{{if .Ahead}}<span class="addstat">{{t "branch.ahead" .Ahead}}</span>{{end}}
35
{{if .Behind}}<span class="delstat">{{t "branch.behind" .Behind}}</span>{{end}}
36
{{end}}
37
</td>
38
<td>
39
{{if .PipeStatus}}<a class="status {{.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.PipeID}}"><span class="mark"></span>{{.PipeLabel}}</a>{{end}}
40
</td>
41
<td>
42
{{if .MRNumber}}<a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.MRNumber}}">!{{.MRNumber}}</a>{{end}}
43
</td>
44
<td class="branchacts">
45
{{if not .Default}}
46
<a href="/{{$.Repo.FullPath}}/-/compare?from={{urlquery $.Repo.DefaultBranch}}&to={{urlquery .Name}}">{{t "branch.compare"}}</a>
47
<a href="/{{$.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .Name}}&target={{urlquery $.Repo.DefaultBranch}}">{{t "branch.newMR"}}</a>
48
{{end}}
49
{{if and $.CanWrite (not .Default) (not .Protected)}}
50
<button type="button" class="ghost" data-rename="{{.Name}}">{{t "branch.rename"}}</button>
51
<button type="button" class="ghost" data-delete="{{.Name}}">{{t "branch.delete"}}</button>
52
{{end}}
53
</td>
54
</tr>
55
{{else}}
56
<tr><td colspan="6" class="muted">{{t "repo.noBranches"}}</td></tr>
57
{{end}}
58
</tbody>
59
</table>
60
{{if .CanWrite}}
61
<dialog class="branch-dialog" data-branch-dialog="create">
62
<form method="post" action="/{{.Repo.FullPath}}/-/branches">
63
<h2>{{t "branch.create"}}</h2>
64
<input type="hidden" name="csrf" value="{{.CSRF}}">
65
<label>{{t "branch.name"}} <input name="name" required autocomplete="off"></label>
66
<label>{{t "branch.from"}}
67
<input name="from" list="branch-revs" value="{{.Repo.DefaultBranch}}" required>
68
</label>
69
<datalist id="branch-revs">
70
{{range .Branches}}<option value="{{.Name}}"></option>{{end}}
71
{{range .Tags}}<option value="{{.Name}}"></option>{{end}}
72
</datalist>
73
<div class="row">
74
<button type="submit">{{t "branch.create"}}</button>
75
<button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
76
</div>
77
</form>
78
</dialog>
79
<dialog class="branch-dialog" data-branch-dialog="delete">
80
<form method="post" action="/{{.Repo.FullPath}}/-/branches/delete">
81
<h2>{{t "branch.delete"}}</h2>
82
<input type="hidden" name="csrf" value="{{.CSRF}}">
83
<input type="hidden" name="name" value="" data-delete-name>
84
<p data-delete-ask data-pattern="{{t "branch.deleteAsk" "%s"}}"></p>
85
<label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>
86
<div class="row">
87
<button type="submit">{{t "branch.delete"}}</button>
88
<button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
89
</div>
90
</form>
91
</dialog>
92
<dialog class="branch-dialog" data-branch-dialog="rename">
93
<form method="post" action="/{{.Repo.FullPath}}/-/branches/rename">
94
<h2>{{t "branch.rename"}}</h2>
95
<input type="hidden" name="csrf" value="{{.CSRF}}">
96
<input type="hidden" name="name" value="" data-rename-name>
97
<p data-rename-ask data-pattern="{{t "branch.renameAsk" "%s"}}"></p>
98
<label>{{t "branch.name"}} <input name="new_name" required autocomplete="off"></label>
99
<label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>
100
<div class="row">
101
<button type="submit">{{t "branch.rename"}}</button>
102
<button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
103
</div>
104
</form>
105
</dialog>
106
<script src="/assets/branch.js"></script>
107
{{end}}
108
{{template "layout-end" .}}
109
{{end}}
@@ -0,0 +1,109 @@1
{{define "branches"}}2
{{template "layout-start" .}}3
<header class="pagehead">4
<h1>{{t "title.branches"}}</h1>5
{{if .CanWrite}}<button type="button" data-branch-open="create">{{t "branch.create"}}</button>{{end}}6
</header>7
<label class="branchsearch">{{t "branch.search"}}8
<input type="search" data-branch-filter autocomplete="off" placeholder="{{t "branch.search"}}">9
</label>10
<table class="branchtable">11
<thead>12
<tr>13
<th>{{t "branch.name"}}</th>14
<th>{{t "branch.last"}}</th>15
<th>{{t "branch.compare"}}</th>16
<th>{{t "mr.pipeline"}}</th>17
<th>{{t "mr.title"}}</th>18
<th>{{t "branch.actions"}}</th>19
</tr>20
</thead>21
<tbody>22
{{range .Branches}}23
<tr data-branch-row data-name="{{.Name}}">24
<td>25
<a href="/{{$.Repo.FullPath}}?rev={{urlquery .Name}}">{{.Name}}</a>26
{{if .Default}}<span class="pill">{{t "branch.default"}}</span>{{end}}27
{{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}28
</td>29
<td>30
{{if .SHA}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a> {{.Subject}} <span class="muted">{{.When}}</span>{{end}}31
</td>32
<td class="nums">33
{{if and (eq .Ahead 0) (eq .Behind 0)}}<span class="muted">{{t "branch.even"}}</span>{{else}}34
{{if .Ahead}}<span class="addstat">{{t "branch.ahead" .Ahead}}</span>{{end}}35
{{if .Behind}}<span class="delstat">{{t "branch.behind" .Behind}}</span>{{end}}36
{{end}}37
</td>38
<td>39
{{if .PipeStatus}}<a class="status {{.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.PipeID}}"><span class="mark"></span>{{.PipeLabel}}</a>{{end}}40
</td>41
<td>42
{{if .MRNumber}}<a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.MRNumber}}">!{{.MRNumber}}</a>{{end}}43
</td>44
<td class="branchacts">45
{{if not .Default}}46
<a href="/{{$.Repo.FullPath}}/-/compare?from={{urlquery $.Repo.DefaultBranch}}&to={{urlquery .Name}}">{{t "branch.compare"}}</a>47
<a href="/{{$.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .Name}}&target={{urlquery $.Repo.DefaultBranch}}">{{t "branch.newMR"}}</a>48
{{end}}49
{{if and $.CanWrite (not .Default) (not .Protected)}}50
<button type="button" class="ghost" data-rename="{{.Name}}">{{t "branch.rename"}}</button>51
<button type="button" class="ghost" data-delete="{{.Name}}">{{t "branch.delete"}}</button>52
{{end}}53
</td>54
</tr>55
{{else}}56
<tr><td colspan="6" class="muted">{{t "repo.noBranches"}}</td></tr>57
{{end}}58
</tbody>59
</table>60
{{if .CanWrite}}61
<dialog class="branch-dialog" data-branch-dialog="create">62
<form method="post" action="/{{.Repo.FullPath}}/-/branches">63
<h2>{{t "branch.create"}}</h2>64
<input type="hidden" name="csrf" value="{{.CSRF}}">65
<label>{{t "branch.name"}} <input name="name" required autocomplete="off"></label>66
<label>{{t "branch.from"}}67
<input name="from" list="branch-revs" value="{{.Repo.DefaultBranch}}" required>68
</label>69
<datalist id="branch-revs">70
{{range .Branches}}<option value="{{.Name}}"></option>{{end}}71
{{range .Tags}}<option value="{{.Name}}"></option>{{end}}72
</datalist>73
<div class="row">74
<button type="submit">{{t "branch.create"}}</button>75
<button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>76
</div>77
</form>78
</dialog>79
<dialog class="branch-dialog" data-branch-dialog="delete">80
<form method="post" action="/{{.Repo.FullPath}}/-/branches/delete">81
<h2>{{t "branch.delete"}}</h2>82
<input type="hidden" name="csrf" value="{{.CSRF}}">83
<input type="hidden" name="name" value="" data-delete-name>84
<p data-delete-ask data-pattern="{{t "branch.deleteAsk" "%s"}}"></p>85
<label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>86
<div class="row">87
<button type="submit">{{t "branch.delete"}}</button>88
<button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>89
</div>90
</form>91
</dialog>92
<dialog class="branch-dialog" data-branch-dialog="rename">93
<form method="post" action="/{{.Repo.FullPath}}/-/branches/rename">94
<h2>{{t "branch.rename"}}</h2>95
<input type="hidden" name="csrf" value="{{.CSRF}}">96
<input type="hidden" name="name" value="" data-rename-name>97
<p data-rename-ask data-pattern="{{t "branch.renameAsk" "%s"}}"></p>98
<label>{{t "branch.name"}} <input name="new_name" required autocomplete="off"></label>99
<label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>100
<div class="row">101
<button type="submit">{{t "branch.rename"}}</button>102
<button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>103
</div>104
</form>105
</dialog>106
<script src="/assets/branch.js"></script>107
{{end}}108
{{template "layout-end" .}}109
{{end}}@@ -1,28 +1,22 @@
1
1
{{define "mrs"}}
2
2
{{template "layout-start" .}}
3
3
<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
4
{{if .CanWrite}}<p class="pageacts"><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new">{{t "mr.create"}}</a></p>{{end}}
4
5
<ul class="clean">
5
{{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
6
{{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span>{{if .Draft}} <span class="pill">{{t "mr.draft"}}</span>{{end}} <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
6
7
</ul>
7
{{if .CanWrite}}
8
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
9
<h2>{{t "mr.new"}}</h2>
10
<input type="hidden" name="csrf" value="{{.CSRF}}">
11
<label>{{t "mr.titleField"}} <input name="title" required></label>
12
<label>{{t "mr.description"}} <textarea name="description"></textarea></label>
13
<label>{{t "mr.source"}} <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
14
<label>{{t "mr.target"}} <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15
<button type="submit">{{t "action.open"}}</button>
16
</form>
17
{{end}}
18
8
{{template "layout-end" .}}
19
9
{{end}}
20
10
21
11
{{define "mr"}}
22
12
{{template "layout-start" .}}
23
13
<header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>
24
<p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>
25
{{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}
14
<p>
15
<span class="pill">{{.MR.Status}}</span>
16
{{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
17
{{range .Labels}}<span class="pill">{{.}}</span>{{end}}
18
{{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}
19
</p>
26
20
<h2>{{t "mr.pipeline"}}</h2>
27
21
{{if .MRPipe}}
28
22
{{$pipe := .MRPipe}}
@@ -32,11 +26,11 @@
32
26
<div class="stages">
33
27
{{range $pipe.Stages}}
34
28
<span class="stage">
35
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
36
<div class="stage-pop" hidden>
29
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
30
<div class="stage-pop" popover="manual">
37
31
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>
38
32
<ul>
39
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}
33
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
40
34
</ul>
41
35
</div>
42
36
</span>
@@ -44,8 +38,6 @@
44
38
</div>
45
39
</div>
46
40
{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
47
<h2>{{t "mr.commits"}}</h2>
48
<pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
49
41
{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
50
42
{{if .CanMerge}}
51
43
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
@@ -81,76 +73,107 @@
81
73
<button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
82
74
</form>
83
75
{{end}}
84
<h2>{{t "mr.changes"}}</h2>
85
{{if .CanApply}}
86
<div class="applybar" hidden data-apply-bar>
87
<button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
88
</div>
89
<dialog class="sugmodal" data-apply-dialog>
90
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
76
<p class="sub">
77
<a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>
78
<a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}</a>
79
<a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}</a>
80
<a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}</a>
81
</p>
82
<section{{if ne .Tab "overview"}} hidden{{end}}>
83
{{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}
84
{{if .CanEditMR}}
85
<details class="panel">
86
<summary>{{t "mr.edit"}}</summary>
87
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}">
88
<input type="hidden" name="csrf" value="{{.CSRF}}">
89
<label>{{t "mr.titleField"}} <input name="title" value="{{.MR.Title}}" required></label>
90
<label>{{t "mr.description"}} <textarea name="description">{{.MR.Description}}</textarea></label>
91
<label>{{t "mr.labels"}} <input name="labels" value="{{.MR.Labels}}"> <span class="muted">{{t "mr.labelsHint"}}</span></label>
92
<button type="submit">{{t "mr.save"}}</button>
93
</form>
94
</details>
95
{{end}}
96
<h2>{{t "mr.timeline"}}</h2>
97
<ol class="timeline">
98
{{range .Timeline}}
99
<li>
100
{{if .Actor}}<strong>{{.Actor}}</strong>{{end}}
101
{{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
102
<span class="muted">{{.When}}</span>
103
{{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
104
{{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
105
{{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
106
{{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button>{{end}}
107
</li>
108
{{end}}
109
</ol>
110
{{if .CanComment}}
111
<form id="comment-form" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
91
112
<input type="hidden" name="csrf" value="{{.CSRF}}">
92
<div data-apply-ids></div>
93
<h2>{{t "sug.applyWord"}}</h2>
94
<label>{{t "sug.title"}} <input name="title" required></label>
95
<label>{{t "sug.description"}} <textarea name="description"></textarea></label>
96
<p class="muted">{{t "sug.optional"}}</p>
97
<div class="row">
98
<button type="submit">{{t "sug.submit"}}</button>
99
<button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
100
</div>
113
<input type="hidden" name="parent" value="" data-reply-parent>
114
<p class="muted" hidden data-reply-label></p>
115
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
116
<button type="submit">{{t "action.post"}}</button>
101
117
</form>
102
</dialog>
103
{{end}}
104
<div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
105
{{range .DiffFiles}}
106
<section class="difffile" data-path="{{.Path}}">
107
<header>{{.Path}}</header>
108
{{range .Lines}}
109
<div class="diffline kind-{{.Kind}}"{{if .New}} data-line="{{.New}}"{{end}}>
110
<span class="gutter{{if not .New}} off{{end}}"></span>
111
<span class="ln">{{if .New}}{{.New}}{{else if .Old}}{{.Old}}{{end}}</span>
112
<code>{{.Text}}</code>
118
{{end}}
119
</section>
120
<section{{if ne .Tab "commits"}} hidden{{end}}>
121
<h2>{{t "mr.commits"}}</h2>
122
<ul class="clean">
123
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code> {{.Author}}</span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}
124
</ul>
125
</section>
126
<section{{if ne .Tab "pipelines"}} hidden{{end}}>
127
<h2>{{t "mr.pipelines"}}</h2>
128
{{if .PipeRows}}
129
<ul class="clean">
130
{{range .PipeRows}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span></li>{{end}}
131
</ul>
132
{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
133
</section>
134
<section{{if ne .Tab "changes"}} hidden{{end}}>
135
<h2>{{t "mr.changes"}}</h2>
136
{{if .CanApply}}
137
<div class="applybar" hidden data-apply-bar>
138
<button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
113
139
</div>
114
{{range .Notes}}
115
<article class="linenote" id="note-{{.ID}}">
116
<strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
117
<div class="muted">{{.Path}}:{{.Start}}-{{.End}}</div>
118
<pre class="note">{{.Body}}</pre>
119
{{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
120
</article>
140
<dialog class="sugmodal" data-apply-dialog>
141
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
142
<input type="hidden" name="csrf" value="{{.CSRF}}">
143
<div data-apply-ids></div>
144
<h2>{{t "sug.applyWord"}}</h2>
145
<label>{{t "sug.title"}} <input name="title" required></label>
146
<label>{{t "sug.description"}} <textarea name="description"></textarea></label>
147
<p class="muted">{{t "sug.optional"}}</p>
148
<div class="row">
149
<button type="submit">{{t "sug.submit"}}</button>
150
<button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
151
</div>
152
</form>
153
</dialog>
121
154
{{end}}
155
<div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
156
{{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
157
{{if .CanComment}}
158
<form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
159
<input type="hidden" name="csrf" value="{{.CSRF}}">
160
<input type="hidden" name="path" value="">
161
<input type="hidden" name="line_start" value="">
162
<input type="hidden" name="line_end" value="">
163
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
164
<p class="muted">{{t "sug.hint"}}</p>
165
<div class="row">
166
<button type="submit">{{t "action.post"}}</button>
167
<button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
168
</div>
169
</form>
170
<button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
122
171
{{end}}
123
</section>
124
{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
125
{{if .CanComment}}
126
<form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
127
<input type="hidden" name="csrf" value="{{.CSRF}}">
128
<input type="hidden" name="path" value="">
129
<input type="hidden" name="line_start" value="">
130
<input type="hidden" name="line_end" value="">
131
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
132
<p class="muted">{{t "sug.hint"}}</p>
133
<div class="row">
134
<button type="submit">{{t "action.post"}}</button>
135
<button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
136
172
</div>
137
</form>
138
<button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
139
{{end}}
140
</div>
141
<h2>{{t "mr.comments"}}</h2>
142
<ul class="clean">
143
{{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>{{if .Path}} <span class="muted">{{.Path}}:{{.Start}}-{{.End}}</span>{{end}}<pre class="note">{{.Body}}</pre></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
144
</ul>
145
{{if .CanComment}}
146
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
147
<input type="hidden" name="csrf" value="{{.CSRF}}">
148
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
149
<button type="submit">{{t "action.post"}}</button>
150
</form>
151
{{end}}
173
</section>
152
174
<script src="/assets/suggest.js"></script>
153
175
<script src="/assets/pipeline.js"></script>
176
<script src="/assets/mr.js"></script>
154
177
{{template "layout-end" .}}
155
178
{{end}}
156
179
@@ -185,45 +208,12 @@
185
208
<button type="submit">{{t "action.start"}}</button>
186
209
</form>
187
210
{{end}}
188
<div class="hscroll">
211
<div class="hscroll"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
189
212
<table class="pipes">
190
213
<thead><tr><th>{{t "pipe.col.status"}}</th><th>{{t "pipe.col.pipeline"}}</th><th>{{t "pipe.col.by"}}</th><th>{{t "pipe.col.stages"}}</th></tr></thead>
191
214
<tbody>
192
{{range .PipeRows}}
193
{{$pipe := .}}
194
<tr>
195
<td>
196
<span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span>
197
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> {{.Duration}}</div>
198
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> {{.When}}</div>
199
</td>
200
<td>
201
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>
202
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}
203
<div class="chips">
204
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
205
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
206
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
207
</div>
208
</td>
209
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
210
<td>
211
<div class="stages">
212
{{range .Stages}}
213
<span class="stage">
214
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
215
<div class="stage-pop" hidden>
216
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>
217
<ul>
218
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}
219
</ul>
220
</div>
221
</span>
222
{{end}}
223
</div>
224
</td>
225
</tr>
226
{{else}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}
215
{{template "pipe-rows" .}}
216
{{if not .PipeRows}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}
227
217
</tbody>
228
218
</table>
229
219
</div>
@@ -236,21 +226,60 @@
236
226
{{template "layout-start" .}}
237
227
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>
238
228
{{template "pipenav" .}}
239
<p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>
229
<p><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>
240
230
<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>
241
<ul class="clean">
242
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Stage}}</span></li>{{end}}
231
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
232
{{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}
243
233
</ul>
234
<script src="/assets/pipeline.js"></script>
244
235
{{template "layout-end" .}}
245
236
{{end}}
246
237
238
{{define "pipe-rows"}}
239
{{range .PipeRows}}
240
{{$pipe := .}}
241
<tr data-pipe="{{.ID}}">
242
<td>
243
<span class="status {{.Status}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.Label}}</span></span>
244
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> <span data-pipe-duration>{{.Duration}}</span></div>
245
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> <span data-pipe-when>{{.When}}</span></div>
246
</td>
247
<td>
248
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>
249
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}
250
<div class="chips">
251
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
252
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
253
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
254
</div>
255
</td>
256
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
257
<td>
258
<div class="stages">
259
{{range .Stages}}
260
<span class="stage">
261
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
262
<div class="stage-pop" popover="manual">
263
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>
264
<ul>
265
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
266
</ul>
267
</div>
268
</span>
269
{{end}}
270
</div>
271
</td>
272
</tr>
273
{{end}}
274
{{end}}
275
247
276
{{define "job"}}
248
277
{{template "layout-start" .}}
249
278
<header class="pagehead"><h1>{{with .JobPage}}{{.Name}}{{end}}</h1></header>
250
279
{{template "pipenav" $}}
251
280
{{with .JobPage}}
252
281
{{$page := .}}
253
<p class="jobhead"><span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span> <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>
282
<p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>
254
283
<div class="joblayout">
255
284
<section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">
256
285
<div class="conbar">
@@ -262,7 +291,7 @@
262
291
<button type="button" class="ghost" data-log-prev aria-label="{{t "pipe.prev"}}">↑</button>
263
292
<button type="button" class="ghost" data-log-next aria-label="{{t "pipe.next"}}">↓</button>
264
293
<a class="ghost" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log?raw=1">{{t "pipe.raw"}}</a>
265
<button type="button" class="ghost" data-log-wrap>{{t "pipe.wrap"}}</button>
294
<button type="button" class="ghost" data-log-wrap aria-pressed="true">{{t "pipe.wrap"}}</button>
266
295
<button type="button" class="ghost" data-log-top>{{t "pipe.top"}}</button>
267
296
<button type="button" class="ghost" data-log-bottom>{{t "pipe.bottom"}}</button>
268
297
<button type="button" class="ghost" data-log-full>{{t "pipe.full"}}</button>
@@ -301,7 +330,7 @@
301
330
</label>
302
331
<h2>{{t "pipe.related"}}</h2>
303
332
<ul class="related">
304
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}
333
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
305
334
</ul>
306
335
{{if .CanPlay}}
307
336
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">
@@ -1,28 +1,22 @@1
{{define "mrs"}}1
{{define "mrs"}}2
{{template "layout-start" .}}2
{{template "layout-start" .}}3
<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>3
<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>4
{{if .CanWrite}}<p class="pageacts"><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new">{{t "mr.create"}}</a></p>{{end}}4
<ul class="clean">5
<ul class="clean">5
{{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}6
{{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span>{{if .Draft}} <span class="pill">{{t "mr.draft"}}</span>{{end}} <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}6
</ul>7
</ul>7
{{if .CanWrite}}8
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">9
<h2>{{t "mr.new"}}</h2>10
<input type="hidden" name="csrf" value="{{.CSRF}}">11
<label>{{t "mr.titleField"}} <input name="title" required></label>12
<label>{{t "mr.description"}} <textarea name="description"></textarea></label>13
<label>{{t "mr.source"}} <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>14
<label>{{t "mr.target"}} <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>15
<button type="submit">{{t "action.open"}}</button>16
</form>17
{{end}}18
{{template "layout-end" .}}8
{{template "layout-end" .}}19
{{end}}9
{{end}}20
10
21
{{define "mr"}}11
{{define "mr"}}22
{{template "layout-start" .}}12
{{template "layout-start" .}}23
<header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>13
<header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>24
<p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>14
<p>25
{{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}15
<span class="pill">{{.MR.Status}}</span>16
{{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}17
{{range .Labels}}<span class="pill">{{.}}</span>{{end}}18
{{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}19
</p>26
<h2>{{t "mr.pipeline"}}</h2>20
<h2>{{t "mr.pipeline"}}</h2>27
{{if .MRPipe}}21
{{if .MRPipe}}28
{{$pipe := .MRPipe}}22
{{$pipe := .MRPipe}}@@ -32,11 +26,11 @@32
<div class="stages">26
<div class="stages">33
{{range $pipe.Stages}}27
{{range $pipe.Stages}}34
<span class="stage">28
<span class="stage">35
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>29
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>36
<div class="stage-pop" hidden>30
<div class="stage-pop" popover="manual">37
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>31
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>38
<ul>32
<ul>39
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}33
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}40
</ul>34
</ul>41
</div>35
</div>42
</span>36
</span>@@ -44,8 +38,6 @@44
</div>38
</div>45
</div>39
</div>46
{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}40
{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}47
<h2>{{t "mr.commits"}}</h2>48
<pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>49
{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}41
{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}50
{{if .CanMerge}}42
{{if .CanMerge}}51
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">43
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">@@ -81,76 +73,107 @@81
<button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>73
<button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>82
</form>74
</form>83
{{end}}75
{{end}}84
<h2>{{t "mr.changes"}}</h2>76
<p class="sub">85
{{if .CanApply}}77
<a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>86
<div class="applybar" hidden data-apply-bar>78
<a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}</a>87
<button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>79
<a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}</a>88
</div>80
<a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}</a>89
<dialog class="sugmodal" data-apply-dialog>81
</p>90
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">82
<section{{if ne .Tab "overview"}} hidden{{end}}>83
{{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}84
{{if .CanEditMR}}85
<details class="panel">86
<summary>{{t "mr.edit"}}</summary>87
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}">88
<input type="hidden" name="csrf" value="{{.CSRF}}">89
<label>{{t "mr.titleField"}} <input name="title" value="{{.MR.Title}}" required></label>90
<label>{{t "mr.description"}} <textarea name="description">{{.MR.Description}}</textarea></label>91
<label>{{t "mr.labels"}} <input name="labels" value="{{.MR.Labels}}"> <span class="muted">{{t "mr.labelsHint"}}</span></label>92
<button type="submit">{{t "mr.save"}}</button>93
</form>94
</details>95
{{end}}96
<h2>{{t "mr.timeline"}}</h2>97
<ol class="timeline">98
{{range .Timeline}}99
<li>100
{{if .Actor}}<strong>{{.Actor}}</strong>{{end}}101
{{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}102
<span class="muted">{{.When}}</span>103
{{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}104
{{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}105
{{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}106
{{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button>{{end}}107
</li>108
{{end}}109
</ol>110
{{if .CanComment}}111
<form id="comment-form" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">91
<input type="hidden" name="csrf" value="{{.CSRF}}">112
<input type="hidden" name="csrf" value="{{.CSRF}}">92
<div data-apply-ids></div>113
<input type="hidden" name="parent" value="" data-reply-parent>93
<h2>{{t "sug.applyWord"}}</h2>114
<p class="muted" hidden data-reply-label></p>94
<label>{{t "sug.title"}} <input name="title" required></label>115
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>95
<label>{{t "sug.description"}} <textarea name="description"></textarea></label>116
<button type="submit">{{t "action.post"}}</button>96
<p class="muted">{{t "sug.optional"}}</p>97
<div class="row">98
<button type="submit">{{t "sug.submit"}}</button>99
<button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>100
</div>101
</form>117
</form>102
</dialog>118
{{end}}103
{{end}}119
</section>104
<div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>120
<section{{if ne .Tab "commits"}} hidden{{end}}>105
{{range .DiffFiles}}121
<h2>{{t "mr.commits"}}</h2>106
<section class="difffile" data-path="{{.Path}}">122
<ul class="clean">107
<header>{{.Path}}</header>123
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code> {{.Author}}</span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}108
{{range .Lines}}124
</ul>109
<div class="diffline kind-{{.Kind}}"{{if .New}} data-line="{{.New}}"{{end}}>125
</section>110
<span class="gutter{{if not .New}} off{{end}}"></span>126
<section{{if ne .Tab "pipelines"}} hidden{{end}}>111
<span class="ln">{{if .New}}{{.New}}{{else if .Old}}{{.Old}}{{end}}</span>127
<h2>{{t "mr.pipelines"}}</h2>112
<code>{{.Text}}</code>128
{{if .PipeRows}}129
<ul class="clean">130
{{range .PipeRows}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span></li>{{end}}131
</ul>132
{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}133
</section>134
<section{{if ne .Tab "changes"}} hidden{{end}}>135
<h2>{{t "mr.changes"}}</h2>136
{{if .CanApply}}137
<div class="applybar" hidden data-apply-bar>138
<button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>113
</div>139
</div>114
{{range .Notes}}140
<dialog class="sugmodal" data-apply-dialog>115
<article class="linenote" id="note-{{.ID}}">141
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">116
<strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>142
<input type="hidden" name="csrf" value="{{.CSRF}}">117
<div class="muted">{{.Path}}:{{.Start}}-{{.End}}</div>143
<div data-apply-ids></div>118
<pre class="note">{{.Body}}</pre>144
<h2>{{t "sug.applyWord"}}</h2>119
{{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}145
<label>{{t "sug.title"}} <input name="title" required></label>120
</article>146
<label>{{t "sug.description"}} <textarea name="description"></textarea></label>147
<p class="muted">{{t "sug.optional"}}</p>148
<div class="row">149
<button type="submit">{{t "sug.submit"}}</button>150
<button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>151
</div>152
</form>153
</dialog>121
{{end}}154
{{end}}155
<div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>156
{{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}157
{{if .CanComment}}158
<form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>159
<input type="hidden" name="csrf" value="{{.CSRF}}">160
<input type="hidden" name="path" value="">161
<input type="hidden" name="line_start" value="">162
<input type="hidden" name="line_end" value="">163
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>164
<p class="muted">{{t "sug.hint"}}</p>165
<div class="row">166
<button type="submit">{{t "action.post"}}</button>167
<button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>168
</div>169
</form>170
<button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>122
{{end}}171
{{end}}123
</section>124
{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}125
{{if .CanComment}}126
<form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>127
<input type="hidden" name="csrf" value="{{.CSRF}}">128
<input type="hidden" name="path" value="">129
<input type="hidden" name="line_start" value="">130
<input type="hidden" name="line_end" value="">131
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>132
<p class="muted">{{t "sug.hint"}}</p>133
<div class="row">134
<button type="submit">{{t "action.post"}}</button>135
<button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>136
</div>172
</div>137
</form>173
</section>138
<button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>139
{{end}}140
</div>141
<h2>{{t "mr.comments"}}</h2>142
<ul class="clean">143
{{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>{{if .Path}} <span class="muted">{{.Path}}:{{.Start}}-{{.End}}</span>{{end}}<pre class="note">{{.Body}}</pre></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}144
</ul>145
{{if .CanComment}}146
<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">147
<input type="hidden" name="csrf" value="{{.CSRF}}">148
<label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>149
<button type="submit">{{t "action.post"}}</button>150
</form>151
{{end}}152
<script src="/assets/suggest.js"></script>174
<script src="/assets/suggest.js"></script>153
<script src="/assets/pipeline.js"></script>175
<script src="/assets/pipeline.js"></script>176
<script src="/assets/mr.js"></script>154
{{template "layout-end" .}}177
{{template "layout-end" .}}155
{{end}}178
{{end}}156
179
@@ -185,45 +208,12 @@185
<button type="submit">{{t "action.start"}}</button>208
<button type="submit">{{t "action.start"}}</button>186
</form>209
</form>187
{{end}}210
{{end}}188
<div class="hscroll">211
<div class="hscroll"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>189
<table class="pipes">212
<table class="pipes">190
<thead><tr><th>{{t "pipe.col.status"}}</th><th>{{t "pipe.col.pipeline"}}</th><th>{{t "pipe.col.by"}}</th><th>{{t "pipe.col.stages"}}</th></tr></thead>213
<thead><tr><th>{{t "pipe.col.status"}}</th><th>{{t "pipe.col.pipeline"}}</th><th>{{t "pipe.col.by"}}</th><th>{{t "pipe.col.stages"}}</th></tr></thead>191
<tbody>214
<tbody>192
{{range .PipeRows}}215
{{template "pipe-rows" .}}193
{{$pipe := .}}216
{{if not .PipeRows}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}194
<tr>195
<td>196
<span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span>197
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> {{.Duration}}</div>198
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> {{.When}}</div>199
</td>200
<td>201
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>202
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}203
<div class="chips">204
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}205
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}206
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}207
</div>208
</td>209
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>210
<td>211
<div class="stages">212
{{range .Stages}}213
<span class="stage">214
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>215
<div class="stage-pop" hidden>216
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>217
<ul>218
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}219
</ul>220
</div>221
</span>222
{{end}}223
</div>224
</td>225
</tr>226
{{else}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}227
</tbody>217
</tbody>228
</table>218
</table>229
</div>219
</div>@@ -236,21 +226,60 @@236
{{template "layout-start" .}}226
{{template "layout-start" .}}237
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>227
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>238
{{template "pipenav" .}}228
{{template "pipenav" .}}239
<p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>229
<p><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>240
<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>230
<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>241
<ul class="clean">231
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>242
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Stage}}</span></li>{{end}}232
{{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}243
</ul>233
</ul>234
<script src="/assets/pipeline.js"></script>244
{{template "layout-end" .}}235
{{template "layout-end" .}}245
{{end}}236
{{end}}246
237
238
{{define "pipe-rows"}}239
{{range .PipeRows}}240
{{$pipe := .}}241
<tr data-pipe="{{.ID}}">242
<td>243
<span class="status {{.Status}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.Label}}</span></span>244
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> <span data-pipe-duration>{{.Duration}}</span></div>245
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> <span data-pipe-when>{{.When}}</span></div>246
</td>247
<td>248
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>249
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}250
<div class="chips">251
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}252
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}253
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}254
</div>255
</td>256
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>257
<td>258
<div class="stages">259
{{range .Stages}}260
<span class="stage">261
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>262
<div class="stage-pop" popover="manual">263
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>264
<ul>265
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}266
</ul>267
</div>268
</span>269
{{end}}270
</div>271
</td>272
</tr>273
{{end}}274
{{end}}275
247
{{define "job"}}276
{{define "job"}}248
{{template "layout-start" .}}277
{{template "layout-start" .}}249
<header class="pagehead"><h1>{{with .JobPage}}{{.Name}}{{end}}</h1></header>278
<header class="pagehead"><h1>{{with .JobPage}}{{.Name}}{{end}}</h1></header>250
{{template "pipenav" $}}279
{{template "pipenav" $}}251
{{with .JobPage}}280
{{with .JobPage}}252
{{$page := .}}281
{{$page := .}}253
<p class="jobhead"><span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span> <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>282
<p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>254
<div class="joblayout">283
<div class="joblayout">255
<section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">284
<section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">256
<div class="conbar">285
<div class="conbar">@@ -262,7 +291,7 @@262
<button type="button" class="ghost" data-log-prev aria-label="{{t "pipe.prev"}}">↑</button>291
<button type="button" class="ghost" data-log-prev aria-label="{{t "pipe.prev"}}">↑</button>263
<button type="button" class="ghost" data-log-next aria-label="{{t "pipe.next"}}">↓</button>292
<button type="button" class="ghost" data-log-next aria-label="{{t "pipe.next"}}">↓</button>264
<a class="ghost" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log?raw=1">{{t "pipe.raw"}}</a>293
<a class="ghost" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log?raw=1">{{t "pipe.raw"}}</a>265
<button type="button" class="ghost" data-log-wrap>{{t "pipe.wrap"}}</button>294
<button type="button" class="ghost" data-log-wrap aria-pressed="true">{{t "pipe.wrap"}}</button>266
<button type="button" class="ghost" data-log-top>{{t "pipe.top"}}</button>295
<button type="button" class="ghost" data-log-top>{{t "pipe.top"}}</button>267
<button type="button" class="ghost" data-log-bottom>{{t "pipe.bottom"}}</button>296
<button type="button" class="ghost" data-log-bottom>{{t "pipe.bottom"}}</button>268
<button type="button" class="ghost" data-log-full>{{t "pipe.full"}}</button>297
<button type="button" class="ghost" data-log-full>{{t "pipe.full"}}</button>@@ -301,7 +330,7 @@301
</label>330
</label>302
<h2>{{t "pipe.related"}}</h2>331
<h2>{{t "pipe.related"}}</h2>303
<ul class="related">332
<ul class="related">304
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}333
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}305
</ul>334
</ul>306
{{if .CanPlay}}335
{{if .CanPlay}}307
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">336
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">@@ -0,0 +1,118 @@
1
{{define "commit"}}
2
{{template "layout-start" .}}
3
<article class="commitpage">
4
<header class="commithead"><h1>{{.Commit.Subject}}</h1></header>
5
{{if .Commit.Body}}<pre class="commitmsg">{{.Commit.Body}}</pre>{{end}}
6
<section class="card commitmeta">
7
<div class="projhead">
8
{{template "avatar" .Commit}}
9
<div>
10
<p>{{template "commitwho" .Commit}}</p>
11
<p class="muted">{{t "commit.authored"}} {{.Commit.Date}}{{if .Commit.When}} · {{.Commit.When}}{{end}}</p>
12
</div>
13
</div>
14
<dl class="commitfacts">
15
<div>
16
<dt>{{t "commit.sha"}}</dt>
17
<dd><code class="sha">{{.Commit.SHA}}</code> <button type="button" class="iconbtn" data-copy="{{.Commit.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button></dd>
18
</div>
19
{{if .CommitDiff.Parents}}
20
<div>
21
<dt>{{if eq (len .CommitDiff.Parents) 1}}{{t "commit.parent"}}{{else}}{{t "commit.parents"}}{{end}}</dt>
22
<dd class="parents">{{range .CommitDiff.Parents}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a>{{end}}</dd>
23
</div>
24
{{end}}
25
{{if .Commit.PipeStatus}}
26
<div>
27
<dt>{{t "pipe.one"}}</dt>
28
<dd><a class="status {{.Commit.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Commit.PipeID}}"><span class="mark"></span>{{.Commit.PipeLabel}}</a></dd>
29
</div>
30
{{end}}
31
</dl>
32
</section>
33
{{if not .CommitDiff.Files}}
34
<p class="muted">{{t "commit.empty"}}</p>
35
{{else}}
36
{{template "repodiff" .}}
37
{{end}}
38
</article>
39
<script src="/assets/repo.js"></script>
40
{{template "layout-end" .}}
41
{{end}}
42
43
{{define "repodiff"}}
44
<div class="commitdiff" id="commitdiff" data-commit-diff data-mode="inline">
45
<script src="/assets/commit-mode.js"></script>
46
<div class="commitbar diffbar">
47
<div class="grow">
48
<strong>{{tn .CommitDiff.FilesN "commit.file.one" "commit.file.many"}}</strong>
49
<span class="addstat">+{{.CommitDiff.Added}}</span>
50
<span class="delstat">−{{.CommitDiff.Deleted}}</span>
51
</div>
52
<div class="diffswitch" role="group" aria-label="{{t "commit.view"}}">
53
<button type="button" data-diff-mode="inline" aria-pressed="true">{{t "commit.inline"}}</button>
54
<button type="button" data-diff-mode="side" aria-pressed="false">{{t "commit.side"}}</button>
55
</div>
56
</div>
57
<div class="commitlayout">
58
<nav class="commitfiles" aria-label="{{t "commit.changed"}}">
59
<h2>{{t "commit.changed"}}</h2>
60
<ul>
61
{{range .CommitDiff.Tree}}
62
<li class="d{{.Depth}}">
63
{{if .Dir}}{{template "ficon" .Icon}}<span>{{.Name}}</span>{{else}}<a href="#{{.Anchor}}" data-diff-link="{{.Anchor}}">{{template "ficon" .Icon}}<span class="name">{{.Name}}</span></a> <span class="addstat">+{{.Added}}</span><span class="delstat">−{{.Deleted}}</span>{{end}}
64
</li>
65
{{end}}
66
</ul>
67
</nav>
68
<div class="commitdiffs">
69
{{range .CommitDiff.Files}}
70
<section class="commitfile" id="{{.Anchor}}" data-path="{{.Path}}" data-collapsed="{{if .Collapsed}}1{{else}}0{{end}}">
71
<header>
72
{{if .HasBody}}<button type="button" class="ghost" data-toggle-diff data-show="{{t "commit.show"}}" data-hide="{{t "commit.hide"}}" aria-expanded="{{if .Collapsed}}false{{else}}true{{end}}">{{if .Collapsed}}{{t "commit.show"}}{{else}}{{t "commit.hide"}}{{end}}</button>{{end}}
73
<span class="path">{{if .OldPath}}<span class="oldpath">{{.OldPath}}</span> <span aria-hidden="true">→</span> {{end}}{{if .FileURL}}<a href="{{.FileURL}}">{{.Path}}</a>{{else}}{{.Path}}{{end}}</span>
74
{{if eq .Status "added"}}<span class="pill">{{t "commit.added"}}</span>{{else if eq .Status "deleted"}}<span class="pill">{{t "commit.deleted"}}</span>{{else if eq .Status "renamed"}}<span class="pill">{{t "commit.renamed"}}</span>{{end}}
75
{{if .Binary}}<span class="pill">{{t "commit.binary"}}</span>{{end}}
76
<span class="counts"><span class="addstat">+{{.Added}}</span> <span class="delstat">−{{.Deleted}}</span></span>
77
</header>
78
{{if .HasBody}}
79
<div class="diffbody">
80
{{if .Binary}}<p class="muted binaryhint">{{t "commit.binaryHint"}}</p>{{else}}
81
<div class="unified">
82
{{range .Lines}}
83
<div class="commitline kind-{{.Kind}}{{if and $.CanComment (ne .Kind "hunk")}} with-gutter{{end}}"{{if and $.CanComment .New}} data-line="{{.New}}"{{end}}>
84
{{if and $.CanComment (ne .Kind "hunk")}}<span class="gutter{{if not .New}} off{{end}}"></span>{{end}}
85
<span class="ln">{{if .Old}}{{.Old}}{{end}}</span>
86
<span class="ln">{{if .New}}{{.New}}{{end}}</span>
87
<code>{{.HTML}}</code>
88
</div>
89
{{if $.CanComment}}{{range .Notes}}
90
<article class="linenote" id="note-{{.ID}}">
91
<strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
92
<div class="mdbody">{{.HTML}}</div>
93
{{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
94
{{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
95
</article>
96
{{end}}{{end}}
97
{{end}}
98
</div>
99
<div class="split">
100
{{range .Pairs}}
101
{{if .Hunk}}<div class="commitline kind-hunk"><code>{{.Hunk}}</code></div>{{else}}
102
<div class="pair">
103
<div class="half kind-{{if .LKind}}{{.LKind}}{{else}}empty{{end}}"><span class="ln">{{if .LNo}}{{.LNo}}{{end}}</span><code>{{.LHTML}}</code></div>
104
<div class="half kind-{{if .RKind}}{{.RKind}}{{else}}empty{{end}}"><span class="ln">{{if .RNo}}{{.RNo}}{{end}}</span><code>{{.RHTML}}</code></div>
105
</div>
106
{{end}}
107
{{end}}
108
</div>
109
{{end}}
110
</div>
111
{{end}}
112
</section>
113
{{end}}
114
</div>
115
</div>
116
</div>
117
<script src="/assets/commit.js"></script>
118
{{end}}
@@ -0,0 +1,118 @@1
{{define "commit"}}2
{{template "layout-start" .}}3
<article class="commitpage">4
<header class="commithead"><h1>{{.Commit.Subject}}</h1></header>5
{{if .Commit.Body}}<pre class="commitmsg">{{.Commit.Body}}</pre>{{end}}6
<section class="card commitmeta">7
<div class="projhead">8
{{template "avatar" .Commit}}9
<div>10
<p>{{template "commitwho" .Commit}}</p>11
<p class="muted">{{t "commit.authored"}} {{.Commit.Date}}{{if .Commit.When}} · {{.Commit.When}}{{end}}</p>12
</div>13
</div>14
<dl class="commitfacts">15
<div>16
<dt>{{t "commit.sha"}}</dt>17
<dd><code class="sha">{{.Commit.SHA}}</code> <button type="button" class="iconbtn" data-copy="{{.Commit.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button></dd>18
</div>19
{{if .CommitDiff.Parents}}20
<div>21
<dt>{{if eq (len .CommitDiff.Parents) 1}}{{t "commit.parent"}}{{else}}{{t "commit.parents"}}{{end}}</dt>22
<dd class="parents">{{range .CommitDiff.Parents}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a>{{end}}</dd>23
</div>24
{{end}}25
{{if .Commit.PipeStatus}}26
<div>27
<dt>{{t "pipe.one"}}</dt>28
<dd><a class="status {{.Commit.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Commit.PipeID}}"><span class="mark"></span>{{.Commit.PipeLabel}}</a></dd>29
</div>30
{{end}}31
</dl>32
</section>33
{{if not .CommitDiff.Files}}34
<p class="muted">{{t "commit.empty"}}</p>35
{{else}}36
{{template "repodiff" .}}37
{{end}}38
</article>39
<script src="/assets/repo.js"></script>40
{{template "layout-end" .}}41
{{end}}42
43
{{define "repodiff"}}44
<div class="commitdiff" id="commitdiff" data-commit-diff data-mode="inline">45
<script src="/assets/commit-mode.js"></script>46
<div class="commitbar diffbar">47
<div class="grow">48
<strong>{{tn .CommitDiff.FilesN "commit.file.one" "commit.file.many"}}</strong>49
<span class="addstat">+{{.CommitDiff.Added}}</span>50
<span class="delstat">−{{.CommitDiff.Deleted}}</span>51
</div>52
<div class="diffswitch" role="group" aria-label="{{t "commit.view"}}">53
<button type="button" data-diff-mode="inline" aria-pressed="true">{{t "commit.inline"}}</button>54
<button type="button" data-diff-mode="side" aria-pressed="false">{{t "commit.side"}}</button>55
</div>56
</div>57
<div class="commitlayout">58
<nav class="commitfiles" aria-label="{{t "commit.changed"}}">59
<h2>{{t "commit.changed"}}</h2>60
<ul>61
{{range .CommitDiff.Tree}}62
<li class="d{{.Depth}}">63
{{if .Dir}}{{template "ficon" .Icon}}<span>{{.Name}}</span>{{else}}<a href="#{{.Anchor}}" data-diff-link="{{.Anchor}}">{{template "ficon" .Icon}}<span class="name">{{.Name}}</span></a> <span class="addstat">+{{.Added}}</span><span class="delstat">−{{.Deleted}}</span>{{end}}64
</li>65
{{end}}66
</ul>67
</nav>68
<div class="commitdiffs">69
{{range .CommitDiff.Files}}70
<section class="commitfile" id="{{.Anchor}}" data-path="{{.Path}}" data-collapsed="{{if .Collapsed}}1{{else}}0{{end}}">71
<header>72
{{if .HasBody}}<button type="button" class="ghost" data-toggle-diff data-show="{{t "commit.show"}}" data-hide="{{t "commit.hide"}}" aria-expanded="{{if .Collapsed}}false{{else}}true{{end}}">{{if .Collapsed}}{{t "commit.show"}}{{else}}{{t "commit.hide"}}{{end}}</button>{{end}}73
<span class="path">{{if .OldPath}}<span class="oldpath">{{.OldPath}}</span> <span aria-hidden="true">→</span> {{end}}{{if .FileURL}}<a href="{{.FileURL}}">{{.Path}}</a>{{else}}{{.Path}}{{end}}</span>74
{{if eq .Status "added"}}<span class="pill">{{t "commit.added"}}</span>{{else if eq .Status "deleted"}}<span class="pill">{{t "commit.deleted"}}</span>{{else if eq .Status "renamed"}}<span class="pill">{{t "commit.renamed"}}</span>{{end}}75
{{if .Binary}}<span class="pill">{{t "commit.binary"}}</span>{{end}}76
<span class="counts"><span class="addstat">+{{.Added}}</span> <span class="delstat">−{{.Deleted}}</span></span>77
</header>78
{{if .HasBody}}79
<div class="diffbody">80
{{if .Binary}}<p class="muted binaryhint">{{t "commit.binaryHint"}}</p>{{else}}81
<div class="unified">82
{{range .Lines}}83
<div class="commitline kind-{{.Kind}}{{if and $.CanComment (ne .Kind "hunk")}} with-gutter{{end}}"{{if and $.CanComment .New}} data-line="{{.New}}"{{end}}>84
{{if and $.CanComment (ne .Kind "hunk")}}<span class="gutter{{if not .New}} off{{end}}"></span>{{end}}85
<span class="ln">{{if .Old}}{{.Old}}{{end}}</span>86
<span class="ln">{{if .New}}{{.New}}{{end}}</span>87
<code>{{.HTML}}</code>88
</div>89
{{if $.CanComment}}{{range .Notes}}90
<article class="linenote" id="note-{{.ID}}">91
<strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>92
<div class="mdbody">{{.HTML}}</div>93
{{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}94
{{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}95
</article>96
{{end}}{{end}}97
{{end}}98
</div>99
<div class="split">100
{{range .Pairs}}101
{{if .Hunk}}<div class="commitline kind-hunk"><code>{{.Hunk}}</code></div>{{else}}102
<div class="pair">103
<div class="half kind-{{if .LKind}}{{.LKind}}{{else}}empty{{end}}"><span class="ln">{{if .LNo}}{{.LNo}}{{end}}</span><code>{{.LHTML}}</code></div>104
<div class="half kind-{{if .RKind}}{{.RKind}}{{else}}empty{{end}}"><span class="ln">{{if .RNo}}{{.RNo}}{{end}}</span><code>{{.RHTML}}</code></div>105
</div>106
{{end}}107
{{end}}108
</div>109
{{end}}110
</div>111
{{end}}112
</section>113
{{end}}114
</div>115
</div>116
</div>117
<script src="/assets/commit.js"></script>118
{{end}}@@ -0,0 +1,44 @@
1
{{define "info"}}
2
{{template "layout-start" .}}
3
<article class="spec">
4
<h1>{{t "title.info"}}</h1>
5
<p class="lead">{{t "info.lead"}}</p>
6
<pre class="spec-example">{{.Spec.Example}}</pre>
7
{{range .Spec.Sections}}
8
<h2 id="{{.ID}}">{{.Title}}</h2>
9
{{if .Intro}}<p>{{.Intro}}</p>{{end}}
10
{{if eq .Kind "keywords"}}
11
<table class="spec-table">
12
<thead><tr><th>{{t "info.col.keyword"}}</th><th>{{t "info.col.meaning"}}</th></tr></thead>
13
<tbody>
14
{{range .Items}}<tr><td><code>{{.Name}}</code></td><td>{{.Summary}}</td></tr>{{end}}
15
</tbody>
16
</table>
17
{{else if eq .Kind "variables"}}
18
<table class="spec-table">
19
<thead><tr><th>{{t "info.col.keyword"}}</th><th>{{t "info.col.where"}}</th><th>{{t "info.col.meaning"}}</th></tr></thead>
20
<tbody>
21
{{range .Variables}}<tr><td><code>{{.Name}}</code></td><td>{{.Where}}</td><td>{{.Summary}}</td></tr>{{end}}
22
</tbody>
23
</table>
24
{{else if eq .Kind "list"}}
25
<ul class="spec-list">{{range .Lines}}<li>{{.}}</li>{{end}}</ul>
26
{{else if eq .Kind "presets"}}
27
<table class="spec-table">
28
<thead><tr><th>{{t "info.col.name"}}</th><th>{{t "info.col.base"}}</th><th>{{t "info.col.tools"}}</th></tr></thead>
29
<tbody>
30
{{range .Presets}}
31
<tr>
32
<td><code>{{.Name}}</code></td>
33
<td><code>{{.From}}</code>{{if .Runtime}}<div class="muted">{{.Runtime}}</div>{{end}}</td>
34
<td>{{if .Tools}}{{range $i, $tool := .Tools}}{{if $i}}, {{end}}<code>{{$tool}}</code>{{end}}{{else}}{{t "info.presets.mapped"}}{{end}}</td>
35
</tr>
36
{{end}}
37
</tbody>
38
</table>
39
{{end}}
40
{{end}}
41
<script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>
42
</article>
43
{{template "layout-end" .}}
44
{{end}}
@@ -0,0 +1,44 @@1
{{define "info"}}2
{{template "layout-start" .}}3
<article class="spec">4
<h1>{{t "title.info"}}</h1>5
<p class="lead">{{t "info.lead"}}</p>6
<pre class="spec-example">{{.Spec.Example}}</pre>7
{{range .Spec.Sections}}8
<h2 id="{{.ID}}">{{.Title}}</h2>9
{{if .Intro}}<p>{{.Intro}}</p>{{end}}10
{{if eq .Kind "keywords"}}11
<table class="spec-table">12
<thead><tr><th>{{t "info.col.keyword"}}</th><th>{{t "info.col.meaning"}}</th></tr></thead>13
<tbody>14
{{range .Items}}<tr><td><code>{{.Name}}</code></td><td>{{.Summary}}</td></tr>{{end}}15
</tbody>16
</table>17
{{else if eq .Kind "variables"}}18
<table class="spec-table">19
<thead><tr><th>{{t "info.col.keyword"}}</th><th>{{t "info.col.where"}}</th><th>{{t "info.col.meaning"}}</th></tr></thead>20
<tbody>21
{{range .Variables}}<tr><td><code>{{.Name}}</code></td><td>{{.Where}}</td><td>{{.Summary}}</td></tr>{{end}}22
</tbody>23
</table>24
{{else if eq .Kind "list"}}25
<ul class="spec-list">{{range .Lines}}<li>{{.}}</li>{{end}}</ul>26
{{else if eq .Kind "presets"}}27
<table class="spec-table">28
<thead><tr><th>{{t "info.col.name"}}</th><th>{{t "info.col.base"}}</th><th>{{t "info.col.tools"}}</th></tr></thead>29
<tbody>30
{{range .Presets}}31
<tr>32
<td><code>{{.Name}}</code></td>33
<td><code>{{.From}}</code>{{if .Runtime}}<div class="muted">{{.Runtime}}</div>{{end}}</td>34
<td>{{if .Tools}}{{range $i, $tool := .Tools}}{{if $i}}, {{end}}<code>{{$tool}}</code>{{end}}{{else}}{{t "info.presets.mapped"}}{{end}}</td>35
</tr>36
{{end}}37
</tbody>38
</table>39
{{end}}40
{{end}}41
<script type="application/json" id="bluegit-ci-spec">{{.SpecJSON}}</script>42
</article>43
{{template "layout-end" .}}44
{{end}}@@ -15,16 +15,18 @@
15
15
{{if .User}}
16
16
<a href="/">{{t "nav.dashboard"}}</a>
17
17
<a href="/new">{{t "nav.new"}}</a>
18
<a href="/-/info">{{t "nav.info"}}</a>
18
19
{{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}
19
20
<a href="/settings">{{.User.Username}}</a>
20
21
<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>
21
22
{{else}}
23
<a href="/-/info">{{t "nav.info"}}</a>
22
24
<a class="btn" href="/login">{{t "nav.signin"}}</a>
23
25
{{end}}
24
26
</nav>
25
27
</header>
26
<div class="frame{{if or .Repo .Group .User}} with-side{{end}}">
27
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
28
<div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">
29
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
28
30
<div class="content">
29
31
<main{{if .Wide}} class="wide"{{end}}>
30
32
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
@@ -44,6 +46,7 @@
44
46
</main>
45
47
</div>
46
48
</div>
49
<script src="/assets/float.js"></script>
47
50
</body>
48
51
</html>
49
52
{{end}}
@@ -84,6 +87,19 @@
84
87
</aside>
85
88
{{end}}
86
89
90
{{define "infoside"}}
91
<aside class="sidenav">
92
<a class="sidecontext" href="/-/info">
93
<span class="sidename">{{t "title.info"}}</span>
94
</a>
95
<nav class="sidenav-links">
96
{{range .Spec.Sections}}
97
<a href="/-/info#{{.ID}}">{{.Title}}</a>
98
{{end}}
99
</nav>
100
</aside>
101
{{end}}
102
87
103
{{define "dashside"}}
88
104
<aside class="sidenav">
89
105
<a class="sidecontext" href="/">
@@ -93,6 +109,7 @@
93
109
<nav class="sidenav-links">
94
110
<a href="/"{{if eq .Page "dashboard"}} class="on"{{end}}>{{t "nav.dashboard"}}</a>
95
111
<a href="/new"{{if eq .Page "new"}} class="on"{{end}}>{{t "nav.new"}}</a>
112
<a href="/-/info"{{if eq .Page "info"}} class="on"{{end}}>{{t "nav.info"}}</a>
96
113
<a href="/settings"{{if eq .Page "account"}} class="on"{{end}}>{{.User.Username}}</a>
97
114
{{if .User.InstanceAdmin}}<a href="/setup"{{if eq .Page "setup"}} class="on"{{end}}>{{t "nav.storage"}}</a>{{end}}
98
115
</nav>
@@ -15,16 +15,18 @@15
{{if .User}}15
{{if .User}}16
<a href="/">{{t "nav.dashboard"}}</a>16
<a href="/">{{t "nav.dashboard"}}</a>17
<a href="/new">{{t "nav.new"}}</a>17
<a href="/new">{{t "nav.new"}}</a>18
<a href="/-/info">{{t "nav.info"}}</a>18
{{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}19
{{if .User.InstanceAdmin}}<a href="/setup">{{t "nav.storage"}}</a>{{end}}19
<a href="/settings">{{.User.Username}}</a>20
<a href="/settings">{{.User.Username}}</a>20
<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>21
<form method="post" action="/logout"><input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "nav.signout"}}</button></form>21
{{else}}22
{{else}}23
<a href="/-/info">{{t "nav.info"}}</a>22
<a class="btn" href="/login">{{t "nav.signin"}}</a>24
<a class="btn" href="/login">{{t "nav.signin"}}</a>23
{{end}}25
{{end}}24
</nav>26
</nav>25
</header>27
</header>26
<div class="frame{{if or .Repo .Group .User}} with-side{{end}}">28
<div class="frame{{if or .Repo .Group .Info .User}} with-side{{end}}">27
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .User}}{{template "dashside" .}}{{end}}29
{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .User}}{{template "dashside" .}}{{end}}28
<div class="content">30
<div class="content">29
<main{{if .Wide}} class="wide"{{end}}>31
<main{{if .Wide}} class="wide"{{end}}>30
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}32
{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}@@ -44,6 +46,7 @@44
</main>46
</main>45
</div>47
</div>46
</div>48
</div>49
<script src="/assets/float.js"></script>47
</body>50
</body>48
</html>51
</html>49
{{end}}52
{{end}}@@ -84,6 +87,19 @@84
</aside>87
</aside>85
{{end}}88
{{end}}86
89
90
{{define "infoside"}}91
<aside class="sidenav">92
<a class="sidecontext" href="/-/info">93
<span class="sidename">{{t "title.info"}}</span>94
</a>95
<nav class="sidenav-links">96
{{range .Spec.Sections}}97
<a href="/-/info#{{.ID}}">{{.Title}}</a>98
{{end}}99
</nav>100
</aside>101
{{end}}102
87
{{define "dashside"}}103
{{define "dashside"}}88
<aside class="sidenav">104
<aside class="sidenav">89
<a class="sidecontext" href="/">105
<a class="sidecontext" href="/">@@ -93,6 +109,7 @@93
<nav class="sidenav-links">109
<nav class="sidenav-links">94
<a href="/"{{if eq .Page "dashboard"}} class="on"{{end}}>{{t "nav.dashboard"}}</a>110
<a href="/"{{if eq .Page "dashboard"}} class="on"{{end}}>{{t "nav.dashboard"}}</a>95
<a href="/new"{{if eq .Page "new"}} class="on"{{end}}>{{t "nav.new"}}</a>111
<a href="/new"{{if eq .Page "new"}} class="on"{{end}}>{{t "nav.new"}}</a>112
<a href="/-/info"{{if eq .Page "info"}} class="on"{{end}}>{{t "nav.info"}}</a>96
<a href="/settings"{{if eq .Page "account"}} class="on"{{end}}>{{.User.Username}}</a>113
<a href="/settings"{{if eq .Page "account"}} class="on"{{end}}>{{.User.Username}}</a>97
{{if .User.InstanceAdmin}}<a href="/setup"{{if eq .Page "setup"}} class="on"{{end}}>{{t "nav.storage"}}</a>{{end}}114
{{if .User.InstanceAdmin}}<a href="/setup"{{if eq .Page "setup"}} class="on"{{end}}>{{t "nav.storage"}}</a>{{end}}98
</nav>115
</nav>@@ -0,0 +1,61 @@
1
{{define "comparediff"}}
2
{{if or (eq .CompareFrom "") (eq .CompareTo "") (eq .CompareFrom .CompareTo)}}
3
<p class="muted">{{t "mr.emptyCompare"}}</p>
4
{{else}}
5
<h2>{{t "mr.commits"}}</h2>
6
<ul class="clean">
7
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code></span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}
8
</ul>
9
<h2>{{t "mr.changes"}}</h2>
10
{{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
11
{{end}}
12
{{end}}
13
14
{{define "compare"}}
15
{{template "layout-start" .}}
16
<header class="pagehead"><h1>{{t "branch.compare"}}</h1></header>
17
<p>{{.CompareFrom}} → {{.CompareTo}}</p>
18
{{template "comparediff" .}}
19
{{if and .CompareTo (ne .CompareFrom .CompareTo) .CanWrite}}
20
<p><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .CompareTo}}&target={{urlquery .CompareFrom}}">{{t "mr.create"}}</a></p>
21
{{end}}
22
{{template "layout-end" .}}
23
{{end}}
24
25
{{define "newmr"}}
26
{{template "layout-start" .}}
27
<header class="pagehead"><h1>{{t "mr.create"}}</h1></header>
28
<form class="row" method="get" action="/{{.Repo.FullPath}}/-/merge-requests/new" data-mr-pick>
29
<label>{{t "mr.source"}}
30
<select name="source">{{range .Branches}}<option{{if eq .Name $.CompareFrom}} selected{{end}}>{{.Name}}</option>{{end}}</select>
31
</label>
32
<label>{{t "mr.target"}}
33
<select name="target">{{range .Branches}}<option{{if eq .Name $.CompareTo}} selected{{end}}>{{.Name}}</option>{{end}}</select>
34
</label>
35
<button type="submit">{{t "branch.compare"}}</button>
36
</form>
37
{{template "comparediff" .}}
38
{{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}
39
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
40
<input type="hidden" name="csrf" value="{{.CSRF}}">
41
<input type="hidden" name="source" value="{{.CompareFrom}}">
42
<input type="hidden" name="target" value="{{.CompareTo}}">
43
<label>{{t "mr.titleField"}} <input name="title" value="{{.FormTitle}}" required></label>
44
<p class="fieldlabel">{{t "mr.description"}}</p>
45
<div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
46
<div class="mdtabs" role="tablist">
47
<button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
48
<button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
49
</div>
50
<div data-md-write>
51
<textarea name="description"></textarea>
52
</div>
53
<div class="mdbody" data-md-preview hidden></div>
54
</div>
55
<label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
56
<button type="submit">{{t "mr.create"}}</button>
57
</form>
58
<script src="/assets/mr.js"></script>
59
{{end}}
60
{{template "layout-end" .}}
61
{{end}}
@@ -0,0 +1,61 @@1
{{define "comparediff"}}2
{{if or (eq .CompareFrom "") (eq .CompareTo "") (eq .CompareFrom .CompareTo)}}3
<p class="muted">{{t "mr.emptyCompare"}}</p>4
{{else}}5
<h2>{{t "mr.commits"}}</h2>6
<ul class="clean">7
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code></span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}8
</ul>9
<h2>{{t "mr.changes"}}</h2>10
{{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}11
{{end}}12
{{end}}13
14
{{define "compare"}}15
{{template "layout-start" .}}16
<header class="pagehead"><h1>{{t "branch.compare"}}</h1></header>17
<p>{{.CompareFrom}} → {{.CompareTo}}</p>18
{{template "comparediff" .}}19
{{if and .CompareTo (ne .CompareFrom .CompareTo) .CanWrite}}20
<p><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .CompareTo}}&target={{urlquery .CompareFrom}}">{{t "mr.create"}}</a></p>21
{{end}}22
{{template "layout-end" .}}23
{{end}}24
25
{{define "newmr"}}26
{{template "layout-start" .}}27
<header class="pagehead"><h1>{{t "mr.create"}}</h1></header>28
<form class="row" method="get" action="/{{.Repo.FullPath}}/-/merge-requests/new" data-mr-pick>29
<label>{{t "mr.source"}}30
<select name="source">{{range .Branches}}<option{{if eq .Name $.CompareFrom}} selected{{end}}>{{.Name}}</option>{{end}}</select>31
</label>32
<label>{{t "mr.target"}}33
<select name="target">{{range .Branches}}<option{{if eq .Name $.CompareTo}} selected{{end}}>{{.Name}}</option>{{end}}</select>34
</label>35
<button type="submit">{{t "branch.compare"}}</button>36
</form>37
{{template "comparediff" .}}38
{{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}39
<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">40
<input type="hidden" name="csrf" value="{{.CSRF}}">41
<input type="hidden" name="source" value="{{.CompareFrom}}">42
<input type="hidden" name="target" value="{{.CompareTo}}">43
<label>{{t "mr.titleField"}} <input name="title" value="{{.FormTitle}}" required></label>44
<p class="fieldlabel">{{t "mr.description"}}</p>45
<div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">46
<div class="mdtabs" role="tablist">47
<button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>48
<button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>49
</div>50
<div data-md-write>51
<textarea name="description"></textarea>52
</div>53
<div class="mdbody" data-md-preview hidden></div>54
</div>55
<label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>56
<button type="submit">{{t "mr.create"}}</button>57
</form>58
<script src="/assets/mr.js"></script>59
{{end}}60
{{template "layout-end" .}}61
{{end}}@@ -250,6 +250,7 @@
250
250
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>
251
251
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>
252
252
</div>
253
{{if .Head.PipeStatus}}<a class="status {{.Head.PipeStatus}}" href="/{{.Repo.FullPath}}/-/pipelines/{{.Head.PipeID}}"><span class="mark"></span>{{.Head.PipeLabel}}</a>{{end}}
253
254
<code class="sha">{{slice .Head.SHA 0 8}}</code>
254
255
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>
255
256
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>
@@ -455,25 +456,3 @@
455
456
{{template "layout-end" .}}
456
457
{{end}}
457
458
458
{{define "commit"}}
459
{{template "layout-start" .}}
460
<header class="pagehead"><h1>{{.Commit.Subject}}</h1></header>
461
<div class="projhead">
462
{{template "avatar" .Commit}}
463
<div>
464
<p>{{template "commitwho" .Commit}}</p>
465
<p class="muted">{{.Commit.SHA}} · {{.Commit.Date}}</p>
466
</div>
467
</div>
468
{{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}
469
{{template "layout-end" .}}
470
{{end}}
471
472
{{define "branches"}}
473
{{template "layout-start" .}}
474
<header class="pagehead"><h1>{{t "title.branches"}}</h1></header>
475
<ul class="clean">
476
{{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}</li>{{else}}<li class="muted">{{t "repo.noBranches"}}</li>{{end}}
477
</ul>
478
{{template "layout-end" .}}
479
{{end}}
@@ -250,6 +250,7 @@250
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>250
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>251
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>251
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>252
</div>252
</div>253
{{if .Head.PipeStatus}}<a class="status {{.Head.PipeStatus}}" href="/{{.Repo.FullPath}}/-/pipelines/{{.Head.PipeID}}"><span class="mark"></span>{{.Head.PipeLabel}}</a>{{end}}253
<code class="sha">{{slice .Head.SHA 0 8}}</code>254
<code class="sha">{{slice .Head.SHA 0 8}}</code>254
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>255
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>255
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>256
<a class="btn ghost" href="/{{.Repo.FullPath}}/-/commits?rev={{.Rev}}">{{t "repo.history"}}</a>@@ -455,25 +456,3 @@455
{{template "layout-end" .}}456
{{template "layout-end" .}}456
{{end}}457
{{end}}457
458
458
{{define "commit"}}459
{{template "layout-start" .}}460
<header class="pagehead"><h1>{{.Commit.Subject}}</h1></header>461
<div class="projhead">462
{{template "avatar" .Commit}}463
<div>464
<p>{{template "commitwho" .Commit}}</p>465
<p class="muted">{{.Commit.SHA}} · {{.Commit.Date}}</p>466
</div>467
</div>468
{{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}469
{{template "layout-end" .}}470
{{end}}471
472
{{define "branches"}}473
{{template "layout-start" .}}474
<header class="pagehead"><h1>{{t "title.branches"}}</h1></header>475
<ul class="clean">476
{{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}</li>{{else}}<li class="muted">{{t "repo.noBranches"}}</li>{{end}}477
</ul>478
{{template "layout-end" .}}479
{{end}}@@ -143,6 +143,8 @@ type MergeRequest struct {
143
143
Status string
144
144
CreatedAt time.Time
145
145
UpdatedAt time.Time
146
Draft bool
147
Labels string
146
148
}
147
149
148
150
// CreateMergeRequest nummert per repository.
@@ -185,13 +187,14 @@ func (s *Store) MergeRequestByNumber(ctx context.Context, repoID, number int64)
185
187
return scanMR(row)
186
188
}
187
189
188
const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at
190
const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at, m.draft, m.labels
189
191
FROM merge_requests m JOIN users u ON u.id = m.author_id`
190
192
191
193
func scanMR(row *sql.Row) (MergeRequest, error) {
192
194
var m MergeRequest
193
195
var created, updated string
194
if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
196
var draft int
197
if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {
195
198
if errors.Is(err, sql.ErrNoRows) {
196
199
return MergeRequest{}, errNotFound
197
200
}
@@ -199,6 +202,7 @@ func scanMR(row *sql.Row) (MergeRequest, error) {
199
202
}
200
203
m.CreatedAt = parseTime(created)
201
204
m.UpdatedAt = parseTime(updated)
205
m.Draft = draft == 1
202
206
return m, nil
203
207
}
204
208
@@ -209,18 +213,7 @@ func (s *Store) ListMergeRequests(ctx context.Context, repoID int64) ([]MergeReq
209
213
return nil, err
210
214
}
211
215
defer rows.Close()
212
var out []MergeRequest
213
for rows.Next() {
214
var m MergeRequest
215
var created, updated string
216
if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
217
return nil, err
218
}
219
m.CreatedAt = parseTime(created)
220
m.UpdatedAt = parseTime(updated)
221
out = append(out, m)
222
}
223
return out, rows.Err()
216
return scanMRList(rows)
224
217
}
225
218
226
219
// SetMergeRequestStatus zet open, merged of closed.
@@ -256,11 +249,13 @@ func scanMRList(rows *sql.Rows) ([]MergeRequest, error) {
256
249
for rows.Next() {
257
250
var m MergeRequest
258
251
var created, updated string
259
if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
252
var draft int
253
if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {
260
254
return nil, err
261
255
}
262
256
m.CreatedAt = parseTime(created)
263
257
m.UpdatedAt = parseTime(updated)
258
m.Draft = draft == 1
264
259
out = append(out, m)
265
260
}
266
261
return out, rows.Err()
@@ -527,6 +522,15 @@ type scanner interface {
527
522
Scan(dest ...any) error
528
523
}
529
524
525
// LatestPipelineByCommit geeft de nieuwste pipeline van deze commit.
526
func (s *Store) LatestPipelineByCommit(ctx context.Context, repoID int64, sha string) (Pipeline, error) {
527
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND commit_sha = ? ORDER BY id DESC LIMIT 1`, repoID, sha))
528
if errors.Is(err, sql.ErrNoRows) {
529
return Pipeline{}, errNotFound
530
}
531
return p, err
532
}
533
530
534
// PipelineByID leest één pipeline.
531
535
func (s *Store) PipelineByID(ctx context.Context, repoID, id int64) (Pipeline, error) {
532
536
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND id = ?`, repoID, id))
@@ -143,6 +143,8 @@ type MergeRequest struct {143
Status string143
Status string144
CreatedAt time.Time144
CreatedAt time.Time145
UpdatedAt time.Time145
UpdatedAt time.Time146
Draft bool147
Labels string146
}148
}147
149
148
// CreateMergeRequest nummert per repository.150
// CreateMergeRequest nummert per repository.@@ -185,13 +187,14 @@ func (s *Store) MergeRequestByNumber(ctx context.Context, repoID, number int64)185
return scanMR(row)187
return scanMR(row)186
}188
}187
189
188
const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at190
const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at, m.draft, m.labels189
FROM merge_requests m JOIN users u ON u.id = m.author_id`191
FROM merge_requests m JOIN users u ON u.id = m.author_id`190
192
191
func scanMR(row *sql.Row) (MergeRequest, error) {193
func scanMR(row *sql.Row) (MergeRequest, error) {192
var m MergeRequest194
var m MergeRequest193
var created, updated string195
var created, updated string194
if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {196
var draft int197
if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {195
if errors.Is(err, sql.ErrNoRows) {198
if errors.Is(err, sql.ErrNoRows) {196
return MergeRequest{}, errNotFound199
return MergeRequest{}, errNotFound197
}200
}@@ -199,6 +202,7 @@ func scanMR(row *sql.Row) (MergeRequest, error) {199
}202
}200
m.CreatedAt = parseTime(created)203
m.CreatedAt = parseTime(created)201
m.UpdatedAt = parseTime(updated)204
m.UpdatedAt = parseTime(updated)205
m.Draft = draft == 1202
return m, nil206
return m, nil203
}207
}204
208
@@ -209,18 +213,7 @@ func (s *Store) ListMergeRequests(ctx context.Context, repoID int64) ([]MergeReq209
return nil, err213
return nil, err210
}214
}211
defer rows.Close()215
defer rows.Close()212
var out []MergeRequest216
return scanMRList(rows)213
for rows.Next() {214
var m MergeRequest215
var created, updated string216
if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {217
return nil, err218
}219
m.CreatedAt = parseTime(created)220
m.UpdatedAt = parseTime(updated)221
out = append(out, m)222
}223
return out, rows.Err()224
}217
}225
218
226
// SetMergeRequestStatus zet open, merged of closed.219
// SetMergeRequestStatus zet open, merged of closed.@@ -256,11 +249,13 @@ func scanMRList(rows *sql.Rows) ([]MergeRequest, error) {256
for rows.Next() {249
for rows.Next() {257
var m MergeRequest250
var m MergeRequest258
var created, updated string251
var created, updated string259
if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {252
var draft int253
if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {260
return nil, err254
return nil, err261
}255
}262
m.CreatedAt = parseTime(created)256
m.CreatedAt = parseTime(created)263
m.UpdatedAt = parseTime(updated)257
m.UpdatedAt = parseTime(updated)258
m.Draft = draft == 1264
out = append(out, m)259
out = append(out, m)265
}260
}266
return out, rows.Err()261
return out, rows.Err()@@ -527,6 +522,15 @@ type scanner interface {527
Scan(dest ...any) error522
Scan(dest ...any) error528
}523
}529
524
525
// LatestPipelineByCommit geeft de nieuwste pipeline van deze commit.526
func (s *Store) LatestPipelineByCommit(ctx context.Context, repoID int64, sha string) (Pipeline, error) {527
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND commit_sha = ? ORDER BY id DESC LIMIT 1`, repoID, sha))528
if errors.Is(err, sql.ErrNoRows) {529
return Pipeline{}, errNotFound530
}531
return p, err532
}533
530
// PipelineByID leest één pipeline.534
// PipelineByID leest één pipeline.531
func (s *Store) PipelineByID(ctx context.Context, repoID, id int64) (Pipeline, error) {535
func (s *Store) PipelineByID(ctx context.Context, repoID, id int64) (Pipeline, error) {532
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND id = ?`, repoID, id))536
p, err := scanPipelineRow(s.db.QueryRowContext(ctx, pipelineCols+` WHERE repo_id = ? AND id = ?`, repoID, id))@@ -0,0 +1,105 @@
1
package store
2
3
import (
4
"context"
5
"strings"
6
"time"
7
8
"gitlab.com/Timfa/bluegit/internal/i18n"
9
)
10
11
// SetDraft zet of haalt het conceptvinkje weg.
12
func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {
13
bit := 0
14
if draft {
15
bit = 1
16
}
17
_, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET draft = ?, updated_at = ? WHERE id = ?`, bit, now(), id)
18
return err
19
}
20
21
// UpdateMergeRequest bewaart titel, beschrijving en labels.
22
func (s *Store) UpdateMergeRequest(ctx context.Context, id int64, title, description, labels string) error {
23
title = trim(title, 200)
24
if title == "" {
25
return i18n.E("err.mrTitle")
26
}
27
description = trim(description, 20000)
28
labels = trim(labels, 200)
29
_, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET title = ?, description = ?, labels = ?, updated_at = ? WHERE id = ?`,
30
title, description, labels, now(), id)
31
return err
32
}
33
34
// RenameOpenMRBranches werkt open verzoeken bij als een branch een nieuwe naam krijgt.
35
func (s *Store) RenameOpenMRBranches(ctx context.Context, repoID int64, oldName, newName string) error {
36
ts := now()
37
if _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET source_branch = ?, updated_at = ? WHERE repo_id = ? AND source_branch = ? AND status = 'open'`,
38
newName, ts, repoID, oldName); err != nil {
39
return err
40
}
41
_, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET target_branch = ?, updated_at = ? WHERE repo_id = ? AND target_branch = ? AND status = 'open'`,
42
newName, ts, repoID, oldName)
43
return err
44
}
45
46
// MREvent is één gebeurtenis op de tijdlijn van een merge request.
47
type MREvent struct {
48
ID int64
49
ActorID int64
50
Actor string
51
Kind string
52
Body string
53
CreatedAt time.Time
54
}
55
56
// AddMREvent bewaart een gebeurtenis. actorID 0 is toegestaan.
57
func (s *Store) AddMREvent(ctx context.Context, repoID, mrID, actorID int64, kind, body string) error {
58
kind = strings.TrimSpace(kind)
59
if kind == "" {
60
return i18n.E("err.badForm")
61
}
62
_, err := s.db.ExecContext(ctx, `INSERT INTO mr_events (repo_id, mr_id, actor_id, kind, body, created_at) VALUES (?, ?, ?, ?, ?, ?)`,
63
repoID, mrID, actorID, trim(kind, 40), trim(body, 4000), now())
64
return err
65
}
66
67
// ListMREvents geeft de gebeurtenissen, oudste eerst.
68
func (s *Store) ListMREvents(ctx context.Context, mrID int64) ([]MREvent, error) {
69
rows, err := s.db.QueryContext(ctx, `SELECT e.id, e.actor_id, COALESCE(u.username, ''), e.kind, e.body, e.created_at
70
FROM mr_events e LEFT JOIN users u ON u.id = e.actor_id
71
WHERE e.mr_id = ? ORDER BY e.id`, mrID)
72
if err != nil {
73
return nil, err
74
}
75
defer rows.Close()
76
var out []MREvent
77
for rows.Next() {
78
var e MREvent
79
var created string
80
if err := rows.Scan(&e.ID, &e.ActorID, &e.Actor, &e.Kind, &e.Body, &created); err != nil {
81
return nil, err
82
}
83
e.CreatedAt = parseTime(created)
84
out = append(out, e)
85
}
86
return out, rows.Err()
87
}
88
89
// PipelinesForMR geeft de pipelines van deze merge request, oudste eerst.
90
func (s *Store) PipelinesForMR(ctx context.Context, repoID, mrID int64) ([]Pipeline, error) {
91
rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE repo_id = ? AND mr_id = ? ORDER BY id`, repoID, mrID)
92
if err != nil {
93
return nil, err
94
}
95
defer rows.Close()
96
var out []Pipeline
97
for rows.Next() {
98
p, err := scanPipeline(rows)
99
if err != nil {
100
return nil, err
101
}
102
out = append(out, p)
103
}
104
return out, rows.Err()
105
}
@@ -0,0 +1,105 @@1
package store2
3
import (4
"context"5
"strings"6
"time"7
8
"gitlab.com/Timfa/bluegit/internal/i18n"9
)10
11
// SetDraft zet of haalt het conceptvinkje weg.12
func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {13
bit := 014
if draft {15
bit = 116
}17
_, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET draft = ?, updated_at = ? WHERE id = ?`, bit, now(), id)18
return err19
}20
21
// UpdateMergeRequest bewaart titel, beschrijving en labels.22
func (s *Store) UpdateMergeRequest(ctx context.Context, id int64, title, description, labels string) error {23
title = trim(title, 200)24
if title == "" {25
return i18n.E("err.mrTitle")26
}27
description = trim(description, 20000)28
labels = trim(labels, 200)29
_, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET title = ?, description = ?, labels = ?, updated_at = ? WHERE id = ?`,30
title, description, labels, now(), id)31
return err32
}33
34
// RenameOpenMRBranches werkt open verzoeken bij als een branch een nieuwe naam krijgt.35
func (s *Store) RenameOpenMRBranches(ctx context.Context, repoID int64, oldName, newName string) error {36
ts := now()37
if _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET source_branch = ?, updated_at = ? WHERE repo_id = ? AND source_branch = ? AND status = 'open'`,38
newName, ts, repoID, oldName); err != nil {39
return err40
}41
_, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET target_branch = ?, updated_at = ? WHERE repo_id = ? AND target_branch = ? AND status = 'open'`,42
newName, ts, repoID, oldName)43
return err44
}45
46
// MREvent is één gebeurtenis op de tijdlijn van een merge request.47
type MREvent struct {48
ID int6449
ActorID int6450
Actor string51
Kind string52
Body string53
CreatedAt time.Time54
}55
56
// AddMREvent bewaart een gebeurtenis. actorID 0 is toegestaan.57
func (s *Store) AddMREvent(ctx context.Context, repoID, mrID, actorID int64, kind, body string) error {58
kind = strings.TrimSpace(kind)59
if kind == "" {60
return i18n.E("err.badForm")61
}62
_, err := s.db.ExecContext(ctx, `INSERT INTO mr_events (repo_id, mr_id, actor_id, kind, body, created_at) VALUES (?, ?, ?, ?, ?, ?)`,63
repoID, mrID, actorID, trim(kind, 40), trim(body, 4000), now())64
return err65
}66
67
// ListMREvents geeft de gebeurtenissen, oudste eerst.68
func (s *Store) ListMREvents(ctx context.Context, mrID int64) ([]MREvent, error) {69
rows, err := s.db.QueryContext(ctx, `SELECT e.id, e.actor_id, COALESCE(u.username, ''), e.kind, e.body, e.created_at70
FROM mr_events e LEFT JOIN users u ON u.id = e.actor_id71
WHERE e.mr_id = ? ORDER BY e.id`, mrID)72
if err != nil {73
return nil, err74
}75
defer rows.Close()76
var out []MREvent77
for rows.Next() {78
var e MREvent79
var created string80
if err := rows.Scan(&e.ID, &e.ActorID, &e.Actor, &e.Kind, &e.Body, &created); err != nil {81
return nil, err82
}83
e.CreatedAt = parseTime(created)84
out = append(out, e)85
}86
return out, rows.Err()87
}88
89
// PipelinesForMR geeft de pipelines van deze merge request, oudste eerst.90
func (s *Store) PipelinesForMR(ctx context.Context, repoID, mrID int64) ([]Pipeline, error) {91
rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE repo_id = ? AND mr_id = ? ORDER BY id`, repoID, mrID)92
if err != nil {93
return nil, err94
}95
defer rows.Close()96
var out []Pipeline97
for rows.Next() {98
p, err := scanPipeline(rows)99
if err != nil {100
return nil, err101
}102
out = append(out, p)103
}104
return out, rows.Err()105
}@@ -24,12 +24,23 @@ type Note struct {
24
24
LineEnd int
25
25
Suggestion string
26
26
BaseText string
27
ParentID int64
27
28
CreatedAt time.Time
28
29
}
29
30
30
31
// AddNote bewaart een algemene reactie en telt hem als bijdrage.
31
32
func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
32
return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "")
33
return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", 0)
34
}
35
36
// AddReply bewaart een reactie op een bestaande reactie, één niveau diep.
37
func (s *Store) AddReply(ctx context.Context, repoID, mrID, authorID, parentID int64, body string) (Note, error) {
38
var parentMR, parentParent int64
39
err := s.db.QueryRowContext(ctx, `SELECT mr_id, parent_id FROM notes WHERE id = ? AND repo_id = ?`, parentID, repoID).Scan(&parentMR, &parentParent)
40
if err != nil || parentMR != mrID || parentParent != 0 {
41
return Note{}, i18n.E("err.noteParent")
42
}
43
return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", parentID)
33
44
}
34
45
35
46
// AddLineNote bewaart een reactie op regels, optioneel met een suggestie.
@@ -37,10 +48,10 @@ func (s *Store) AddLineNote(ctx context.Context, repoID, mrID, authorID int64, b
37
48
if path == "" || start < 1 || end < start {
38
49
return Note{}, i18n.E("err.sugLines")
39
50
}
40
return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base)
51
return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base, 0)
41
52
}
42
53
43
func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
54
func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string, parentID int64) (Note, error) {
44
55
body = strings.TrimSpace(body)
45
56
if body == "" {
46
57
return Note{}, i18n.E("err.noteEmpty")
@@ -56,8 +67,8 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo
56
67
}
57
68
defer func() { _ = tx.Rollback() }()
58
69
ts := now()
59
res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at, file_path, line_start, line_end, suggestion, base_text) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
60
repoID, mrID, authorID, body, ts, path, start, end, suggestion, base)
70
res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at, file_path, line_start, line_end, suggestion, base_text, parent_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
71
repoID, mrID, authorID, body, ts, path, start, end, suggestion, base, parentID)
61
72
if err != nil {
62
73
return Note{}, err
63
74
}
@@ -72,13 +83,13 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo
72
83
return Note{
73
84
ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,
74
85
FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,
75
CreatedAt: parseTime(ts),
86
ParentID: parentID, CreatedAt: parseTime(ts),
76
87
}, nil
77
88
}
78
89
79
90
// ListNotes geeft de reacties van één merge request, oudste eerst.
80
91
func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
81
rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text
92
rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text, n.parent_id
82
93
FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
83
94
if err != nil {
84
95
return nil, err
@@ -88,7 +99,7 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
88
99
for rows.Next() {
89
100
var n Note
90
101
var created string
91
if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText); err != nil {
102
if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText, &n.ParentID); err != nil {
92
103
return nil, err
93
104
}
94
105
n.CreatedAt = parseTime(created)
@@ -24,12 +24,23 @@ type Note struct {24
LineEnd int24
LineEnd int25
Suggestion string25
Suggestion string26
BaseText string26
BaseText string27
ParentID int6427
CreatedAt time.Time28
CreatedAt time.Time28
}29
}29
30
30
// AddNote bewaart een algemene reactie en telt hem als bijdrage.31
// AddNote bewaart een algemene reactie en telt hem als bijdrage.31
func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {32
func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {32
return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "")33
return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", 0)34
}35
36
// AddReply bewaart een reactie op een bestaande reactie, één niveau diep.37
func (s *Store) AddReply(ctx context.Context, repoID, mrID, authorID, parentID int64, body string) (Note, error) {38
var parentMR, parentParent int6439
err := s.db.QueryRowContext(ctx, `SELECT mr_id, parent_id FROM notes WHERE id = ? AND repo_id = ?`, parentID, repoID).Scan(&parentMR, &parentParent)40
if err != nil || parentMR != mrID || parentParent != 0 {41
return Note{}, i18n.E("err.noteParent")42
}43
return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", parentID)33
}44
}34
45
35
// AddLineNote bewaart een reactie op regels, optioneel met een suggestie.46
// AddLineNote bewaart een reactie op regels, optioneel met een suggestie.@@ -37,10 +48,10 @@ func (s *Store) AddLineNote(ctx context.Context, repoID, mrID, authorID int64, b37
if path == "" || start < 1 || end < start {48
if path == "" || start < 1 || end < start {38
return Note{}, i18n.E("err.sugLines")49
return Note{}, i18n.E("err.sugLines")39
}50
}40
return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base)51
return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base, 0)41
}52
}42
53
43
func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {54
func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string, parentID int64) (Note, error) {44
body = strings.TrimSpace(body)55
body = strings.TrimSpace(body)45
if body == "" {56
if body == "" {46
return Note{}, i18n.E("err.noteEmpty")57
return Note{}, i18n.E("err.noteEmpty")@@ -56,8 +67,8 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo56
}67
}57
defer func() { _ = tx.Rollback() }()68
defer func() { _ = tx.Rollback() }()58
ts := now()69
ts := now()59
res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at, file_path, line_start, line_end, suggestion, base_text) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,70
res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at, file_path, line_start, line_end, suggestion, base_text, parent_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,60
repoID, mrID, authorID, body, ts, path, start, end, suggestion, base)71
repoID, mrID, authorID, body, ts, path, start, end, suggestion, base, parentID)61
if err != nil {72
if err != nil {62
return Note{}, err73
return Note{}, err63
}74
}@@ -72,13 +83,13 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo72
return Note{83
return Note{73
ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,84
ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,74
FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,85
FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,75
CreatedAt: parseTime(ts),86
ParentID: parentID, CreatedAt: parseTime(ts),76
}, nil87
}, nil77
}88
}78
89
79
// ListNotes geeft de reacties van één merge request, oudste eerst.90
// ListNotes geeft de reacties van één merge request, oudste eerst.80
func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {91
func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {81
rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text92
rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text, n.parent_id82
FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)93
FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)83
if err != nil {94
if err != nil {84
return nil, err95
return nil, err@@ -88,7 +99,7 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {88
for rows.Next() {99
for rows.Next() {89
var n Note100
var n Note90
var created string101
var created string91
if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText); err != nil {102
if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText, &n.ParentID); err != nil {92
return nil, err103
return nil, err93
}104
}94
n.CreatedAt = parseTime(created)105
n.CreatedAt = parseTime(created)@@ -90,6 +90,9 @@ func (s *Store) migrate() error {
90
90
`ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,
91
91
`ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
92
92
`ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
93
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,
94
`ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,
95
`ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
93
96
}
94
97
for _, q := range alters {
95
98
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -241,6 +244,8 @@ CREATE TABLE IF NOT EXISTS merge_requests (
241
244
status TEXT NOT NULL,
242
245
created_at TEXT NOT NULL,
243
246
updated_at TEXT NOT NULL,
247
draft INTEGER NOT NULL DEFAULT 0,
248
labels TEXT NOT NULL DEFAULT '',
244
249
UNIQUE(repo_id, number)
245
250
);
246
251
CREATE TABLE IF NOT EXISTS pipelines (
@@ -358,8 +363,19 @@ CREATE TABLE IF NOT EXISTS notes (
358
363
line_start INTEGER NOT NULL DEFAULT 0,
359
364
line_end INTEGER NOT NULL DEFAULT 0,
360
365
suggestion TEXT NOT NULL DEFAULT '',
361
base_text TEXT NOT NULL DEFAULT ''
366
base_text TEXT NOT NULL DEFAULT '',
367
parent_id INTEGER NOT NULL DEFAULT 0
362
368
);
369
CREATE TABLE IF NOT EXISTS mr_events (
370
id INTEGER PRIMARY KEY,
371
repo_id INTEGER NOT NULL,
372
mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
373
actor_id INTEGER NOT NULL DEFAULT 0,
374
kind TEXT NOT NULL,
375
body TEXT NOT NULL DEFAULT '',
376
created_at TEXT NOT NULL
377
);
378
CREATE INDEX IF NOT EXISTS mr_events_mr ON mr_events(mr_id, id);
363
379
CREATE TABLE IF NOT EXISTS commit_pushers (
364
380
repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
365
381
sha TEXT NOT NULL,
@@ -90,6 +90,9 @@ func (s *Store) migrate() error {90
`ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,90
`ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,91
`ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,91
`ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,92
`ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,92
`ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,93
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,94
`ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,95
`ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,93
}96
}94
for _, q := range alters {97
for _, q := range alters {95
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {98
if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {@@ -241,6 +244,8 @@ CREATE TABLE IF NOT EXISTS merge_requests (241
status TEXT NOT NULL,244
status TEXT NOT NULL,242
created_at TEXT NOT NULL,245
created_at TEXT NOT NULL,243
updated_at TEXT NOT NULL,246
updated_at TEXT NOT NULL,247
draft INTEGER NOT NULL DEFAULT 0,248
labels TEXT NOT NULL DEFAULT '',244
UNIQUE(repo_id, number)249
UNIQUE(repo_id, number)245
);250
);246
CREATE TABLE IF NOT EXISTS pipelines (251
CREATE TABLE IF NOT EXISTS pipelines (@@ -358,8 +363,19 @@ CREATE TABLE IF NOT EXISTS notes (358
line_start INTEGER NOT NULL DEFAULT 0,363
line_start INTEGER NOT NULL DEFAULT 0,359
line_end INTEGER NOT NULL DEFAULT 0,364
line_end INTEGER NOT NULL DEFAULT 0,360
suggestion TEXT NOT NULL DEFAULT '',365
suggestion TEXT NOT NULL DEFAULT '',361
base_text TEXT NOT NULL DEFAULT ''366
base_text TEXT NOT NULL DEFAULT '',367
parent_id INTEGER NOT NULL DEFAULT 0362
);368
);369
CREATE TABLE IF NOT EXISTS mr_events (370
id INTEGER PRIMARY KEY,371
repo_id INTEGER NOT NULL,372
mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,373
actor_id INTEGER NOT NULL DEFAULT 0,374
kind TEXT NOT NULL,375
body TEXT NOT NULL DEFAULT '',376
created_at TEXT NOT NULL377
);378
CREATE INDEX IF NOT EXISTS mr_events_mr ON mr_events(mr_id, id);363
CREATE TABLE IF NOT EXISTS commit_pushers (379
CREATE TABLE IF NOT EXISTS commit_pushers (364
repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,380
repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,365
sha TEXT NOT NULL,381
sha TEXT NOT NULL,@@ -42,3 +42,8 @@ ci:
42
42
concurrency: 1
43
43
network: bridge
44
44
timeout_seconds: 1800
45
# Image-aliassen. De ingebouwde presets zijn bluegit/base, bluegit/node,
46
# bluegit/python, bluegit/go, bluegit/rust, bluegit/java en bluegit/dotnet.
47
# presets:
48
# team/tools:
49
# image: alpine:3.20
@@ -42,3 +42,8 @@ ci:42
concurrency: 142
concurrency: 143
network: bridge43
network: bridge44
timeout_seconds: 180044
timeout_seconds: 180045
# Image-aliassen. De ingebouwde presets zijn bluegit/base, bluegit/node,46
# bluegit/python, bluegit/go, bluegit/rust, bluegit/java en bluegit/dotnet.47
# presets:48
# team/tools:49
# image: alpine:3.20