Merged
fix: slash-branches verwijderen en bronbranch na een push-merge (GitLab !51)
timfa
wants to merge
1 commit
from
cursor/branch-cleanup-65da
into
master
Overview Commits 1 Pipelines 1 Changes 5
Activity
- timfa opened this merge request 23 October 2026
- timfa Pipeline #56 is Passed 23 October 2026
- timfa merged this merge request 23 October 2026
Commits
Pipelines
- #56 Passed
Changes
@@ -0,0 +1,197 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
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/gitrepo"
16
"gitlab.com/Timfa/bluegit/internal/store"
17
)
18
19
func TestDeleteBranchWithSlash(t *testing.T) {
20
if _, err := exec.LookPath("git"); err != nil {
21
t.Skip("git ontbreekt")
22
}
23
storage := t.TempDir()
24
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
25
if err != nil {
26
t.Fatal(err)
27
}
28
t.Cleanup(func() { _ = st.Close() })
29
ctx := context.Background()
30
ada, err := st.UpsertUser(ctx, 1, "ada", "", false)
31
if err != nil {
32
t.Fatal(err)
33
}
34
token, _, err := st.IssueToken(ctx, ada.ID, store.TokenRequest{Name: "ada", Scopes: "api"})
35
if err != nil {
36
t.Fatal(err)
37
}
38
cfg := config.Config{
39
BaseURL: "http://127.0.0.1:9", StoragePath: storage,
40
Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},
41
Git: config.Git{Binary: "git", DefaultBranch: "master"},
42
}
43
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}
44
ts := httptest.NewServer(srv.Handler())
45
t.Cleanup(ts.Close)
46
47
call := func(method, path, body string) (int, string) {
48
t.Helper()
49
req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))
50
if err != nil {
51
t.Fatal(err)
52
}
53
req.Header.Set("Authorization", "Bearer "+token)
54
if body != "" {
55
req.Header.Set("Content-Type", "application/json")
56
}
57
res, err := http.DefaultClient.Do(req)
58
if err != nil {
59
t.Fatal(err)
60
}
61
return res.StatusCode, read(t, res)
62
}
63
code, body := call(http.MethodPost, "/api/v1/projects", `{"name":"demo","visibility":"public","initialize_with_readme":true}`)
64
if code != 201 {
65
t.Fatalf("project %d %s", code, body)
66
}
67
const name = "cursor/api-schemas-65da"
68
dir := gitrepo.Dir(storage, "ada", "demo")
69
exists := func() bool {
70
t.Helper()
71
out, err := exec.Command("git", "-C", dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name).Output()
72
return err == nil && strings.TrimSpace(string(out)) != ""
73
}
74
recreate := func() {
75
t.Helper()
76
if exists() {
77
return
78
}
79
code, body := call(http.MethodPost, "/api/v1/projects/ada/demo/repository/branches", `{"name":"`+name+`","from":"master"}`)
80
if code != 201 {
81
t.Fatalf("aanmaken %d %s", code, body)
82
}
83
}
84
deleteAt := func(path, confirm string, status int) {
85
t.Helper()
86
recreate()
87
code, body := call(http.MethodDelete, path, `{"confirm":"`+confirm+`"}`)
88
if code != status {
89
t.Fatalf("DELETE %s confirm %q: %d %s", path, confirm, code, body)
90
}
91
}
92
base := "/api/v1/projects/ada/demo/repository/branches/"
93
deleteAt(base+"cursor/api-schemas-65da", name, http.StatusNoContent)
94
if exists() {
95
t.Fatal("letterlijke slash hoort de branch te verwijderen")
96
}
97
deleteAt(base+"cursor%2Fapi-schemas-65da", name, http.StatusNoContent)
98
if exists() {
99
t.Fatal("procent-2F hoort de branch te verwijderen")
100
}
101
deleteAt(base+"cursor%2Fapi-schemas-65da", "cursor%2Fapi-schemas-65da", http.StatusNoContent)
102
if exists() {
103
t.Fatal("gecodeerde bevestiging hoort ook te werken")
104
}
105
deleteAt(base+"cursor%252Fapi-schemas-65da", name, http.StatusNoContent)
106
if exists() {
107
t.Fatal("dubbel gecodeerde slash hoort de branch te verwijderen")
108
}
109
deleteAt(base+"cursor%2Fapi-schemas-65da", "andere-tak", http.StatusBadRequest)
110
if !exists() {
111
t.Fatal("foute bevestiging mag de branch niet verwijderen")
112
}
113
}
114
115
func TestPushDeletesSourceBranch(t *testing.T) {
116
srv, ts, st := mergeFixServer(t)
117
tim := loginClient(t, ts)
118
token := mintToken(t, tim, ts)
119
work := pushPair(t, ts, token, "weg", "een\n", "twee\n")
120
page := read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
121
_ = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
122
"csrf": {csrfOf(t, page)}, "title": {"Weg"}, "source": {"topic"}, "target": {"master"},
123
"remove_source_branch": {"1"},
124
}))
125
ctx := context.Background()
126
repo, err := st.RepoByPath(ctx, "tim", "weg")
127
if err != nil {
128
t.Fatal(err)
129
}
130
mr, err := st.MergeRequestByNumber(ctx, repo.ID, 1)
131
if err != nil || !mr.RemoveSourceBranch {
132
t.Fatalf("remove_source_branch hoort aan te staan: %+v %v", mr, err)
133
}
134
git(t, work, "checkout", "master")
135
git(t, work, "merge", "--no-edit", "topic")
136
git(t, work, "push", "origin", "master")
137
mr, err = st.MergeRequestByNumber(ctx, repo.ID, 1)
138
if err != nil || mr.Status != "merged" {
139
t.Fatalf("status %s %v", mr.Status, err)
140
}
141
if branchRefExists(t, srv, "tim", "weg", "topic") {
142
t.Fatal("bronbranch hoort weg te zijn")
143
}
144
if !branchRefExists(t, srv, "tim", "weg", "master") {
145
t.Fatal("master hoort te blijven")
146
}
147
}
148
149
func TestPushKeepsSourceBranch(t *testing.T) {
150
srv, ts, st := mergeFixServer(t)
151
tim := loginClient(t, ts)
152
token := mintToken(t, tim, ts)
153
154
work := pushPair(t, ts, token, "blijft", "een\n", "twee\n")
155
page := read(t, mustGet(t, tim, ts.URL+"/tim/blijft/-/merge-requests/new?source=topic&target=master"))
156
_ = read(t, mustPost(t, tim, ts.URL+"/tim/blijft/-/merge-requests", url.Values{
157
"csrf": {csrfOf(t, page)}, "title": {"Blijft"}, "source": {"topic"}, "target": {"master"},
158
}))
159
git(t, work, "checkout", "master")
160
git(t, work, "merge", "--no-edit", "topic")
161
git(t, work, "push", "origin", "master")
162
if !branchRefExists(t, srv, "tim", "blijft", "topic") {
163
t.Fatal("uitgezette remove_source_branch hoort de tak te laten staan")
164
}
165
166
work = pushPair(t, ts, token, "slot", "een\n", "twee\n")
167
page = read(t, mustGet(t, tim, ts.URL+"/tim/slot/-/merge-requests/new?source=topic&target=master"))
168
_ = read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests", url.Values{
169
"csrf": {csrfOf(t, page)}, "title": {"Slot"}, "source": {"topic"}, "target": {"master"},
170
"remove_source_branch": {"1"},
171
}))
172
ctx := context.Background()
173
repo, err := st.RepoByPath(ctx, "tim", "slot")
174
if err != nil {
175
t.Fatal(err)
176
}
177
if err := st.AddProtected(ctx, repo.ID, "topic"); err != nil {
178
t.Fatal(err)
179
}
180
git(t, work, "checkout", "master")
181
git(t, work, "merge", "--no-edit", "topic")
182
git(t, work, "push", "origin", "master")
183
mr, err := st.MergeRequestByNumber(ctx, repo.ID, 1)
184
if err != nil || mr.Status != "merged" {
185
t.Fatalf("protected bron hoort de MR wel merged te zetten: %s %v", mr.Status, err)
186
}
187
if !branchRefExists(t, srv, "tim", "slot", "topic") {
188
t.Fatal("beschermde bronbranch hoort te blijven")
189
}
190
}
191
192
func branchRefExists(t *testing.T, srv *Server, owner, repo, branch string) bool {
193
t.Helper()
194
dir := gitrepo.Dir(srv.StoragePath(), owner, repo)
195
out, err := exec.Command(srv.Git, "-C", dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+branch).Output()
196
return err == nil && strings.TrimSpace(string(out)) != ""
197
}
@@ -0,0 +1,197 @@1
package server2
3
import (4
"context"5
"net/http"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/gitrepo"16
"gitlab.com/Timfa/bluegit/internal/store"17
)18
19
func TestDeleteBranchWithSlash(t *testing.T) {20
if _, err := exec.LookPath("git"); err != nil {21
t.Skip("git ontbreekt")22
}23
storage := t.TempDir()24
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())25
if err != nil {26
t.Fatal(err)27
}28
t.Cleanup(func() { _ = st.Close() })29
ctx := context.Background()30
ada, err := st.UpsertUser(ctx, 1, "ada", "", false)31
if err != nil {32
t.Fatal(err)33
}34
token, _, err := st.IssueToken(ctx, ada.ID, store.TokenRequest{Name: "ada", Scopes: "api"})35
if err != nil {36
t.Fatal(err)37
}38
cfg := config.Config{39
BaseURL: "http://127.0.0.1:9", StoragePath: storage,40
Auth: config.Auth{Mode: "dev", DevUser: "ada", DevAuthID: 1},41
Git: config.Git{Binary: "git", DefaultBranch: "master"},42
}43
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "ada", AuthID: 1}, Git: "git", HookBin: "/bin/true", StateDir: t.TempDir()}44
ts := httptest.NewServer(srv.Handler())45
t.Cleanup(ts.Close)46
47
call := func(method, path, body string) (int, string) {48
t.Helper()49
req, err := http.NewRequest(method, ts.URL+path, strings.NewReader(body))50
if err != nil {51
t.Fatal(err)52
}53
req.Header.Set("Authorization", "Bearer "+token)54
if body != "" {55
req.Header.Set("Content-Type", "application/json")56
}57
res, err := http.DefaultClient.Do(req)58
if err != nil {59
t.Fatal(err)60
}61
return res.StatusCode, read(t, res)62
}63
code, body := call(http.MethodPost, "/api/v1/projects", `{"name":"demo","visibility":"public","initialize_with_readme":true}`)64
if code != 201 {65
t.Fatalf("project %d %s", code, body)66
}67
const name = "cursor/api-schemas-65da"68
dir := gitrepo.Dir(storage, "ada", "demo")69
exists := func() bool {70
t.Helper()71
out, err := exec.Command("git", "-C", dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name).Output()72
return err == nil && strings.TrimSpace(string(out)) != ""73
}74
recreate := func() {75
t.Helper()76
if exists() {77
return78
}79
code, body := call(http.MethodPost, "/api/v1/projects/ada/demo/repository/branches", `{"name":"`+name+`","from":"master"}`)80
if code != 201 {81
t.Fatalf("aanmaken %d %s", code, body)82
}83
}84
deleteAt := func(path, confirm string, status int) {85
t.Helper()86
recreate()87
code, body := call(http.MethodDelete, path, `{"confirm":"`+confirm+`"}`)88
if code != status {89
t.Fatalf("DELETE %s confirm %q: %d %s", path, confirm, code, body)90
}91
}92
base := "/api/v1/projects/ada/demo/repository/branches/"93
deleteAt(base+"cursor/api-schemas-65da", name, http.StatusNoContent)94
if exists() {95
t.Fatal("letterlijke slash hoort de branch te verwijderen")96
}97
deleteAt(base+"cursor%2Fapi-schemas-65da", name, http.StatusNoContent)98
if exists() {99
t.Fatal("procent-2F hoort de branch te verwijderen")100
}101
deleteAt(base+"cursor%2Fapi-schemas-65da", "cursor%2Fapi-schemas-65da", http.StatusNoContent)102
if exists() {103
t.Fatal("gecodeerde bevestiging hoort ook te werken")104
}105
deleteAt(base+"cursor%252Fapi-schemas-65da", name, http.StatusNoContent)106
if exists() {107
t.Fatal("dubbel gecodeerde slash hoort de branch te verwijderen")108
}109
deleteAt(base+"cursor%2Fapi-schemas-65da", "andere-tak", http.StatusBadRequest)110
if !exists() {111
t.Fatal("foute bevestiging mag de branch niet verwijderen")112
}113
}114
115
func TestPushDeletesSourceBranch(t *testing.T) {116
srv, ts, st := mergeFixServer(t)117
tim := loginClient(t, ts)118
token := mintToken(t, tim, ts)119
work := pushPair(t, ts, token, "weg", "een\n", "twee\n")120
page := read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))121
_ = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{122
"csrf": {csrfOf(t, page)}, "title": {"Weg"}, "source": {"topic"}, "target": {"master"},123
"remove_source_branch": {"1"},124
}))125
ctx := context.Background()126
repo, err := st.RepoByPath(ctx, "tim", "weg")127
if err != nil {128
t.Fatal(err)129
}130
mr, err := st.MergeRequestByNumber(ctx, repo.ID, 1)131
if err != nil || !mr.RemoveSourceBranch {132
t.Fatalf("remove_source_branch hoort aan te staan: %+v %v", mr, err)133
}134
git(t, work, "checkout", "master")135
git(t, work, "merge", "--no-edit", "topic")136
git(t, work, "push", "origin", "master")137
mr, err = st.MergeRequestByNumber(ctx, repo.ID, 1)138
if err != nil || mr.Status != "merged" {139
t.Fatalf("status %s %v", mr.Status, err)140
}141
if branchRefExists(t, srv, "tim", "weg", "topic") {142
t.Fatal("bronbranch hoort weg te zijn")143
}144
if !branchRefExists(t, srv, "tim", "weg", "master") {145
t.Fatal("master hoort te blijven")146
}147
}148
149
func TestPushKeepsSourceBranch(t *testing.T) {150
srv, ts, st := mergeFixServer(t)151
tim := loginClient(t, ts)152
token := mintToken(t, tim, ts)153
154
work := pushPair(t, ts, token, "blijft", "een\n", "twee\n")155
page := read(t, mustGet(t, tim, ts.URL+"/tim/blijft/-/merge-requests/new?source=topic&target=master"))156
_ = read(t, mustPost(t, tim, ts.URL+"/tim/blijft/-/merge-requests", url.Values{157
"csrf": {csrfOf(t, page)}, "title": {"Blijft"}, "source": {"topic"}, "target": {"master"},158
}))159
git(t, work, "checkout", "master")160
git(t, work, "merge", "--no-edit", "topic")161
git(t, work, "push", "origin", "master")162
if !branchRefExists(t, srv, "tim", "blijft", "topic") {163
t.Fatal("uitgezette remove_source_branch hoort de tak te laten staan")164
}165
166
work = pushPair(t, ts, token, "slot", "een\n", "twee\n")167
page = read(t, mustGet(t, tim, ts.URL+"/tim/slot/-/merge-requests/new?source=topic&target=master"))168
_ = read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests", url.Values{169
"csrf": {csrfOf(t, page)}, "title": {"Slot"}, "source": {"topic"}, "target": {"master"},170
"remove_source_branch": {"1"},171
}))172
ctx := context.Background()173
repo, err := st.RepoByPath(ctx, "tim", "slot")174
if err != nil {175
t.Fatal(err)176
}177
if err := st.AddProtected(ctx, repo.ID, "topic"); err != nil {178
t.Fatal(err)179
}180
git(t, work, "checkout", "master")181
git(t, work, "merge", "--no-edit", "topic")182
git(t, work, "push", "origin", "master")183
mr, err := st.MergeRequestByNumber(ctx, repo.ID, 1)184
if err != nil || mr.Status != "merged" {185
t.Fatalf("protected bron hoort de MR wel merged te zetten: %s %v", mr.Status, err)186
}187
if !branchRefExists(t, srv, "tim", "slot", "topic") {188
t.Fatal("beschermde bronbranch hoort te blijven")189
}190
}191
192
func branchRefExists(t *testing.T, srv *Server, owner, repo, branch string) bool {193
t.Helper()194
dir := gitrepo.Dir(srv.StoragePath(), owner, repo)195
out, err := exec.Command(srv.Git, "-C", dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+branch).Output()196
return err == nil && strings.TrimSpace(string(out)) != ""197
}@@ -48,6 +48,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
48
48
return
49
49
}
50
50
actor := user.Username
51
var drop []mergedSource
51
52
for ref, sha := range after {
52
53
if before[ref] == sha || isZero(sha) {
53
54
continue
@@ -67,7 +68,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
67
68
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
68
69
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])
69
70
s.recordMRPushes(repo, user, branch, before[ref], sha)
70
s.markContainedMRs(repo, user, branch, sha)
71
drop = append(drop, s.markContainedMRs(repo, user, branch, sha)...)
71
72
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
72
73
s.pushHook(repo, actor, ref, before[ref], sha)
73
74
if branch == repo.DefaultBranch {
@@ -85,6 +86,9 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
85
86
}
86
87
s.pushHook(repo, actor, ref, old, strings.Repeat("0", 40))
87
88
}
89
// Pas na de push zelf de bronbranch weghalen. Doen we dat midden in de
90
// lus, dan kan dezelfde push de tak nog als nieuwe ref behandelen.
91
s.dropMergedSources(repo, drop)
88
92
}
89
93
90
94
func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {
@@ -331,19 +335,23 @@ func urlParse(raw string) (*url.URL, error) {
331
335
// markContainedMRs zet open merge requests op merged wanneer de bron-head
332
336
// al in de zojuist gepushte doelbranch zit. Dat is dezelfde regel als GitLab
333
337
// na een merge die buiten de knop om is gepusht.
334
func (s *Server) markContainedMRs(repo store.Repo, user store.User, branch, sha string) {
338
func (s *Server) markContainedMRs(repo store.Repo, user store.User, branch, sha string) []mergedSource {
335
339
if s.Store == nil || s.StoragePath() == "" || branch == "" || isZero(sha) {
336
return
340
return nil
337
341
}
338
342
ctx := context.Background()
339
343
mrs, err := s.Store.OpenMergeRequestsByTarget(ctx, repo.ID, branch)
340
344
if err != nil {
341
return
345
return nil
342
346
}
343
347
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
348
var drop []mergedSource
344
349
for _, mr := range mrs {
345
s.markIfContained(ctx, repo, user, dir, mr, sha)
350
if item, ok := s.markIfContained(ctx, repo, user, dir, mr, sha, true); ok {
351
drop = append(drop, item)
352
}
346
353
}
354
return drop
347
355
}
348
356
349
357
// absorbMergedMRs doet dezelfde controle bij het openen van een pagina,
@@ -361,17 +369,17 @@ func (s *Server) absorbMergedMRs(ctx context.Context, repo store.Repo) {
361
369
if mr.Status != "open" {
362
370
continue
363
371
}
364
s.markIfContained(ctx, repo, store.User{}, dir, mr, "")
372
s.markIfContained(ctx, repo, store.User{}, dir, mr, "", false)
365
373
}
366
374
}
367
375
368
func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user store.User, dir string, mr store.MergeRequest, targetSHA string) {
376
func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user store.User, dir string, mr store.MergeRequest, targetSHA string, deferDrop bool) (mergedSource, bool) {
369
377
if targetSHA == "" {
370
378
targetSHA = gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.TargetBranch)
371
379
}
372
380
src := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.SourceBranch)
373
381
if src == "" || targetSHA == "" || !gitrepo.IsAncestor(ctx, s.Git, dir, src, targetSHA) {
374
return
382
return mergedSource{}, false
375
383
}
376
384
if user.ID == 0 {
377
385
if pushers, err := s.Store.PushersBySHA(ctx, repo.ID, []string{targetSHA}); err == nil {
@@ -381,12 +389,24 @@ func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user stor
381
389
}
382
390
}
383
391
if err := s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged"); err != nil {
384
return
392
return mergedSource{}, false
385
393
}
386
394
_ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")
387
395
mr.Status = "merged"
388
396
s.mrHook(repo, mr, user.Username, "merged", "")
389
397
s.closeMergedMR(ctx, repo, user, mr)
398
plan, ok := s.mergedSourcePlan(ctx, repo, user, mr)
399
if !ok {
400
return mergedSource{}, false
401
}
402
if _, merging := s.mergingMR.Load(mr.ID); merging {
403
return mergedSource{}, false
404
}
405
if deferDrop {
406
return plan, true
407
}
408
s.deleteMergedSource(ctx, plan.user, plan.role, repo, plan.name)
409
return mergedSource{}, false
390
410
}
391
411
392
412
func (s *Server) closeMergedMR(ctx context.Context, repo store.Repo, user store.User, mr store.MergeRequest) {
@@ -48,6 +48,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s48
return48
return49
}49
}50
actor := user.Username50
actor := user.Username51
var drop []mergedSource51
for ref, sha := range after {52
for ref, sha := range after {52
if before[ref] == sha || isZero(sha) {53
if before[ref] == sha || isZero(sha) {53
continue54
continue@@ -67,7 +68,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s67
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)68
s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)68
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])69
s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])69
s.recordMRPushes(repo, user, branch, before[ref], sha)70
s.recordMRPushes(repo, user, branch, before[ref], sha)70
s.markContainedMRs(repo, user, branch, sha)71
drop = append(drop, s.markContainedMRs(repo, user, branch, sha)...)71
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)72
s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)72
s.pushHook(repo, actor, ref, before[ref], sha)73
s.pushHook(repo, actor, ref, before[ref], sha)73
if branch == repo.DefaultBranch {74
if branch == repo.DefaultBranch {@@ -85,6 +86,9 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s85
}86
}86
s.pushHook(repo, actor, ref, old, strings.Repeat("0", 40))87
s.pushHook(repo, actor, ref, old, strings.Repeat("0", 40))87
}88
}89
// Pas na de push zelf de bronbranch weghalen. Doen we dat midden in de90
// lus, dan kan dezelfde push de tak nog als nieuwe ref behandelen.91
s.dropMergedSources(repo, drop)88
}92
}89
93
90
func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {94
func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {@@ -331,19 +335,23 @@ func urlParse(raw string) (*url.URL, error) {331
// markContainedMRs zet open merge requests op merged wanneer de bron-head335
// markContainedMRs zet open merge requests op merged wanneer de bron-head332
// al in de zojuist gepushte doelbranch zit. Dat is dezelfde regel als GitLab336
// al in de zojuist gepushte doelbranch zit. Dat is dezelfde regel als GitLab333
// na een merge die buiten de knop om is gepusht.337
// na een merge die buiten de knop om is gepusht.334
func (s *Server) markContainedMRs(repo store.Repo, user store.User, branch, sha string) {338
func (s *Server) markContainedMRs(repo store.Repo, user store.User, branch, sha string) []mergedSource {335
if s.Store == nil || s.StoragePath() == "" || branch == "" || isZero(sha) {339
if s.Store == nil || s.StoragePath() == "" || branch == "" || isZero(sha) {336
return340
return nil337
}341
}338
ctx := context.Background()342
ctx := context.Background()339
mrs, err := s.Store.OpenMergeRequestsByTarget(ctx, repo.ID, branch)343
mrs, err := s.Store.OpenMergeRequestsByTarget(ctx, repo.ID, branch)340
if err != nil {344
if err != nil {341
return345
return nil342
}346
}343
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)347
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)348
var drop []mergedSource344
for _, mr := range mrs {349
for _, mr := range mrs {345
s.markIfContained(ctx, repo, user, dir, mr, sha)350
if item, ok := s.markIfContained(ctx, repo, user, dir, mr, sha, true); ok {351
drop = append(drop, item)352
}346
}353
}354
return drop347
}355
}348
356
349
// absorbMergedMRs doet dezelfde controle bij het openen van een pagina,357
// absorbMergedMRs doet dezelfde controle bij het openen van een pagina,@@ -361,17 +369,17 @@ func (s *Server) absorbMergedMRs(ctx context.Context, repo store.Repo) {361
if mr.Status != "open" {369
if mr.Status != "open" {362
continue370
continue363
}371
}364
s.markIfContained(ctx, repo, store.User{}, dir, mr, "")372
s.markIfContained(ctx, repo, store.User{}, dir, mr, "", false)365
}373
}366
}374
}367
375
368
func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user store.User, dir string, mr store.MergeRequest, targetSHA string) {376
func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user store.User, dir string, mr store.MergeRequest, targetSHA string, deferDrop bool) (mergedSource, bool) {369
if targetSHA == "" {377
if targetSHA == "" {370
targetSHA = gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.TargetBranch)378
targetSHA = gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.TargetBranch)371
}379
}372
src := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.SourceBranch)380
src := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "refs/heads/"+mr.SourceBranch)373
if src == "" || targetSHA == "" || !gitrepo.IsAncestor(ctx, s.Git, dir, src, targetSHA) {381
if src == "" || targetSHA == "" || !gitrepo.IsAncestor(ctx, s.Git, dir, src, targetSHA) {374
return382
return mergedSource{}, false375
}383
}376
if user.ID == 0 {384
if user.ID == 0 {377
if pushers, err := s.Store.PushersBySHA(ctx, repo.ID, []string{targetSHA}); err == nil {385
if pushers, err := s.Store.PushersBySHA(ctx, repo.ID, []string{targetSHA}); err == nil {@@ -381,12 +389,24 @@ func (s *Server) markIfContained(ctx context.Context, repo store.Repo, user stor381
}389
}382
}390
}383
if err := s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged"); err != nil {391
if err := s.Store.SetMergeRequestStatus(ctx, mr.ID, "merged"); err != nil {384
return392
return mergedSource{}, false385
}393
}386
_ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")394
_ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "merged", "")387
mr.Status = "merged"395
mr.Status = "merged"388
s.mrHook(repo, mr, user.Username, "merged", "")396
s.mrHook(repo, mr, user.Username, "merged", "")389
s.closeMergedMR(ctx, repo, user, mr)397
s.closeMergedMR(ctx, repo, user, mr)398
plan, ok := s.mergedSourcePlan(ctx, repo, user, mr)399
if !ok {400
return mergedSource{}, false401
}402
if _, merging := s.mergingMR.Load(mr.ID); merging {403
return mergedSource{}, false404
}405
if deferDrop {406
return plan, true407
}408
s.deleteMergedSource(ctx, plan.user, plan.role, repo, plan.name)409
return mergedSource{}, false390
}410
}391
411
392
func (s *Server) closeMergedMR(ctx context.Context, repo store.Repo, user store.User, mr store.MergeRequest) {412
func (s *Server) closeMergedMR(ctx context.Context, repo store.Repo, user store.User, mr store.MergeRequest) {@@ -2,6 +2,7 @@ package server
2
2
3
3
import (
4
4
"context"
5
"net/url"
5
6
"os"
6
7
"strings"
7
8
@@ -12,6 +13,21 @@ import (
12
13
"gitlab.com/Timfa/bluegit/internal/store"
13
14
)
14
15
16
// decodeBranch maakt een branchnaam uit een pad of een bevestiging.
17
// ServeMux decodeert %2F één keer. Een client die de slash nóg een keer
18
// encodeert (%252F) levert anders cursor%2F… en de bevestiging wijkt af.
19
func decodeBranch(raw string) string {
20
name := strings.TrimSpace(raw)
21
for i := 0; i < 3; i++ {
22
next, err := url.PathUnescape(name)
23
if err != nil || next == name {
24
return name
25
}
26
name = next
27
}
28
return name
29
}
30
15
31
func (s *Server) repoRole(ctx context.Context, user store.User, repo store.Repo) (access.Role, error) {
16
32
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)
17
33
if err != nil {
@@ -67,7 +83,8 @@ func (s *Server) opDeleteBranch(ctx context.Context, user store.User, repo store
67
83
if !role.CanWriteCode() {
68
84
return fail(403, i18n.E("err.forbidden"))
69
85
}
70
name = strings.TrimSpace(name)
86
name = decodeBranch(name)
87
confirm = decodeBranch(confirm)
71
88
if confirm != name || name == "" {
72
89
return fail(400, i18n.E("err.branchConfirm"))
73
90
}
@@ -91,8 +108,9 @@ func (s *Server) opRenameBranch(ctx context.Context, user store.User, repo store
91
108
if !role.CanWriteCode() {
92
109
return fail(403, i18n.E("err.forbidden"))
93
110
}
94
name = strings.TrimSpace(name)
95
newName = strings.TrimSpace(newName)
111
name = decodeBranch(name)
112
newName = decodeBranch(newName)
113
confirm = decodeBranch(confirm)
96
114
if confirm != name || name == "" {
97
115
return fail(400, i18n.E("err.branchConfirm"))
98
116
}
@@ -2,6 +2,7 @@ package server2
2
3
import (3
import (4
"context"4
"context"5
"net/url"5
"os"6
"os"6
"strings"7
"strings"7
8
@@ -12,6 +13,21 @@ import (12
"gitlab.com/Timfa/bluegit/internal/store"13
"gitlab.com/Timfa/bluegit/internal/store"13
)14
)14
15
16
// decodeBranch maakt een branchnaam uit een pad of een bevestiging.17
// ServeMux decodeert %2F één keer. Een client die de slash nóg een keer18
// encodeert (%252F) levert anders cursor%2F… en de bevestiging wijkt af.19
func decodeBranch(raw string) string {20
name := strings.TrimSpace(raw)21
for i := 0; i < 3; i++ {22
next, err := url.PathUnescape(name)23
if err != nil || next == name {24
return name25
}26
name = next27
}28
return name29
}30
15
func (s *Server) repoRole(ctx context.Context, user store.User, repo store.Repo) (access.Role, error) {31
func (s *Server) repoRole(ctx context.Context, user store.User, repo store.Repo) (access.Role, error) {16
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)32
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)17
if err != nil {33
if err != nil {@@ -67,7 +83,8 @@ func (s *Server) opDeleteBranch(ctx context.Context, user store.User, repo store67
if !role.CanWriteCode() {83
if !role.CanWriteCode() {68
return fail(403, i18n.E("err.forbidden"))84
return fail(403, i18n.E("err.forbidden"))69
}85
}70
name = strings.TrimSpace(name)86
name = decodeBranch(name)87
confirm = decodeBranch(confirm)71
if confirm != name || name == "" {88
if confirm != name || name == "" {72
return fail(400, i18n.E("err.branchConfirm"))89
return fail(400, i18n.E("err.branchConfirm"))73
}90
}@@ -91,8 +108,9 @@ func (s *Server) opRenameBranch(ctx context.Context, user store.User, repo store91
if !role.CanWriteCode() {108
if !role.CanWriteCode() {92
return fail(403, i18n.E("err.forbidden"))109
return fail(403, i18n.E("err.forbidden"))93
}110
}94
name = strings.TrimSpace(name)111
name = decodeBranch(name)95
newName = strings.TrimSpace(newName)112
newName = decodeBranch(newName)113
confirm = decodeBranch(confirm)96
if confirm != name || name == "" {114
if confirm != name || name == "" {97
return fail(400, i18n.E("err.branchConfirm"))115
return fail(400, i18n.E("err.branchConfirm"))98
}116
}@@ -334,6 +334,8 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
334
334
msg = mr.Title
335
335
}
336
336
}
337
s.mergingMR.Store(mr.ID, true)
338
defer s.mergingMR.Delete(mr.ID)
337
339
if err := s.postReceive(ctx, repo, user, dir, func() error {
338
340
return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, squash, role, patterns)
339
341
}); err != nil {
@@ -375,6 +377,44 @@ func sourceDeleteSkip(role access.Role, defaultBranch, name string, exists, prot
375
377
return ""
376
378
}
377
379
380
// mergedSource is een bronbranch die na een gedetecteerde merge weg mag.
381
type mergedSource struct {
382
user store.User
383
role access.Role
384
name string
385
}
386
387
// mergedSourcePlan zegt of deze merge de bronbranch hoort te verwijderen.
388
// De voorwaarden zijn dezelfde als bij de mergeknop: de tak staat in deze
389
// repo, is niet protected of de default, en de pusher mag code schrijven.
390
func (s *Server) mergedSourcePlan(ctx context.Context, repo store.Repo, user store.User, mr store.MergeRequest) (mergedSource, bool) {
391
if !mr.RemoveSourceBranch || user.ID == 0 {
392
return mergedSource{}, false
393
}
394
name := strings.TrimSpace(mr.SourceBranch)
395
if name == "" || name == strings.TrimSpace(mr.TargetBranch) {
396
return mergedSource{}, false
397
}
398
role, err := s.repoRole(ctx, user, repo)
399
if err != nil {
400
return mergedSource{}, false
401
}
402
return mergedSource{user: user, role: role, name: name}, true
403
}
404
405
// dropMergedSources verwijdert bronbranches nadat de push zelf klaar is.
406
func (s *Server) dropMergedSources(repo store.Repo, list []mergedSource) {
407
seen := map[string]bool{}
408
ctx := context.Background()
409
for _, item := range list {
410
if item.name == "" || seen[item.name] {
411
continue
412
}
413
seen[item.name] = true
414
s.deleteMergedSource(ctx, item.user, item.role, repo, item.name)
415
}
416
}
417
378
418
// deleteMergedSource haalt de bronbranch weg na een geslaagde merge.
379
419
// Dat is een eigen push, zodat een mislukte verwijdering de merge-webhook niet uitwist.
380
420
func (s *Server) deleteMergedSource(ctx context.Context, user store.User, role access.Role, repo store.Repo, name string) (skip string, deleted bool) {
@@ -334,6 +334,8 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu334
msg = mr.Title334
msg = mr.Title335
}335
}336
}336
}337
s.mergingMR.Store(mr.ID, true)338
defer s.mergingMR.Delete(mr.ID)337
if err := s.postReceive(ctx, repo, user, dir, func() error {339
if err := s.postReceive(ctx, repo, user, dir, func() error {338
return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, squash, role, patterns)340
return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, squash, role, patterns)339
}); err != nil {341
}); err != nil {@@ -375,6 +377,44 @@ func sourceDeleteSkip(role access.Role, defaultBranch, name string, exists, prot375
return ""377
return ""376
}378
}377
379
380
// mergedSource is een bronbranch die na een gedetecteerde merge weg mag.381
type mergedSource struct {382
user store.User383
role access.Role384
name string385
}386
387
// mergedSourcePlan zegt of deze merge de bronbranch hoort te verwijderen.388
// De voorwaarden zijn dezelfde als bij de mergeknop: de tak staat in deze389
// repo, is niet protected of de default, en de pusher mag code schrijven.390
func (s *Server) mergedSourcePlan(ctx context.Context, repo store.Repo, user store.User, mr store.MergeRequest) (mergedSource, bool) {391
if !mr.RemoveSourceBranch || user.ID == 0 {392
return mergedSource{}, false393
}394
name := strings.TrimSpace(mr.SourceBranch)395
if name == "" || name == strings.TrimSpace(mr.TargetBranch) {396
return mergedSource{}, false397
}398
role, err := s.repoRole(ctx, user, repo)399
if err != nil {400
return mergedSource{}, false401
}402
return mergedSource{user: user, role: role, name: name}, true403
}404
405
// dropMergedSources verwijdert bronbranches nadat de push zelf klaar is.406
func (s *Server) dropMergedSources(repo store.Repo, list []mergedSource) {407
seen := map[string]bool{}408
ctx := context.Background()409
for _, item := range list {410
if item.name == "" || seen[item.name] {411
continue412
}413
seen[item.name] = true414
s.deleteMergedSource(ctx, item.user, item.role, repo, item.name)415
}416
}417
378
// deleteMergedSource haalt de bronbranch weg na een geslaagde merge.418
// deleteMergedSource haalt de bronbranch weg na een geslaagde merge.379
// Dat is een eigen push, zodat een mislukte verwijdering de merge-webhook niet uitwist.419
// Dat is een eigen push, zodat een mislukte verwijdering de merge-webhook niet uitwist.380
func (s *Server) deleteMergedSource(ctx context.Context, user store.User, role access.Role, repo store.Repo, name string) (skip string, deleted bool) {420
func (s *Server) deleteMergedSource(ctx context.Context, user store.User, role access.Role, repo store.Repo, name string) (skip string, deleted bool) {@@ -58,6 +58,9 @@ type Server struct {
58
58
storage string
59
59
storageSet bool
60
60
cards *card.Cache
61
// mergingMR zijn merge requests die opMergeMR nu zelf afrondt.
62
// AfterPush mag hun bronbranch niet alvast verwijderen.
63
mergingMR sync.Map
61
64
}
62
65
63
66
type principal struct {
@@ -58,6 +58,9 @@ type Server struct {58
storage string58
storage string59
storageSet bool59
storageSet bool60
cards *card.Cache60
cards *card.Cache61
// mergingMR zijn merge requests die opMergeMR nu zelf afrondt.62
// AfterPush mag hun bronbranch niet alvast verwijderen.63
mergingMR sync.Map61
}64
}62
65
63
type principal struct {66
type principal struct {