BlueGit

timfa bluegit

Merge branch 'cursor/merge-opts-65da' into 'master'

feat: squash en bronbranch verwijderen bij een merge request

See merge request Timfa/bluegit!49

timfa Tim Falken · pushed by timfa

Authored 2026-10-23 · 3 weeks ago

Hash
4c362d0efe8aaf3a5beb85917e851b334cdf02cf
Pipeline
Passed
14 files changed +716 −52
internal/gitrepo/repo.go +10 −2
@@ -720,8 +720,9 @@ func BranchOfRef(ref string) (string, bool) {
720 720 }
721 721
722 722 // Merge voegt source samen in target en pusht het resultaat.
723 // squash maakt één gewone commit met message in plaats van een merge-commit.
723 724 // De push gaat door de hook, dus role en patterns moeten kloppen.
724 func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, role access.Role, patterns []string) error {
725 func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, squash bool, role access.Role, patterns []string) error {
725 726 repo, env, err := prepareWork(work, author, email)
726 727 if err != nil {
727 728 return classifyGit(err)
@@ -733,7 +734,14 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai
733 734 return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
734 735 }
735 736 // De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.
736 if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {
737 if squash {
738 if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--squash", "origin/"+source); err != nil {
739 return i18n.E("err.mergeConflict")
740 }
741 if _, err := run(ctx, gitBin, env, "-C", repo, "commit", "-m", message); err != nil {
742 return classifyGit(err)
743 }
744 } else if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {
737 745 return i18n.E("err.mergeConflict")
738 746 }
739 747 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
@@ -720,8 +720,9 @@ func BranchOfRef(ref string) (string, bool) {
720}
720}
721
721
722// Merge voegt source samen in target en pusht het resultaat.
722// Merge voegt source samen in target en pusht het resultaat.
723// squash maakt één gewone commit met message in plaats van een merge-commit.
723// De push gaat door de hook, dus role en patterns moeten kloppen.
724// De push gaat door de hook, dus role en patterns moeten kloppen.
724func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, role access.Role, patterns []string) error {
725func Merge(ctx context.Context, gitBin, bare, work, source, target, author, email, message string, squash bool, role access.Role, patterns []string) error {
725 repo, env, err := prepareWork(work, author, email)
726 repo, env, err := prepareWork(work, author, email)
726 if err != nil {
727 if err != nil {
727 return classifyGit(err)
728 return classifyGit(err)
@@ -733,7 +734,14 @@ func Merge(ctx context.Context, gitBin, bare, work, source, target, author, emai
733 return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
734 return classifyGit(fmt.Errorf("doelbranch %s: %w", target, err))
734 }
735 }
735 // De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.
736 // De kloon heeft de bron alleen als origin/<branch>, niet als lokale branch.
736 if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {
737 if squash {
738 if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--squash", "origin/"+source); err != nil {
739 return i18n.E("err.mergeConflict")
740 }
741 if _, err := run(ctx, gitBin, env, "-C", repo, "commit", "-m", message); err != nil {
742 return classifyGit(err)
743 }
744 } else if _, err := run(ctx, gitBin, env, "-C", repo, "merge", "--no-ff", "--no-edit", "-m", message, "origin/"+source); err != nil {
737 return i18n.E("err.mergeConflict")
745 return i18n.E("err.mergeConflict")
738 }
746 }
739 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
747 pushEnv := append(append([]string{}, env...), PushEnv(role, patterns, nil)...)
internal/i18n/catalog_mergeopts.go added +56 −0
@@ -0,0 +1,56 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, mergeoptsEN)
5 addCatalog(nl, mergeoptsNL)
6 addCatalog(de, mergeoptsDE)
7 addCatalog(fr, mergeoptsFR)
8 }
9
10 var mergeoptsEN = map[string]string{
11 "mr.remove.on": "Delete source branch after merge",
12 "mr.squash.on": "Squash commits",
13 "mr.squash.message": "Squash commit message",
14 "flash.mergedDeleted": "Merged and deleted branch %s.",
15 "flash.mergedKeptProtected": "Merged. Branch %s stays because it is protected.",
16 "flash.mergedKeptDefault": "Merged. Branch %s stays because it is the default branch.",
17 "flash.mergedKeptRights": "Merged. Branch %s stays because you cannot push to it.",
18 "flash.mergedKeptMissing": "Merged. Branch %s stays because it is not in this repository.",
19 "flash.mergedKeptError": "Merged. Branch %s could not be deleted.",
20 }
21
22 var mergeoptsNL = map[string]string{
23 "mr.remove.on": "Bronbranch verwijderen na merge",
24 "mr.squash.on": "Commits squashen",
25 "mr.squash.message": "Squash-commitbericht",
26 "flash.mergedDeleted": "Samengevoegd en branch %s verwijderd.",
27 "flash.mergedKeptProtected": "Samengevoegd. Branch %s blijft staan omdat die beschermd is.",
28 "flash.mergedKeptDefault": "Samengevoegd. Branch %s blijft staan omdat dat de standaardbranch is.",
29 "flash.mergedKeptRights": "Samengevoegd. Branch %s blijft staan omdat je er niet naartoe mag pushen.",
30 "flash.mergedKeptMissing": "Samengevoegd. Branch %s blijft staan omdat die niet in deze repository staat.",
31 "flash.mergedKeptError": "Samengevoegd. Branch %s kon niet verwijderd worden.",
32 }
33
34 var mergeoptsDE = map[string]string{
35 "mr.remove.on": "Quellbranch nach dem Merge löschen",
36 "mr.squash.on": "Commits squashen",
37 "mr.squash.message": "Squash-Commit-Nachricht",
38 "flash.mergedDeleted": "Zusammengeführt und Branch %s gelöscht.",
39 "flash.mergedKeptProtected": "Zusammengeführt. Branch %s bleibt, weil er geschützt ist.",
40 "flash.mergedKeptDefault": "Zusammengeführt. Branch %s bleibt, weil es der Standardbranch ist.",
41 "flash.mergedKeptRights": "Zusammengeführt. Branch %s bleibt, weil du nicht dorthin pushen darfst.",
42 "flash.mergedKeptMissing": "Zusammengeführt. Branch %s bleibt, weil er nicht in diesem Repository liegt.",
43 "flash.mergedKeptError": "Zusammengeführt. Branch %s konnte nicht gelöscht werden.",
44 }
45
46 var mergeoptsFR = map[string]string{
47 "mr.remove.on": "Supprimer la branche source après la fusion",
48 "mr.squash.on": "Compresser les commits",
49 "mr.squash.message": "Message du commit compressé",
50 "flash.mergedDeleted": "Fusionné et branche %s supprimée.",
51 "flash.mergedKeptProtected": "Fusionné. La branche %s reste, car elle est protégée.",
52 "flash.mergedKeptDefault": "Fusionné. La branche %s reste, car elle est la branche par défaut.",
53 "flash.mergedKeptRights": "Fusionné. La branche %s reste, car vous ne pouvez pas y pousser.",
54 "flash.mergedKeptMissing": "Fusionné. La branche %s reste, car ce dépôt ne la contient pas.",
55 "flash.mergedKeptError": "Fusionné. Impossible de supprimer la branche %s.",
56 }
@@ -0,0 +1,56 @@
1package i18n
2
3func init() {
4 addCatalog(en, mergeoptsEN)
5 addCatalog(nl, mergeoptsNL)
6 addCatalog(de, mergeoptsDE)
7 addCatalog(fr, mergeoptsFR)
8}
9
10var mergeoptsEN = map[string]string{
11 "mr.remove.on": "Delete source branch after merge",
12 "mr.squash.on": "Squash commits",
13 "mr.squash.message": "Squash commit message",
14 "flash.mergedDeleted": "Merged and deleted branch %s.",
15 "flash.mergedKeptProtected": "Merged. Branch %s stays because it is protected.",
16 "flash.mergedKeptDefault": "Merged. Branch %s stays because it is the default branch.",
17 "flash.mergedKeptRights": "Merged. Branch %s stays because you cannot push to it.",
18 "flash.mergedKeptMissing": "Merged. Branch %s stays because it is not in this repository.",
19 "flash.mergedKeptError": "Merged. Branch %s could not be deleted.",
20}
21
22var mergeoptsNL = map[string]string{
23 "mr.remove.on": "Bronbranch verwijderen na merge",
24 "mr.squash.on": "Commits squashen",
25 "mr.squash.message": "Squash-commitbericht",
26 "flash.mergedDeleted": "Samengevoegd en branch %s verwijderd.",
27 "flash.mergedKeptProtected": "Samengevoegd. Branch %s blijft staan omdat die beschermd is.",
28 "flash.mergedKeptDefault": "Samengevoegd. Branch %s blijft staan omdat dat de standaardbranch is.",
29 "flash.mergedKeptRights": "Samengevoegd. Branch %s blijft staan omdat je er niet naartoe mag pushen.",
30 "flash.mergedKeptMissing": "Samengevoegd. Branch %s blijft staan omdat die niet in deze repository staat.",
31 "flash.mergedKeptError": "Samengevoegd. Branch %s kon niet verwijderd worden.",
32}
33
34var mergeoptsDE = map[string]string{
35 "mr.remove.on": "Quellbranch nach dem Merge löschen",
36 "mr.squash.on": "Commits squashen",
37 "mr.squash.message": "Squash-Commit-Nachricht",
38 "flash.mergedDeleted": "Zusammengeführt und Branch %s gelöscht.",
39 "flash.mergedKeptProtected": "Zusammengeführt. Branch %s bleibt, weil er geschützt ist.",
40 "flash.mergedKeptDefault": "Zusammengeführt. Branch %s bleibt, weil es der Standardbranch ist.",
41 "flash.mergedKeptRights": "Zusammengeführt. Branch %s bleibt, weil du nicht dorthin pushen darfst.",
42 "flash.mergedKeptMissing": "Zusammengeführt. Branch %s bleibt, weil er nicht in diesem Repository liegt.",
43 "flash.mergedKeptError": "Zusammengeführt. Branch %s konnte nicht gelöscht werden.",
44}
45
46var mergeoptsFR = map[string]string{
47 "mr.remove.on": "Supprimer la branche source après la fusion",
48 "mr.squash.on": "Compresser les commits",
49 "mr.squash.message": "Message du commit compressé",
50 "flash.mergedDeleted": "Fusionné et branche %s supprimée.",
51 "flash.mergedKeptProtected": "Fusionné. La branche %s reste, car elle est protégée.",
52 "flash.mergedKeptDefault": "Fusionné. La branche %s reste, car elle est la branche par défaut.",
53 "flash.mergedKeptRights": "Fusionné. La branche %s reste, car vous ne pouvez pas y pousser.",
54 "flash.mergedKeptMissing": "Fusionné. La branche %s reste, car ce dépôt ne la contient pas.",
55 "flash.mergedKeptError": "Fusionné. Impossible de supprimer la branche %s.",
56}
internal/server/api_flow.go +67 −11
@@ -16,7 +16,9 @@ func mrJSON(mr store.MergeRequest) map[string]any {
16 16 "id": mr.ID, "iid": mr.Number, "title": mr.Title, "description": mr.Description,
17 17 "source_branch": mr.SourceBranch, "target_branch": mr.TargetBranch,
18 18 "author": mr.Author, "state": mr.Status, "draft": mr.Draft, "labels": mr.Labels,
19 "created_at": rfcTime(mr.CreatedAt), "updated_at": rfcTime(mr.UpdatedAt),
19 "remove_source_branch": mr.RemoveSourceBranch, "squash": mr.Squash,
20 "squash_commit_message": mr.SquashMessage,
21 "created_at": rfcTime(mr.CreatedAt), "updated_at": rfcTime(mr.UpdatedAt),
20 22 }
21 23 }
22 24
@@ -27,11 +29,14 @@ func (s *Server) apiMRs(w http.ResponseWriter, r *http.Request) {
27 29 }
28 30 if r.Method == http.MethodPost {
29 31 var body struct {
30 Title string `json:"title"`
31 Description string `json:"description"`
32 SourceBranch string `json:"source_branch"`
33 TargetBranch string `json:"target_branch"`
34 Draft bool `json:"draft"`
32 Title string `json:"title"`
33 Description string `json:"description"`
34 SourceBranch string `json:"source_branch"`
35 TargetBranch string `json:"target_branch"`
36 Draft bool `json:"draft"`
37 Remove *bool `json:"remove_source_branch"`
38 Squash *bool `json:"squash"`
39 Message *string `json:"squash_commit_message"`
35 40 }
36 41 if err := readJSON(r, &body); err != nil {
37 42 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -41,6 +46,23 @@ func (s *Server) apiMRs(w http.ResponseWriter, r *http.Request) {
41 46 if !s.apiOK(w, r, err) {
42 47 return
43 48 }
49 remove, squash, message := true, false, ""
50 if body.Remove != nil {
51 remove = *body.Remove
52 }
53 if body.Squash != nil {
54 squash = *body.Squash
55 }
56 if body.Message != nil {
57 message = *body.Message
58 }
59 if err := s.Store.SetMergeOptions(r.Context(), mr.ID, remove, squash, message); !s.apiOK(w, r, err) {
60 return
61 }
62 mr, err = s.Store.MergeRequestByNumber(r.Context(), repo.ID, mr.Number)
63 if !s.apiOK(w, r, err) {
64 return
65 }
44 66 writeJSON(w, http.StatusCreated, mrJSON(mr))
45 67 return
46 68 }
@@ -68,9 +90,12 @@ func (s *Server) apiMR(w http.ResponseWriter, r *http.Request) {
68 90 }
69 91 if r.Method == http.MethodPut {
70 92 var body struct {
71 Title string `json:"title"`
72 Description string `json:"description"`
73 Labels string `json:"labels"`
93 Title string `json:"title"`
94 Description string `json:"description"`
95 Labels string `json:"labels"`
96 Remove *bool `json:"remove_source_branch"`
97 Squash *bool `json:"squash"`
98 Message *string `json:"squash_commit_message"`
74 99 }
75 100 if err := readJSON(r, &body); err != nil {
76 101 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -80,6 +105,25 @@ func (s *Server) apiMR(w http.ResponseWriter, r *http.Request) {
80 105 if !s.apiOK(w, r, err) {
81 106 return
82 107 }
108 if body.Remove != nil || body.Squash != nil || body.Message != nil {
109 remove, squash, message := mr.RemoveSourceBranch, mr.Squash, mr.SquashMessage
110 if body.Remove != nil {
111 remove = *body.Remove
112 }
113 if body.Squash != nil {
114 squash = *body.Squash
115 }
116 if body.Message != nil {
117 message = *body.Message
118 }
119 if err := s.Store.SetMergeOptions(r.Context(), mr.ID, remove, squash, message); !s.apiOK(w, r, err) {
120 return
121 }
122 mr, err = s.Store.MergeRequestByNumber(r.Context(), repo.ID, mr.Number)
123 if !s.apiOK(w, r, err) {
124 return
125 }
126 }
83 127 writeJSON(w, http.StatusOK, mrJSON(mr))
84 128 return
85 129 }
@@ -222,10 +266,22 @@ func (s *Server) apiMerge(w http.ResponseWriter, r *http.Request) {
222 266 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
223 267 return
224 268 }
225 if !s.apiOK(w, r, s.opMergeMR(r, apiUser(r), repo, n)) {
269 var body struct {
270 Remove *bool `json:"remove_source_branch"`
271 Squash *bool `json:"squash"`
272 Message *string `json:"squash_commit_message"`
273 }
274 if err := readJSON(r, &body); err != nil {
275 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
276 return
277 }
278 out, err := s.opMergeMR(r, apiUser(r), repo, n, mergeChoice{Remove: body.Remove, Squash: body.Squash, Message: body.Message})
279 if !s.apiOK(w, r, err) {
226 280 return
227 281 }
228 writeJSON(w, http.StatusOK, map[string]any{"state": "merged"})
282 writeJSON(w, http.StatusOK, map[string]any{
283 "state": "merged", "source_branch_removed": out.Removed, "source_branch_skip": out.Skip,
284 })
229 285 }
230 286
231 287 func (s *Server) apiCloseMR(w http.ResponseWriter, r *http.Request) {
@@ -16,7 +16,9 @@ func mrJSON(mr store.MergeRequest) map[string]any {
16 "id": mr.ID, "iid": mr.Number, "title": mr.Title, "description": mr.Description,
16 "id": mr.ID, "iid": mr.Number, "title": mr.Title, "description": mr.Description,
17 "source_branch": mr.SourceBranch, "target_branch": mr.TargetBranch,
17 "source_branch": mr.SourceBranch, "target_branch": mr.TargetBranch,
18 "author": mr.Author, "state": mr.Status, "draft": mr.Draft, "labels": mr.Labels,
18 "author": mr.Author, "state": mr.Status, "draft": mr.Draft, "labels": mr.Labels,
19 "created_at": rfcTime(mr.CreatedAt), "updated_at": rfcTime(mr.UpdatedAt),
19 "remove_source_branch": mr.RemoveSourceBranch, "squash": mr.Squash,
20 "squash_commit_message": mr.SquashMessage,
21 "created_at": rfcTime(mr.CreatedAt), "updated_at": rfcTime(mr.UpdatedAt),
20 }
22 }
21}
23}
22
24
@@ -27,11 +29,14 @@ func (s *Server) apiMRs(w http.ResponseWriter, r *http.Request) {
27 }
29 }
28 if r.Method == http.MethodPost {
30 if r.Method == http.MethodPost {
29 var body struct {
31 var body struct {
30 Title string `json:"title"`
32 Title string `json:"title"`
31 Description string `json:"description"`
33 Description string `json:"description"`
32 SourceBranch string `json:"source_branch"`
34 SourceBranch string `json:"source_branch"`
33 TargetBranch string `json:"target_branch"`
35 TargetBranch string `json:"target_branch"`
34 Draft bool `json:"draft"`
36 Draft bool `json:"draft"`
37 Remove *bool `json:"remove_source_branch"`
38 Squash *bool `json:"squash"`
39 Message *string `json:"squash_commit_message"`
35 }
40 }
36 if err := readJSON(r, &body); err != nil {
41 if err := readJSON(r, &body); err != nil {
37 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
42 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -41,6 +46,23 @@ func (s *Server) apiMRs(w http.ResponseWriter, r *http.Request) {
41 if !s.apiOK(w, r, err) {
46 if !s.apiOK(w, r, err) {
42 return
47 return
43 }
48 }
49 remove, squash, message := true, false, ""
50 if body.Remove != nil {
51 remove = *body.Remove
52 }
53 if body.Squash != nil {
54 squash = *body.Squash
55 }
56 if body.Message != nil {
57 message = *body.Message
58 }
59 if err := s.Store.SetMergeOptions(r.Context(), mr.ID, remove, squash, message); !s.apiOK(w, r, err) {
60 return
61 }
62 mr, err = s.Store.MergeRequestByNumber(r.Context(), repo.ID, mr.Number)
63 if !s.apiOK(w, r, err) {
64 return
65 }
44 writeJSON(w, http.StatusCreated, mrJSON(mr))
66 writeJSON(w, http.StatusCreated, mrJSON(mr))
45 return
67 return
46 }
68 }
@@ -68,9 +90,12 @@ func (s *Server) apiMR(w http.ResponseWriter, r *http.Request) {
68 }
90 }
69 if r.Method == http.MethodPut {
91 if r.Method == http.MethodPut {
70 var body struct {
92 var body struct {
71 Title string `json:"title"`
93 Title string `json:"title"`
72 Description string `json:"description"`
94 Description string `json:"description"`
73 Labels string `json:"labels"`
95 Labels string `json:"labels"`
96 Remove *bool `json:"remove_source_branch"`
97 Squash *bool `json:"squash"`
98 Message *string `json:"squash_commit_message"`
74 }
99 }
75 if err := readJSON(r, &body); err != nil {
100 if err := readJSON(r, &body); err != nil {
76 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
101 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -80,6 +105,25 @@ func (s *Server) apiMR(w http.ResponseWriter, r *http.Request) {
80 if !s.apiOK(w, r, err) {
105 if !s.apiOK(w, r, err) {
81 return
106 return
82 }
107 }
108 if body.Remove != nil || body.Squash != nil || body.Message != nil {
109 remove, squash, message := mr.RemoveSourceBranch, mr.Squash, mr.SquashMessage
110 if body.Remove != nil {
111 remove = *body.Remove
112 }
113 if body.Squash != nil {
114 squash = *body.Squash
115 }
116 if body.Message != nil {
117 message = *body.Message
118 }
119 if err := s.Store.SetMergeOptions(r.Context(), mr.ID, remove, squash, message); !s.apiOK(w, r, err) {
120 return
121 }
122 mr, err = s.Store.MergeRequestByNumber(r.Context(), repo.ID, mr.Number)
123 if !s.apiOK(w, r, err) {
124 return
125 }
126 }
83 writeJSON(w, http.StatusOK, mrJSON(mr))
127 writeJSON(w, http.StatusOK, mrJSON(mr))
84 return
128 return
85 }
129 }
@@ -222,10 +266,22 @@ func (s *Server) apiMerge(w http.ResponseWriter, r *http.Request) {
222 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
266 s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
223 return
267 return
224 }
268 }
225 if !s.apiOK(w, r, s.opMergeMR(r, apiUser(r), repo, n)) {
269 var body struct {
270 Remove *bool `json:"remove_source_branch"`
271 Squash *bool `json:"squash"`
272 Message *string `json:"squash_commit_message"`
273 }
274 if err := readJSON(r, &body); err != nil {
275 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
276 return
277 }
278 out, err := s.opMergeMR(r, apiUser(r), repo, n, mergeChoice{Remove: body.Remove, Squash: body.Squash, Message: body.Message})
279 if !s.apiOK(w, r, err) {
226 return
280 return
227 }
281 }
228 writeJSON(w, http.StatusOK, map[string]any{"state": "merged"})
282 writeJSON(w, http.StatusOK, map[string]any{
283 "state": "merged", "source_branch_removed": out.Removed, "source_branch_skip": out.Skip,
284 })
229}
285}
230
286
231func (s *Server) apiCloseMR(w http.ResponseWriter, r *http.Request) {
287func (s *Server) apiCloseMR(w http.ResponseWriter, r *http.Request) {
internal/server/api_http.go +63 −0
@@ -257,6 +257,7 @@ func openAPIDoc() map[string]any {
257 257 }
258 258 item[strings.ToLower(rt.Method)] = op
259 259 }
260 attachMergeOptionDocs(paths)
260 261 paths["/openapi.json"] = map[string]any{
261 262 "get": map[string]any{"summary": "OpenAPI document", "responses": map[string]any{"200": map[string]any{"description": "OK"}}},
262 263 }
@@ -282,6 +283,68 @@ func openAPIDoc() map[string]any {
282 283 }
283 284 }
284 285
286 func attachMergeOptionDocs(paths map[string]map[string]any) {
287 opts := map[string]any{
288 "remove_source_branch": map[string]any{
289 "type": "boolean",
290 "description": "Delete the source branch after a successful merge. Omitted on create means true. Omitted on merge keeps the stored value.",
291 },
292 "squash": map[string]any{
293 "type": "boolean",
294 "description": "Combine the commits into one. Omitted on create means false. Omitted on merge keeps the stored value.",
295 },
296 "squash_commit_message": map[string]any{
297 "type": "string",
298 "description": "Message of the squash commit. An empty message uses the merge request title.",
299 },
300 }
301 body := func(extra map[string]any) map[string]any {
302 props := map[string]any{}
303 for k, v := range opts {
304 props[k] = v
305 }
306 for k, v := range extra {
307 props[k] = v
308 }
309 return map[string]any{
310 "content": map[string]any{
311 "application/json": map[string]any{"schema": map[string]any{"type": "object", "properties": props}},
312 },
313 }
314 }
315 str := func(desc string) map[string]any { return map[string]any{"type": "string", "description": desc} }
316 boolean := map[string]any{"type": "boolean"}
317 if item := paths["/projects/{owner}/{repo}/merge_requests"]; item != nil {
318 if op, ok := item["post"].(map[string]any); ok {
319 op["requestBody"] = body(map[string]any{
320 "title": str("Title"),
321 "description": str("Description"),
322 "source_branch": str("Source branch"),
323 "target_branch": str("Target branch"),
324 "draft": boolean,
325 })
326 }
327 }
328 if item := paths["/projects/{owner}/{repo}/merge_requests/{number}"]; item != nil {
329 if op, ok := item["put"].(map[string]any); ok {
330 op["requestBody"] = body(map[string]any{
331 "title": str("Title"),
332 "description": str("Description"),
333 "labels": str("Labels"),
334 })
335 }
336 }
337 if item := paths["/projects/{owner}/{repo}/merge_requests/{number}/merge"]; item != nil {
338 if op, ok := item["post"].(map[string]any); ok {
339 op["requestBody"] = body(nil)
340 responses, _ := op["responses"].(map[string]any)
341 if responses != nil {
342 responses["200"] = map[string]any{"description": "Merged. source_branch_removed says whether the source branch was deleted. source_branch_skip is empty, disabled, protected, default, forbidden, missing or error."}
343 }
344 }
345 }
346 }
347
285 348 func openAPIPath(p string) string {
286 349 var b strings.Builder
287 350 for i := 0; i < len(p); i++ {
@@ -257,6 +257,7 @@ func openAPIDoc() map[string]any {
257 }
257 }
258 item[strings.ToLower(rt.Method)] = op
258 item[strings.ToLower(rt.Method)] = op
259 }
259 }
260 attachMergeOptionDocs(paths)
260 paths["/openapi.json"] = map[string]any{
261 paths["/openapi.json"] = map[string]any{
261 "get": map[string]any{"summary": "OpenAPI document", "responses": map[string]any{"200": map[string]any{"description": "OK"}}},
262 "get": map[string]any{"summary": "OpenAPI document", "responses": map[string]any{"200": map[string]any{"description": "OK"}}},
262 }
263 }
@@ -282,6 +283,68 @@ func openAPIDoc() map[string]any {
282 }
283 }
283}
284}
284
285
286func attachMergeOptionDocs(paths map[string]map[string]any) {
287 opts := map[string]any{
288 "remove_source_branch": map[string]any{
289 "type": "boolean",
290 "description": "Delete the source branch after a successful merge. Omitted on create means true. Omitted on merge keeps the stored value.",
291 },
292 "squash": map[string]any{
293 "type": "boolean",
294 "description": "Combine the commits into one. Omitted on create means false. Omitted on merge keeps the stored value.",
295 },
296 "squash_commit_message": map[string]any{
297 "type": "string",
298 "description": "Message of the squash commit. An empty message uses the merge request title.",
299 },
300 }
301 body := func(extra map[string]any) map[string]any {
302 props := map[string]any{}
303 for k, v := range opts {
304 props[k] = v
305 }
306 for k, v := range extra {
307 props[k] = v
308 }
309 return map[string]any{
310 "content": map[string]any{
311 "application/json": map[string]any{"schema": map[string]any{"type": "object", "properties": props}},
312 },
313 }
314 }
315 str := func(desc string) map[string]any { return map[string]any{"type": "string", "description": desc} }
316 boolean := map[string]any{"type": "boolean"}
317 if item := paths["/projects/{owner}/{repo}/merge_requests"]; item != nil {
318 if op, ok := item["post"].(map[string]any); ok {
319 op["requestBody"] = body(map[string]any{
320 "title": str("Title"),
321 "description": str("Description"),
322 "source_branch": str("Source branch"),
323 "target_branch": str("Target branch"),
324 "draft": boolean,
325 })
326 }
327 }
328 if item := paths["/projects/{owner}/{repo}/merge_requests/{number}"]; item != nil {
329 if op, ok := item["put"].(map[string]any); ok {
330 op["requestBody"] = body(map[string]any{
331 "title": str("Title"),
332 "description": str("Description"),
333 "labels": str("Labels"),
334 })
335 }
336 }
337 if item := paths["/projects/{owner}/{repo}/merge_requests/{number}/merge"]; item != nil {
338 if op, ok := item["post"].(map[string]any); ok {
339 op["requestBody"] = body(nil)
340 responses, _ := op["responses"].(map[string]any)
341 if responses != nil {
342 responses["200"] = map[string]any{"description": "Merged. source_branch_removed says whether the source branch was deleted. source_branch_skip is empty, disabled, protected, default, forbidden, missing or error."}
343 }
344 }
345 }
346}
347
285func openAPIPath(p string) string {
348func openAPIPath(p string) string {
286 var b strings.Builder
349 var b strings.Builder
287 for i := 0; i < len(p); i++ {
350 for i := 0; i < len(p); i++ {
internal/server/events.go +16 −1
@@ -74,12 +74,27 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
74 74 s.closeIssuesOnPush(repo, user, before[ref], sha)
75 75 }
76 76 }
77 // Een ref die in before staat en in after weg is, is verwijderd.
78 // Daar hoort een push-webhook bij, zonder pipeline of activity.
79 for ref, old := range before {
80 if sha, ok := after[ref]; ok && !isZero(sha) {
81 continue
82 }
83 if isZero(old) {
84 continue
85 }
86 s.pushHook(repo, actor, ref, old, strings.Repeat("0", 40))
87 }
77 88 }
78 89
79 90 func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {
80 91 if isZero(before) {
81 92 before = strings.Repeat("0", 40)
82 93 }
94 commit := after
95 if isZero(commit) {
96 commit = ""
97 }
83 98 name := refName(ref)
84 99 s.Dispatch(repo.ID, webhook.Event{
85 100 Type: webhook.EventPush,
@@ -88,7 +103,7 @@ func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {
88 103 Ref: ref,
89 104 Before: before,
90 105 After: after,
91 Commit: after,
106 Commit: commit,
92 107 Summary: i18n.T(i18n.EN, "hook.push", actor, name, repo.FullPath()),
93 108 URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),
94 109 Actor: actor,
@@ -74,12 +74,27 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
74 s.closeIssuesOnPush(repo, user, before[ref], sha)
74 s.closeIssuesOnPush(repo, user, before[ref], sha)
75 }
75 }
76 }
76 }
77 // Een ref die in before staat en in after weg is, is verwijderd.
78 // Daar hoort een push-webhook bij, zonder pipeline of activity.
79 for ref, old := range before {
80 if sha, ok := after[ref]; ok && !isZero(sha) {
81 continue
82 }
83 if isZero(old) {
84 continue
85 }
86 s.pushHook(repo, actor, ref, old, strings.Repeat("0", 40))
87 }
77}
88}
78
89
79func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {
90func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {
80 if isZero(before) {
91 if isZero(before) {
81 before = strings.Repeat("0", 40)
92 before = strings.Repeat("0", 40)
82 }
93 }
94 commit := after
95 if isZero(commit) {
96 commit = ""
97 }
83 name := refName(ref)
98 name := refName(ref)
84 s.Dispatch(repo.ID, webhook.Event{
99 s.Dispatch(repo.ID, webhook.Event{
85 Type: webhook.EventPush,
100 Type: webhook.EventPush,
@@ -88,7 +103,7 @@ func (s *Server) pushHook(repo store.Repo, actor, ref, before, after string) {
88 Ref: ref,
103 Ref: ref,
89 Before: before,
104 Before: before,
90 After: after,
105 After: after,
91 Commit: after,
106 Commit: commit,
92 Summary: i18n.T(i18n.EN, "hook.push", actor, name, repo.FullPath()),
107 Summary: i18n.T(i18n.EN, "hook.push", actor, name, repo.FullPath()),
93 URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),
108 URL: strings.TrimRight(s.Cfg.BaseURL, "/") + "/" + repo.FullPath(),
94 Actor: actor,
109 Actor: actor,
internal/server/merge_opts_test.go added +256 −0
@@ -0,0 +1,256 @@
1 package server
2
3 import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/httptest"
8 "net/url"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/access"
14 "gitlab.com/Timfa/bluegit/internal/store"
15 )
16
17 func TestSourceDeleteSkip(t *testing.T) {
18 if got := sourceDeleteSkip(access.RoleDeveloper, "master", "topic", true, false); got != "" {
19 t.Fatalf("mag weg: %s", got)
20 }
21 cases := []struct {
22 role access.Role
23 def, name string
24 exists bool
25 protected bool
26 want string
27 }{
28 {access.RoleDeveloper, "master", "topic", false, false, "missing"},
29 {access.RoleDeveloper, "master", "", true, false, "missing"},
30 {access.RoleDeveloper, "master", "master", true, false, "default"},
31 {access.RoleMaintainer, "master", "topic", true, true, "protected"},
32 {access.RoleReporter, "master", "topic", true, false, "forbidden"},
33 }
34 for _, c := range cases {
35 if got := sourceDeleteSkip(c.role, c.def, c.name, c.exists, c.protected); got != c.want {
36 t.Fatalf("%+v gaf %s", c, got)
37 }
38 }
39 }
40
41 func TestMergeFormDeletesSource(t *testing.T) {
42 srv, ts, st := mergeFixServer(t)
43 var bodies [][]byte
44 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
45 tim := loginClient(t, ts)
46 token := mintToken(t, tim, ts)
47 work := pushPair(t, ts, token, "weg", "alpha\n", "beta\n")
48 page := read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
49 if !strings.Contains(page, `name="remove_source_branch" value="1" checked`) || !strings.Contains(page, "Delete source branch after merge") {
50 t.Fatalf("bronbranch staat niet standaard aan:\n%s", page)
51 }
52 if !strings.Contains(page, `name="squash" value="1">`) || !strings.Contains(page, "Squash commits") || strings.Contains(page, `name="squash" value="1" checked`) {
53 t.Fatalf("squash staat niet standaard uit:\n%s", page)
54 }
55 if !strings.Contains(page, `name="squash_commit_message">verder</textarea>`) {
56 t.Fatalf("squashbericht is niet de titel:\n%s", page)
57 }
58 page = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
59 "csrf": {csrfOf(t, page)}, "title": {"Bewaar"}, "source": {"topic"}, "target": {"master"},
60 }))
61 ctx := context.Background()
62 repo, err := st.RepoByPath(ctx, "tim", "weg")
63 if err != nil {
64 t.Fatal(err)
65 }
66 kept, err := st.MergeRequestByNumber(ctx, repo.ID, 1)
67 if err != nil || kept.RemoveSourceBranch || kept.Squash {
68 t.Fatalf("ontbrekend vakje hoort uit: %+v %v", kept, err)
69 }
70 _ = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests/1/close", url.Values{"csrf": {csrfOf(t, page)}}))
71
72 page = read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
73 page = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
74 "csrf": {csrfOf(t, page)}, "title": {"Weg ermee"}, "source": {"topic"}, "target": {"master"},
75 "remove_source_branch": {"1"}, "squash_commit_message": {"later"},
76 }))
77 if !strings.Contains(page, `name="remove_source_branch" value="1" checked`) || !strings.Contains(page, ">later</textarea>") {
78 t.Fatalf("mergeformulier:\n%s", page)
79 }
80 if _, err := st.CreateWebhook(ctx, store.Webhook{
81 ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",
82 URLTemplate: "https://example.test/hook", Events: []string{"push"},
83 }); err != nil {
84 t.Fatal(err)
85 }
86 bodies = nil
87 merged := read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests/2/merge", url.Values{
88 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
89 }))
90 if !strings.Contains(merged, "Merged and deleted branch topic.") {
91 t.Fatalf("feedback:\n%s", merged)
92 }
93 git(t, work, "fetch", "--prune", "origin")
94 if _, err := gitOut(work, "rev-parse", "--verify", "refs/remotes/origin/topic"); err == nil {
95 t.Fatal("bronbranch bestaat nog")
96 }
97 parents := strings.Fields(mustGit(t, work, "rev-list", "--parents", "-n", "1", "origin/master"))
98 if len(parents) != 3 {
99 t.Fatalf("gewone merge hoort twee ouders te hebben: %v", parents)
100 }
101 push := decodeKind(t, bodies, "push")
102 if push["ref"] != "refs/heads/topic" || push["after"] != strings.Repeat("0", 40) || push["before"] == strings.Repeat("0", 40) {
103 t.Fatalf("verwijder-webhook %s", mustJSON(t, push))
104 }
105 }
106
107 func TestMergeKeepsProtectedAndDefault(t *testing.T) {
108 _, ts, st := mergeFixServer(t)
109 tim := loginClient(t, ts)
110 token := mintToken(t, tim, ts)
111 work := pushPair(t, ts, token, "slot", "alpha\n", "beta\n")
112 ctx := context.Background()
113 repo, err := st.RepoByPath(ctx, "tim", "slot")
114 if err != nil {
115 t.Fatal(err)
116 }
117 if err := st.AddProtected(ctx, repo.ID, "topic"); err != nil {
118 t.Fatal(err)
119 }
120 page := read(t, mustGet(t, tim, ts.URL+"/tim/slot/-/merge-requests/new?source=topic&target=master"))
121 page = read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests", url.Values{
122 "csrf": {csrfOf(t, page)}, "title": {"Beschermd"}, "source": {"topic"}, "target": {"master"},
123 "remove_source_branch": {"1"},
124 }))
125 kept := read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests/1/merge", url.Values{
126 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
127 }))
128 if !strings.Contains(kept, "Branch topic stays because it is protected.") {
129 t.Fatalf("beschermd:\n%s", kept)
130 }
131 git(t, work, "fetch", "origin")
132 if mustGit(t, work, "rev-parse", "--verify", "refs/remotes/origin/topic") == "" {
133 t.Fatal("beschermde branch weg")
134 }
135
136 defWork := pushPair(t, ts, token, "omlaag", "alpha\n", "beta\n")
137 git(t, defWork, "checkout", "master")
138 writeFile(t, filepath.Join(defWork, "extra.txt"), "extra\n")
139 git(t, defWork, "add", "extra.txt")
140 git(t, defWork, "commit", "-m", "op master")
141 git(t, defWork, "push", "origin", "master")
142 page = read(t, mustGet(t, tim, ts.URL+"/tim/omlaag/-/merge-requests/new?source=master&target=topic"))
143 page = read(t, mustPost(t, tim, ts.URL+"/tim/omlaag/-/merge-requests", url.Values{
144 "csrf": {csrfOf(t, page)}, "title": {"Standaard"}, "source": {"master"}, "target": {"topic"},
145 "remove_source_branch": {"1"},
146 }))
147 stayed := read(t, mustPost(t, tim, ts.URL+"/tim/omlaag/-/merge-requests/1/merge", url.Values{
148 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
149 }))
150 if !strings.Contains(stayed, "Branch master stays because it is the default branch.") {
151 t.Fatalf("standaard:\n%s", stayed)
152 }
153 git(t, defWork, "fetch", "origin")
154 if mustGit(t, defWork, "rev-parse", "--verify", "refs/remotes/origin/master") == "" {
155 t.Fatal("standaardbranch weg")
156 }
157 }
158
159 func TestMergeOptionsAPI(t *testing.T) {
160 _, ts, st := mergeFixServer(t)
161 tim := loginClient(t, ts)
162 token := mintToken(t, tim, ts)
163 work := pushPair(t, ts, token, "apiopt", "alpha\n", "beta\n")
164 writeFile(t, filepath.Join(work, "more.txt"), "meer\n")
165 git(t, work, "add", "more.txt")
166 git(t, work, "commit", "-m", "tweede")
167 git(t, work, "push", "origin", "topic")
168
169 spec := apiCall(t, ts, http.MethodGet, "/api/v1/openapi.json", token, "")
170 if !strings.Contains(spec, `"remove_source_branch"`) || !strings.Contains(spec, `"squash"`) || !strings.Contains(spec, "squash_commit_message") {
171 t.Fatalf("openapi mist de velden: %s", spec)
172 }
173 created := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests", token,
174 `{"title":"Standaard","source_branch":"topic","target_branch":"master"}`))
175 if created["remove_source_branch"] != true || created["squash"] != false || created["squash_commit_message"] != "" {
176 t.Fatalf("api-standaard %s", mustJSON(t, created))
177 }
178 updated := decodeBody(t, apiCall(t, ts, http.MethodPut, "/api/v1/projects/tim/apiopt/merge_requests/1", token,
179 `{"title":"Standaard","remove_source_branch":false,"squash":true,"squash_commit_message":"bewaard"}`))
180 if updated["remove_source_branch"] != false || updated["squash"] != true || updated["squash_commit_message"] != "bewaard" {
181 t.Fatalf("put %s", mustJSON(t, updated))
182 }
183 second := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests", token,
184 `{"title":"Squash mij","source_branch":"topic","target_branch":"master","remove_source_branch":false,"squash":true,"squash_commit_message":"eerste tekst"}`))
185 if second["iid"] != float64(2) || second["squash"] != true || second["remove_source_branch"] != false {
186 t.Fatalf("tweede %s", mustJSON(t, second))
187 }
188 merged := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests/2/merge", token,
189 `{"remove_source_branch":true,"squash":true,"squash_commit_message":"een bericht\n\ntweede regel"}`))
190 if merged["state"] != "merged" || merged["source_branch_removed"] != true || merged["source_branch_skip"] != "" {
191 t.Fatalf("merge %s", mustJSON(t, merged))
192 }
193 git(t, work, "fetch", "--prune", "origin")
194 if _, err := gitOut(work, "rev-parse", "--verify", "refs/remotes/origin/topic"); err == nil {
195 t.Fatal("api liet de bronbranch staan")
196 }
197 msg := strings.TrimSpace(mustGit(t, work, "log", "-1", "--format=%B", "origin/master"))
198 if msg != "een bericht\n\ntweede regel" {
199 t.Fatalf("squashbericht %q", msg)
200 }
201 parents := strings.Fields(mustGit(t, work, "rev-list", "--parents", "-n", "1", "origin/master"))
202 if len(parents) != 2 {
203 t.Fatalf("squash hoort geen merge-commit te zijn: %v", parents)
204 }
205 ctx := context.Background()
206 repo, err := st.RepoByPath(ctx, "tim", "apiopt")
207 if err != nil {
208 t.Fatal(err)
209 }
210 stored, err := st.MergeRequestByNumber(ctx, repo.ID, 2)
211 if err != nil || !stored.Squash || !stored.RemoveSourceBranch || stored.SquashMessage != "een bericht\n\ntweede regel" {
212 t.Fatalf("bewaard na merge %+v %v", stored, err)
213 }
214 }
215
216 func apiCall(t *testing.T, ts *httptest.Server, method, path, token, body string) string {
217 t.Helper()
218 var rdr *strings.Reader
219 if body != "" {
220 rdr = strings.NewReader(body)
221 }
222 var req *http.Request
223 var err error
224 if rdr == nil {
225 req, err = http.NewRequest(method, ts.URL+path, nil)
226 } else {
227 req, err = http.NewRequest(method, ts.URL+path, rdr)
228 }
229 if err != nil {
230 t.Fatal(err)
231 }
232 if body != "" {
233 req.Header.Set("Content-Type", "application/json")
234 }
235 if token != "" {
236 req.Header.Set("Authorization", "Bearer "+token)
237 }
238 res, err := http.DefaultClient.Do(req)
239 if err != nil {
240 t.Fatal(err)
241 }
242 raw := read(t, res)
243 if res.StatusCode < 200 || res.StatusCode >= 300 {
244 t.Fatalf("%s %s: %d %s", method, path, res.StatusCode, raw)
245 }
246 return raw
247 }
248
249 func decodeBody(t *testing.T, raw string) map[string]any {
250 t.Helper()
251 var doc map[string]any
252 if err := json.Unmarshal([]byte(raw), &doc); err != nil {
253 t.Fatalf("json %v %s", err, raw)
254 }
255 return doc
256 }
@@ -0,0 +1,256 @@
1package server
2
3import (
4 "context"
5 "encoding/json"
6 "net/http"
7 "net/http/httptest"
8 "net/url"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/access"
14 "gitlab.com/Timfa/bluegit/internal/store"
15)
16
17func TestSourceDeleteSkip(t *testing.T) {
18 if got := sourceDeleteSkip(access.RoleDeveloper, "master", "topic", true, false); got != "" {
19 t.Fatalf("mag weg: %s", got)
20 }
21 cases := []struct {
22 role access.Role
23 def, name string
24 exists bool
25 protected bool
26 want string
27 }{
28 {access.RoleDeveloper, "master", "topic", false, false, "missing"},
29 {access.RoleDeveloper, "master", "", true, false, "missing"},
30 {access.RoleDeveloper, "master", "master", true, false, "default"},
31 {access.RoleMaintainer, "master", "topic", true, true, "protected"},
32 {access.RoleReporter, "master", "topic", true, false, "forbidden"},
33 }
34 for _, c := range cases {
35 if got := sourceDeleteSkip(c.role, c.def, c.name, c.exists, c.protected); got != c.want {
36 t.Fatalf("%+v gaf %s", c, got)
37 }
38 }
39}
40
41func TestMergeFormDeletesSource(t *testing.T) {
42 srv, ts, st := mergeFixServer(t)
43 var bodies [][]byte
44 srv.hookSink = func(b []byte) { bodies = append(bodies, append([]byte(nil), b...)) }
45 tim := loginClient(t, ts)
46 token := mintToken(t, tim, ts)
47 work := pushPair(t, ts, token, "weg", "alpha\n", "beta\n")
48 page := read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
49 if !strings.Contains(page, `name="remove_source_branch" value="1" checked`) || !strings.Contains(page, "Delete source branch after merge") {
50 t.Fatalf("bronbranch staat niet standaard aan:\n%s", page)
51 }
52 if !strings.Contains(page, `name="squash" value="1">`) || !strings.Contains(page, "Squash commits") || strings.Contains(page, `name="squash" value="1" checked`) {
53 t.Fatalf("squash staat niet standaard uit:\n%s", page)
54 }
55 if !strings.Contains(page, `name="squash_commit_message">verder</textarea>`) {
56 t.Fatalf("squashbericht is niet de titel:\n%s", page)
57 }
58 page = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
59 "csrf": {csrfOf(t, page)}, "title": {"Bewaar"}, "source": {"topic"}, "target": {"master"},
60 }))
61 ctx := context.Background()
62 repo, err := st.RepoByPath(ctx, "tim", "weg")
63 if err != nil {
64 t.Fatal(err)
65 }
66 kept, err := st.MergeRequestByNumber(ctx, repo.ID, 1)
67 if err != nil || kept.RemoveSourceBranch || kept.Squash {
68 t.Fatalf("ontbrekend vakje hoort uit: %+v %v", kept, err)
69 }
70 _ = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests/1/close", url.Values{"csrf": {csrfOf(t, page)}}))
71
72 page = read(t, mustGet(t, tim, ts.URL+"/tim/weg/-/merge-requests/new?source=topic&target=master"))
73 page = read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests", url.Values{
74 "csrf": {csrfOf(t, page)}, "title": {"Weg ermee"}, "source": {"topic"}, "target": {"master"},
75 "remove_source_branch": {"1"}, "squash_commit_message": {"later"},
76 }))
77 if !strings.Contains(page, `name="remove_source_branch" value="1" checked`) || !strings.Contains(page, ">later</textarea>") {
78 t.Fatalf("mergeformulier:\n%s", page)
79 }
80 if _, err := st.CreateWebhook(ctx, store.Webhook{
81 ScopeKind: "repo", ScopeID: repo.ID, Name: "push", Preset: "generic",
82 URLTemplate: "https://example.test/hook", Events: []string{"push"},
83 }); err != nil {
84 t.Fatal(err)
85 }
86 bodies = nil
87 merged := read(t, mustPost(t, tim, ts.URL+"/tim/weg/-/merge-requests/2/merge", url.Values{
88 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
89 }))
90 if !strings.Contains(merged, "Merged and deleted branch topic.") {
91 t.Fatalf("feedback:\n%s", merged)
92 }
93 git(t, work, "fetch", "--prune", "origin")
94 if _, err := gitOut(work, "rev-parse", "--verify", "refs/remotes/origin/topic"); err == nil {
95 t.Fatal("bronbranch bestaat nog")
96 }
97 parents := strings.Fields(mustGit(t, work, "rev-list", "--parents", "-n", "1", "origin/master"))
98 if len(parents) != 3 {
99 t.Fatalf("gewone merge hoort twee ouders te hebben: %v", parents)
100 }
101 push := decodeKind(t, bodies, "push")
102 if push["ref"] != "refs/heads/topic" || push["after"] != strings.Repeat("0", 40) || push["before"] == strings.Repeat("0", 40) {
103 t.Fatalf("verwijder-webhook %s", mustJSON(t, push))
104 }
105}
106
107func TestMergeKeepsProtectedAndDefault(t *testing.T) {
108 _, ts, st := mergeFixServer(t)
109 tim := loginClient(t, ts)
110 token := mintToken(t, tim, ts)
111 work := pushPair(t, ts, token, "slot", "alpha\n", "beta\n")
112 ctx := context.Background()
113 repo, err := st.RepoByPath(ctx, "tim", "slot")
114 if err != nil {
115 t.Fatal(err)
116 }
117 if err := st.AddProtected(ctx, repo.ID, "topic"); err != nil {
118 t.Fatal(err)
119 }
120 page := read(t, mustGet(t, tim, ts.URL+"/tim/slot/-/merge-requests/new?source=topic&target=master"))
121 page = read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests", url.Values{
122 "csrf": {csrfOf(t, page)}, "title": {"Beschermd"}, "source": {"topic"}, "target": {"master"},
123 "remove_source_branch": {"1"},
124 }))
125 kept := read(t, mustPost(t, tim, ts.URL+"/tim/slot/-/merge-requests/1/merge", url.Values{
126 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
127 }))
128 if !strings.Contains(kept, "Branch topic stays because it is protected.") {
129 t.Fatalf("beschermd:\n%s", kept)
130 }
131 git(t, work, "fetch", "origin")
132 if mustGit(t, work, "rev-parse", "--verify", "refs/remotes/origin/topic") == "" {
133 t.Fatal("beschermde branch weg")
134 }
135
136 defWork := pushPair(t, ts, token, "omlaag", "alpha\n", "beta\n")
137 git(t, defWork, "checkout", "master")
138 writeFile(t, filepath.Join(defWork, "extra.txt"), "extra\n")
139 git(t, defWork, "add", "extra.txt")
140 git(t, defWork, "commit", "-m", "op master")
141 git(t, defWork, "push", "origin", "master")
142 page = read(t, mustGet(t, tim, ts.URL+"/tim/omlaag/-/merge-requests/new?source=master&target=topic"))
143 page = read(t, mustPost(t, tim, ts.URL+"/tim/omlaag/-/merge-requests", url.Values{
144 "csrf": {csrfOf(t, page)}, "title": {"Standaard"}, "source": {"master"}, "target": {"topic"},
145 "remove_source_branch": {"1"},
146 }))
147 stayed := read(t, mustPost(t, tim, ts.URL+"/tim/omlaag/-/merge-requests/1/merge", url.Values{
148 "csrf": {csrfOf(t, page)}, "remove_source_branch": {"1"},
149 }))
150 if !strings.Contains(stayed, "Branch master stays because it is the default branch.") {
151 t.Fatalf("standaard:\n%s", stayed)
152 }
153 git(t, defWork, "fetch", "origin")
154 if mustGit(t, defWork, "rev-parse", "--verify", "refs/remotes/origin/master") == "" {
155 t.Fatal("standaardbranch weg")
156 }
157}
158
159func TestMergeOptionsAPI(t *testing.T) {
160 _, ts, st := mergeFixServer(t)
161 tim := loginClient(t, ts)
162 token := mintToken(t, tim, ts)
163 work := pushPair(t, ts, token, "apiopt", "alpha\n", "beta\n")
164 writeFile(t, filepath.Join(work, "more.txt"), "meer\n")
165 git(t, work, "add", "more.txt")
166 git(t, work, "commit", "-m", "tweede")
167 git(t, work, "push", "origin", "topic")
168
169 spec := apiCall(t, ts, http.MethodGet, "/api/v1/openapi.json", token, "")
170 if !strings.Contains(spec, `"remove_source_branch"`) || !strings.Contains(spec, `"squash"`) || !strings.Contains(spec, "squash_commit_message") {
171 t.Fatalf("openapi mist de velden: %s", spec)
172 }
173 created := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests", token,
174 `{"title":"Standaard","source_branch":"topic","target_branch":"master"}`))
175 if created["remove_source_branch"] != true || created["squash"] != false || created["squash_commit_message"] != "" {
176 t.Fatalf("api-standaard %s", mustJSON(t, created))
177 }
178 updated := decodeBody(t, apiCall(t, ts, http.MethodPut, "/api/v1/projects/tim/apiopt/merge_requests/1", token,
179 `{"title":"Standaard","remove_source_branch":false,"squash":true,"squash_commit_message":"bewaard"}`))
180 if updated["remove_source_branch"] != false || updated["squash"] != true || updated["squash_commit_message"] != "bewaard" {
181 t.Fatalf("put %s", mustJSON(t, updated))
182 }
183 second := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests", token,
184 `{"title":"Squash mij","source_branch":"topic","target_branch":"master","remove_source_branch":false,"squash":true,"squash_commit_message":"eerste tekst"}`))
185 if second["iid"] != float64(2) || second["squash"] != true || second["remove_source_branch"] != false {
186 t.Fatalf("tweede %s", mustJSON(t, second))
187 }
188 merged := decodeBody(t, apiCall(t, ts, http.MethodPost, "/api/v1/projects/tim/apiopt/merge_requests/2/merge", token,
189 `{"remove_source_branch":true,"squash":true,"squash_commit_message":"een bericht\n\ntweede regel"}`))
190 if merged["state"] != "merged" || merged["source_branch_removed"] != true || merged["source_branch_skip"] != "" {
191 t.Fatalf("merge %s", mustJSON(t, merged))
192 }
193 git(t, work, "fetch", "--prune", "origin")
194 if _, err := gitOut(work, "rev-parse", "--verify", "refs/remotes/origin/topic"); err == nil {
195 t.Fatal("api liet de bronbranch staan")
196 }
197 msg := strings.TrimSpace(mustGit(t, work, "log", "-1", "--format=%B", "origin/master"))
198 if msg != "een bericht\n\ntweede regel" {
199 t.Fatalf("squashbericht %q", msg)
200 }
201 parents := strings.Fields(mustGit(t, work, "rev-list", "--parents", "-n", "1", "origin/master"))
202 if len(parents) != 2 {
203 t.Fatalf("squash hoort geen merge-commit te zijn: %v", parents)
204 }
205 ctx := context.Background()
206 repo, err := st.RepoByPath(ctx, "tim", "apiopt")
207 if err != nil {
208 t.Fatal(err)
209 }
210 stored, err := st.MergeRequestByNumber(ctx, repo.ID, 2)
211 if err != nil || !stored.Squash || !stored.RemoveSourceBranch || stored.SquashMessage != "een bericht\n\ntweede regel" {
212 t.Fatalf("bewaard na merge %+v %v", stored, err)
213 }
214}
215
216func apiCall(t *testing.T, ts *httptest.Server, method, path, token, body string) string {
217 t.Helper()
218 var rdr *strings.Reader
219 if body != "" {
220 rdr = strings.NewReader(body)
221 }
222 var req *http.Request
223 var err error
224 if rdr == nil {
225 req, err = http.NewRequest(method, ts.URL+path, nil)
226 } else {
227 req, err = http.NewRequest(method, ts.URL+path, rdr)
228 }
229 if err != nil {
230 t.Fatal(err)
231 }
232 if body != "" {
233 req.Header.Set("Content-Type", "application/json")
234 }
235 if token != "" {
236 req.Header.Set("Authorization", "Bearer "+token)
237 }
238 res, err := http.DefaultClient.Do(req)
239 if err != nil {
240 t.Fatal(err)
241 }
242 raw := read(t, res)
243 if res.StatusCode < 200 || res.StatusCode >= 300 {
244 t.Fatalf("%s %s: %d %s", method, path, res.StatusCode, raw)
245 }
246 return raw
247}
248
249func decodeBody(t *testing.T, raw string) map[string]any {
250 t.Helper()
251 var doc map[string]any
252 if err := json.Unmarshal([]byte(raw), &doc); err != nil {
253 t.Fatalf("json %v %s", err, raw)
254 }
255 return doc
256}
internal/server/ops_mr.go +117 −12
@@ -254,42 +254,90 @@ func (s *Server) opApplySuggestions(ctx context.Context, user store.User, repo s
254 254 return nil
255 255 }
256 256
257 func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, number int64) error {
257 // mergeChoice is de keuze uit het formulier of de API.
258 // FromForm betekent dat een browser de vakjes postte: een ontbrekend vakje staat uit.
259 // De API laat FromForm uit en gebruikt de pointers. nil houdt de opgeslagen waarde.
260 type mergeChoice struct {
261 FromForm bool
262 Remove *bool
263 Squash *bool
264 Message *string
265 Force bool
266 Confirm bool
267 }
268
269 // mergeOutcome vertelt de pagina en de API wat er na de merge met de bronbranch gebeurde.
270 type mergeOutcome struct {
271 Notice string
272 Arg string
273 Removed bool
274 Skip string
275 }
276
277 func applyMergeChoice(mr store.MergeRequest, choice mergeChoice) (remove, squash bool, message string) {
278 remove, squash, message = mr.RemoveSourceBranch, mr.Squash, mr.SquashMessage
279 if choice.FromForm {
280 remove, squash, message = false, false, ""
281 }
282 if choice.Remove != nil {
283 remove = *choice.Remove
284 }
285 if choice.Squash != nil {
286 squash = *choice.Squash
287 }
288 if choice.Message != nil {
289 message = *choice.Message
290 }
291 return remove, squash, message
292 }
293
294 func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, number int64, choice mergeChoice) (mergeOutcome, error) {
258 295 ctx := r.Context()
259 296 role, err := s.repoRole(ctx, user, repo)
260 297 if err != nil {
261 return err
298 return mergeOutcome{}, err
262 299 }
263 300 mr, err := s.Store.MergeRequestByNumber(ctx, repo.ID, number)
264 301 if err != nil || mr.Status != "open" {
265 return notFound(err)
302 return mergeOutcome{}, notFound(err)
266 303 }
267 304 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
268 305 if !role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch)) {
269 return fail(403, i18n.E("err.targetAccess"))
306 return mergeOutcome{}, fail(403, i18n.E("err.targetAccess"))
270 307 }
308 remove, squash, message := applyMergeChoice(mr, choice)
309 if err := s.Store.SetMergeOptions(ctx, mr.ID, remove, squash, message); err != nil {
310 return mergeOutcome{}, fail(400, err)
311 }
312 mr.RemoveSourceBranch, mr.Squash, mr.SquashMessage = remove, squash, message
271 313 blocks := s.mergeBlocks(r, repo, mr)
272 force := r.FormValue("force") == "1" && role.CanManageSettings()
314 force := choice.Force && role.CanManageSettings()
273 315 if len(blocks) > 0 {
274 316 if !force {
275 return fail(409, i18n.E("err.mrBlocked", strings.Join(blocks, " ")))
317 return mergeOutcome{}, fail(409, i18n.E("err.mrBlocked", strings.Join(blocks, " ")))
276 318 }
277 if r.FormValue("confirm_force") != "1" {
278 return fail(409, i18n.E("mr.force.need"))
319 if !choice.Confirm {
320 return mergeOutcome{}, fail(409, i18n.E("mr.force.need"))
279 321 }
280 322 }
281 323 texts := s.mergeCloseTexts(r, repo, mr)
282 324 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
283 325 work, err := s.scratchDir("merge")
284 326 if err != nil {
285 return fail(500, err)
327 return mergeOutcome{}, fail(500, err)
286 328 }
287 329 defer os.RemoveAll(work)
288 330 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
331 if squash {
332 msg = strings.TrimSpace(message)
333 if msg == "" {
334 msg = mr.Title
335 }
336 }
289 337 if err := s.postReceive(ctx, repo, user, dir, func() error {
290 return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, role, patterns)
338 return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, squash, role, patterns)
291 339 }); err != nil {
292 return fail(400, err)
340 return mergeOutcome{}, fail(400, err)
293 341 }
294 342 fresh, ferr := s.Store.MergeRequestByNumber(ctx, repo.ID, mr.Number)
295 343 if ferr != nil || fresh.Status != "merged" {
@@ -302,7 +350,64 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
302 350 if force && len(blocks) > 0 {
303 351 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "forced", strings.Join(blocks, "\n"))
304 352 }
305 return nil
353 if !remove {
354 return mergeOutcome{Notice: "flash.merged", Skip: "disabled"}, nil
355 }
356 skip, deleted := s.deleteMergedSource(ctx, user, role, repo, mr.SourceBranch)
357 return mergedNotice(deleted, skip, mr.SourceBranch), nil
358 }
359
360 // sourceDeleteSkip zegt waarom de bronbranch moet blijven.
361 // Een lege tekst betekent dat verwijderen mag.
362 func sourceDeleteSkip(role access.Role, defaultBranch, name string, exists, protected bool) string {
363 if name == "" || !exists {
364 return "missing"
365 }
366 if name == defaultBranch {
367 return "default"
368 }
369 if protected {
370 return "protected"
371 }
372 if !role.CanWriteCode() {
373 return "forbidden"
374 }
375 return ""
376 }
377
378 // deleteMergedSource haalt de bronbranch weg na een geslaagde merge.
379 // 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) {
381 name = strings.TrimSpace(name)
382 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
383 exists := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) != ""
384 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
385 if skip = sourceDeleteSkip(role, repo.DefaultBranch, name, exists, access.BranchProtected(patterns, name)); skip != "" {
386 return skip, false
387 }
388 if err := s.postReceive(ctx, repo, user, dir, func() error {
389 return gitrepo.DeleteBranch(ctx, s.Git, dir, name)
390 }); err != nil {
391 return "error", false
392 }
393 return "", true
394 }
395
396 func mergedNotice(deleted bool, skip, branch string) mergeOutcome {
397 if deleted {
398 return mergeOutcome{Notice: "flash.mergedDeleted", Arg: branch, Removed: true}
399 }
400 key := map[string]string{
401 "protected": "flash.mergedKeptProtected",
402 "default": "flash.mergedKeptDefault",
403 "forbidden": "flash.mergedKeptRights",
404 "missing": "flash.mergedKeptMissing",
405 "error": "flash.mergedKeptError",
406 }[skip]
407 if key == "" {
408 return mergeOutcome{Notice: "flash.merged", Skip: skip}
409 }
410 return mergeOutcome{Notice: key, Arg: branch, Skip: skip}
306 411 }
307 412
308 413 func (s *Server) opCloseMR(ctx context.Context, user store.User, repo store.Repo, number int64, reopen bool) error {
@@ -254,42 +254,90 @@ func (s *Server) opApplySuggestions(ctx context.Context, user store.User, repo s
254 return nil
254 return nil
255}
255}
256
256
257func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, number int64) error {
257// mergeChoice is de keuze uit het formulier of de API.
258// FromForm betekent dat een browser de vakjes postte: een ontbrekend vakje staat uit.
259// De API laat FromForm uit en gebruikt de pointers. nil houdt de opgeslagen waarde.
260type mergeChoice struct {
261 FromForm bool
262 Remove *bool
263 Squash *bool
264 Message *string
265 Force bool
266 Confirm bool
267}
268
269// mergeOutcome vertelt de pagina en de API wat er na de merge met de bronbranch gebeurde.
270type mergeOutcome struct {
271 Notice string
272 Arg string
273 Removed bool
274 Skip string
275}
276
277func applyMergeChoice(mr store.MergeRequest, choice mergeChoice) (remove, squash bool, message string) {
278 remove, squash, message = mr.RemoveSourceBranch, mr.Squash, mr.SquashMessage
279 if choice.FromForm {
280 remove, squash, message = false, false, ""
281 }
282 if choice.Remove != nil {
283 remove = *choice.Remove
284 }
285 if choice.Squash != nil {
286 squash = *choice.Squash
287 }
288 if choice.Message != nil {
289 message = *choice.Message
290 }
291 return remove, squash, message
292}
293
294func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, number int64, choice mergeChoice) (mergeOutcome, error) {
258 ctx := r.Context()
295 ctx := r.Context()
259 role, err := s.repoRole(ctx, user, repo)
296 role, err := s.repoRole(ctx, user, repo)
260 if err != nil {
297 if err != nil {
261 return err
298 return mergeOutcome{}, err
262 }
299 }
263 mr, err := s.Store.MergeRequestByNumber(ctx, repo.ID, number)
300 mr, err := s.Store.MergeRequestByNumber(ctx, repo.ID, number)
264 if err != nil || mr.Status != "open" {
301 if err != nil || mr.Status != "open" {
265 return notFound(err)
302 return mergeOutcome{}, notFound(err)
266 }
303 }
267 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
304 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
268 if !role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch)) {
305 if !role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch)) {
269 return fail(403, i18n.E("err.targetAccess"))
306 return mergeOutcome{}, fail(403, i18n.E("err.targetAccess"))
270 }
307 }
308 remove, squash, message := applyMergeChoice(mr, choice)
309 if err := s.Store.SetMergeOptions(ctx, mr.ID, remove, squash, message); err != nil {
310 return mergeOutcome{}, fail(400, err)
311 }
312 mr.RemoveSourceBranch, mr.Squash, mr.SquashMessage = remove, squash, message
271 blocks := s.mergeBlocks(r, repo, mr)
313 blocks := s.mergeBlocks(r, repo, mr)
272 force := r.FormValue("force") == "1" && role.CanManageSettings()
314 force := choice.Force && role.CanManageSettings()
273 if len(blocks) > 0 {
315 if len(blocks) > 0 {
274 if !force {
316 if !force {
275 return fail(409, i18n.E("err.mrBlocked", strings.Join(blocks, " ")))
317 return mergeOutcome{}, fail(409, i18n.E("err.mrBlocked", strings.Join(blocks, " ")))
276 }
318 }
277 if r.FormValue("confirm_force") != "1" {
319 if !choice.Confirm {
278 return fail(409, i18n.E("mr.force.need"))
320 return mergeOutcome{}, fail(409, i18n.E("mr.force.need"))
279 }
321 }
280 }
322 }
281 texts := s.mergeCloseTexts(r, repo, mr)
323 texts := s.mergeCloseTexts(r, repo, mr)
282 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
324 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
283 work, err := s.scratchDir("merge")
325 work, err := s.scratchDir("merge")
284 if err != nil {
326 if err != nil {
285 return fail(500, err)
327 return mergeOutcome{}, fail(500, err)
286 }
328 }
287 defer os.RemoveAll(work)
329 defer os.RemoveAll(work)
288 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
330 msg := "Merge branch '" + mr.SourceBranch + "' into '" + mr.TargetBranch + "'"
331 if squash {
332 msg = strings.TrimSpace(message)
333 if msg == "" {
334 msg = mr.Title
335 }
336 }
289 if err := s.postReceive(ctx, repo, user, dir, func() error {
337 if err := s.postReceive(ctx, repo, user, dir, func() error {
290 return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, role, patterns)
338 return gitrepo.Merge(ctx, s.Git, dir, work, mr.SourceBranch, mr.TargetBranch, user.Username, userEmail(user.Username), msg, squash, role, patterns)
291 }); err != nil {
339 }); err != nil {
292 return fail(400, err)
340 return mergeOutcome{}, fail(400, err)
293 }
341 }
294 fresh, ferr := s.Store.MergeRequestByNumber(ctx, repo.ID, mr.Number)
342 fresh, ferr := s.Store.MergeRequestByNumber(ctx, repo.ID, mr.Number)
295 if ferr != nil || fresh.Status != "merged" {
343 if ferr != nil || fresh.Status != "merged" {
@@ -302,7 +350,64 @@ func (s *Server) opMergeMR(r *http.Request, user store.User, repo store.Repo, nu
302 if force && len(blocks) > 0 {
350 if force && len(blocks) > 0 {
303 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "forced", strings.Join(blocks, "\n"))
351 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "forced", strings.Join(blocks, "\n"))
304 }
352 }
305 return nil
353 if !remove {
354 return mergeOutcome{Notice: "flash.merged", Skip: "disabled"}, nil
355 }
356 skip, deleted := s.deleteMergedSource(ctx, user, role, repo, mr.SourceBranch)
357 return mergedNotice(deleted, skip, mr.SourceBranch), nil
358}
359
360// sourceDeleteSkip zegt waarom de bronbranch moet blijven.
361// Een lege tekst betekent dat verwijderen mag.
362func sourceDeleteSkip(role access.Role, defaultBranch, name string, exists, protected bool) string {
363 if name == "" || !exists {
364 return "missing"
365 }
366 if name == defaultBranch {
367 return "default"
368 }
369 if protected {
370 return "protected"
371 }
372 if !role.CanWriteCode() {
373 return "forbidden"
374 }
375 return ""
376}
377
378// deleteMergedSource haalt de bronbranch weg na een geslaagde merge.
379// Dat is een eigen push, zodat een mislukte verwijdering de merge-webhook niet uitwist.
380func (s *Server) deleteMergedSource(ctx context.Context, user store.User, role access.Role, repo store.Repo, name string) (skip string, deleted bool) {
381 name = strings.TrimSpace(name)
382 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
383 exists := gitOne(ctx, s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) != ""
384 patterns, _ := s.Store.ProtectedPatterns(ctx, repo.ID)
385 if skip = sourceDeleteSkip(role, repo.DefaultBranch, name, exists, access.BranchProtected(patterns, name)); skip != "" {
386 return skip, false
387 }
388 if err := s.postReceive(ctx, repo, user, dir, func() error {
389 return gitrepo.DeleteBranch(ctx, s.Git, dir, name)
390 }); err != nil {
391 return "error", false
392 }
393 return "", true
394}
395
396func mergedNotice(deleted bool, skip, branch string) mergeOutcome {
397 if deleted {
398 return mergeOutcome{Notice: "flash.mergedDeleted", Arg: branch, Removed: true}
399 }
400 key := map[string]string{
401 "protected": "flash.mergedKeptProtected",
402 "default": "flash.mergedKeptDefault",
403 "forbidden": "flash.mergedKeptRights",
404 "missing": "flash.mergedKeptMissing",
405 "error": "flash.mergedKeptError",
406 }[skip]
407 if key == "" {
408 return mergeOutcome{Notice: "flash.merged", Skip: skip}
409 }
410 return mergeOutcome{Notice: key, Arg: branch, Skip: skip}
306}
411}
307
412
308func (s *Server) opCloseMR(ctx context.Context, user store.User, repo store.Repo, number int64, reopen bool) error {
413func (s *Server) opCloseMR(ctx context.Context, user store.User, repo store.Repo, number int64, reopen bool) error {
internal/server/repo_handlers.go +24 −2
@@ -192,6 +192,9 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
192 192 target := safeRev(r.FormValue("target"), repo.DefaultBranch)
193 193 desc := desctpl.Expand(r.FormValue("description"), s.mrVars(r, repo, source, target))
194 194 mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), desc, source, target, r.FormValue("draft") == "1")
195 if err == nil {
196 err = s.Store.SetMergeOptions(r.Context(), mr.ID, r.FormValue("remove_source_branch") == "1", r.FormValue("squash") == "1", r.FormValue("squash_commit_message"))
197 }
195 198 if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests", err) {
196 199 return
197 200 }
@@ -267,10 +270,29 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
267 270 return
268 271 }
269 272 back := repoURL(repo) + "/-/merge-requests/" + r.PathValue("number")
270 if !s.uiOK(w, r, back, s.opMergeMR(r, u, repo, n)) {
273 out, err := s.opMergeMR(r, u, repo, n, formMergeChoice(r))
274 if !s.uiOK(w, r, back, err) {
271 275 return
272 276 }
273 s.redirect(w, r, back, s.tr(r, "flash.merged"), "")
277 notice := s.tr(r, out.Notice)
278 if out.Arg != "" {
279 notice = s.tr(r, out.Notice, out.Arg)
280 }
281 s.redirect(w, r, back, notice, "")
282 }
283
284 func formMergeChoice(r *http.Request) mergeChoice {
285 remove := r.FormValue("remove_source_branch") == "1"
286 squash := r.FormValue("squash") == "1"
287 message := r.FormValue("squash_commit_message")
288 return mergeChoice{
289 FromForm: true,
290 Remove: &remove,
291 Squash: &squash,
292 Message: &message,
293 Force: r.FormValue("force") == "1",
294 Confirm: r.FormValue("confirm_force") == "1",
295 }
274 296 }
275 297
276 298 func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
@@ -192,6 +192,9 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
192 target := safeRev(r.FormValue("target"), repo.DefaultBranch)
192 target := safeRev(r.FormValue("target"), repo.DefaultBranch)
193 desc := desctpl.Expand(r.FormValue("description"), s.mrVars(r, repo, source, target))
193 desc := desctpl.Expand(r.FormValue("description"), s.mrVars(r, repo, source, target))
194 mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), desc, source, target, r.FormValue("draft") == "1")
194 mr, err := s.opCreateMR(r.Context(), u, repo, r.FormValue("title"), desc, source, target, r.FormValue("draft") == "1")
195 if err == nil {
196 err = s.Store.SetMergeOptions(r.Context(), mr.ID, r.FormValue("remove_source_branch") == "1", r.FormValue("squash") == "1", r.FormValue("squash_commit_message"))
197 }
195 if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests", err) {
198 if !s.uiOK(w, r, repoURL(repo)+"/-/merge-requests", err) {
196 return
199 return
197 }
200 }
@@ -267,10 +270,29 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
267 return
270 return
268 }
271 }
269 back := repoURL(repo) + "/-/merge-requests/" + r.PathValue("number")
272 back := repoURL(repo) + "/-/merge-requests/" + r.PathValue("number")
270 if !s.uiOK(w, r, back, s.opMergeMR(r, u, repo, n)) {
273 out, err := s.opMergeMR(r, u, repo, n, formMergeChoice(r))
274 if !s.uiOK(w, r, back, err) {
271 return
275 return
272 }
276 }
273 s.redirect(w, r, back, s.tr(r, "flash.merged"), "")
277 notice := s.tr(r, out.Notice)
278 if out.Arg != "" {
279 notice = s.tr(r, out.Notice, out.Arg)
280 }
281 s.redirect(w, r, back, notice, "")
282}
283
284func formMergeChoice(r *http.Request) mergeChoice {
285 remove := r.FormValue("remove_source_branch") == "1"
286 squash := r.FormValue("squash") == "1"
287 message := r.FormValue("squash_commit_message")
288 return mergeChoice{
289 FromForm: true,
290 Remove: &remove,
291 Squash: &squash,
292 Message: &message,
293 Force: r.FormValue("force") == "1",
294 Confirm: r.FormValue("confirm_force") == "1",
295 }
274}
296}
275
297
276func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
298func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
internal/server/templates/collab.html +12 −1
@@ -1,3 +1,11 @@
1 {{define "mergeopts"}}
2 <div class="checks">
3 <label><input type="checkbox" name="remove_source_branch" value="1"{{if .MR.RemoveSourceBranch}} checked{{end}}> {{t "mr.remove.on"}}</label>
4 <label><input type="checkbox" name="squash" value="1"{{if .MR.Squash}} checked{{end}}> {{t "mr.squash.on"}}</label>
5 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{if .MR.SquashMessage}}{{.MR.SquashMessage}}{{else}}{{.MR.Title}}{{end}}</textarea></label>
6 </div>
7 {{end}}
8
1 9 {{define "mrs"}}
2 10 {{template "layout-start" .}}
3 11 <header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
@@ -48,7 +56,9 @@
48 56 {{end}}
49 57 {{if and .CanMerge (not .MergeBlocks)}}
50 58 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
51 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.merge"}}</button>
59 <input type="hidden" name="csrf" value="{{.CSRF}}">
60 {{template "mergeopts" .}}
61 <button type="submit">{{t "action.merge"}}</button>
52 62 </form>
53 63 {{end}}
54 64 {{if .CanForce}}
@@ -56,6 +66,7 @@
56 66 <input type="hidden" name="csrf" value="{{.CSRF}}">
57 67 <input type="hidden" name="force" value="1">
58 68 <p class="flash bad">{{t "mr.force.warn"}}</p>
69 {{template "mergeopts" .}}
59 70 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
60 71 <button class="ghost" type="submit">{{t "mr.force"}}</button>
61 72 </form>
@@ -1,3 +1,11 @@
1{{define "mergeopts"}}
2<div class="checks">
3 <label><input type="checkbox" name="remove_source_branch" value="1"{{if .MR.RemoveSourceBranch}} checked{{end}}> {{t "mr.remove.on"}}</label>
4 <label><input type="checkbox" name="squash" value="1"{{if .MR.Squash}} checked{{end}}> {{t "mr.squash.on"}}</label>
5 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{if .MR.SquashMessage}}{{.MR.SquashMessage}}{{else}}{{.MR.Title}}{{end}}</textarea></label>
6</div>
7{{end}}
8
1{{define "mrs"}}
9{{define "mrs"}}
2{{template "layout-start" .}}
10{{template "layout-start" .}}
3<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
11<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
@@ -48,7 +56,9 @@
48{{end}}
56{{end}}
49{{if and .CanMerge (not .MergeBlocks)}}
57{{if and .CanMerge (not .MergeBlocks)}}
50<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
58<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
51 <input type="hidden" name="csrf" value="{{.CSRF}}"><button type="submit">{{t "action.merge"}}</button>
59 <input type="hidden" name="csrf" value="{{.CSRF}}">
60 {{template "mergeopts" .}}
61 <button type="submit">{{t "action.merge"}}</button>
52</form>
62</form>
53{{end}}
63{{end}}
54{{if .CanForce}}
64{{if .CanForce}}
@@ -56,6 +66,7 @@
56 <input type="hidden" name="csrf" value="{{.CSRF}}">
66 <input type="hidden" name="csrf" value="{{.CSRF}}">
57 <input type="hidden" name="force" value="1">
67 <input type="hidden" name="force" value="1">
58 <p class="flash bad">{{t "mr.force.warn"}}</p>
68 <p class="flash bad">{{t "mr.force.warn"}}</p>
69 {{template "mergeopts" .}}
59 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
70 <label class="check"><input type="checkbox" name="confirm_force" value="1" required> {{t "mr.force.confirm"}}</label>
60 <button class="ghost" type="submit">{{t "mr.force"}}</button>
71 <button class="ghost" type="submit">{{t "mr.force"}}</button>
61</form>
72</form>
internal/server/templates/newmr.html +5 −0
@@ -66,6 +66,11 @@
66 66 <div class="mdbody" data-md-preview hidden></div>
67 67 </div>
68 68 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
69 <div class="checks">
70 <label><input type="checkbox" name="remove_source_branch" value="1" checked> {{t "mr.remove.on"}}</label>
71 <label><input type="checkbox" name="squash" value="1"> {{t "mr.squash.on"}}</label>
72 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{.FormTitle}}</textarea></label>
73 </div>
69 74 <button type="submit">{{t "mr.create"}}</button>
70 75 </form>
71 76 <script src="/assets/mr.js"></script>
@@ -66,6 +66,11 @@
66 <div class="mdbody" data-md-preview hidden></div>
66 <div class="mdbody" data-md-preview hidden></div>
67 </div>
67 </div>
68 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
68 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
69 <div class="checks">
70 <label><input type="checkbox" name="remove_source_branch" value="1" checked> {{t "mr.remove.on"}}</label>
71 <label><input type="checkbox" name="squash" value="1"> {{t "mr.squash.on"}}</label>
72 <label>{{t "mr.squash.message"}} <textarea name="squash_commit_message">{{.FormTitle}}</textarea></label>
73 </div>
69 <button type="submit">{{t "mr.create"}}</button>
74 <button type="submit">{{t "mr.create"}}</button>
70</form>
75</form>
71<script src="/assets/mr.js"></script>
76<script src="/assets/mr.js"></script>
internal/store/flow.go +30 −23
@@ -166,20 +166,23 @@ func (s *Store) RecentDeliveries(ctx context.Context, webhookID int64) ([]Delive
166 166
167 167 // MergeRequest is een basisverzoek om een branch samen te voegen.
168 168 type MergeRequest struct {
169 ID int64
170 RepoID int64
171 Number int64
172 Title string
173 Description string
174 SourceBranch string
175 TargetBranch string
176 AuthorID int64
177 Author string
178 Status string
179 CreatedAt time.Time
180 UpdatedAt time.Time
181 Draft bool
182 Labels string
169 ID int64
170 RepoID int64
171 Number int64
172 Title string
173 Description string
174 SourceBranch string
175 TargetBranch string
176 AuthorID int64
177 Author string
178 Status string
179 CreatedAt time.Time
180 UpdatedAt time.Time
181 Draft bool
182 Labels string
183 RemoveSourceBranch bool
184 Squash bool
185 SquashMessage string
183 186 }
184 187
185 188 // CreateMergeRequest nummert per repository.
@@ -222,23 +225,29 @@ func (s *Store) MergeRequestByNumber(ctx context.Context, repoID, number int64)
222 225 return scanMR(row)
223 226 }
224 227
225 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
228 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, m.remove_source_branch, m.squash, m.squash_message
226 229 FROM merge_requests m JOIN users u ON u.id = m.author_id`
227 230
228 231 func scanMR(row *sql.Row) (MergeRequest, error) {
229 232 var m MergeRequest
230 233 var created, updated string
231 var draft int
232 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 {
234 var draft, remove, squash int
235 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, &remove, &squash, &m.SquashMessage); err != nil {
233 236 if errors.Is(err, sql.ErrNoRows) {
234 237 return MergeRequest{}, errNotFound
235 238 }
236 239 return MergeRequest{}, err
237 240 }
241 applyMR(&m, created, updated, draft, remove, squash)
242 return m, nil
243 }
244
245 func applyMR(m *MergeRequest, created, updated string, draft, remove, squash int) {
238 246 m.CreatedAt = parseTime(created)
239 247 m.UpdatedAt = parseTime(updated)
240 248 m.Draft = draft == 1
241 return m, nil
249 m.RemoveSourceBranch = remove == 1
250 m.Squash = squash == 1
242 251 }
243 252
244 253 // ListMergeRequests geeft verzoeken, open eerst.
@@ -284,13 +293,11 @@ func scanMRList(rows *sql.Rows) ([]MergeRequest, error) {
284 293 for rows.Next() {
285 294 var m MergeRequest
286 295 var created, updated string
287 var draft int
288 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 {
296 var draft, remove, squash int
297 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, &remove, &squash, &m.SquashMessage); err != nil {
289 298 return nil, err
290 299 }
291 m.CreatedAt = parseTime(created)
292 m.UpdatedAt = parseTime(updated)
293 m.Draft = draft == 1
300 applyMR(&m, created, updated, draft, remove, squash)
294 301 out = append(out, m)
295 302 }
296 303 return out, rows.Err()
@@ -166,20 +166,23 @@ func (s *Store) RecentDeliveries(ctx context.Context, webhookID int64) ([]Delive
166
166
167// MergeRequest is een basisverzoek om een branch samen te voegen.
167// MergeRequest is een basisverzoek om een branch samen te voegen.
168type MergeRequest struct {
168type MergeRequest struct {
169 ID int64
169 ID int64
170 RepoID int64
170 RepoID int64
171 Number int64
171 Number int64
172 Title string
172 Title string
173 Description string
173 Description string
174 SourceBranch string
174 SourceBranch string
175 TargetBranch string
175 TargetBranch string
176 AuthorID int64
176 AuthorID int64
177 Author string
177 Author string
178 Status string
178 Status string
179 CreatedAt time.Time
179 CreatedAt time.Time
180 UpdatedAt time.Time
180 UpdatedAt time.Time
181 Draft bool
181 Draft bool
182 Labels string
182 Labels string
183 RemoveSourceBranch bool
184 Squash bool
185 SquashMessage string
183}
186}
184
187
185// CreateMergeRequest nummert per repository.
188// CreateMergeRequest nummert per repository.
@@ -222,23 +225,29 @@ func (s *Store) MergeRequestByNumber(ctx context.Context, repoID, number int64)
222 return scanMR(row)
225 return scanMR(row)
223}
226}
224
227
225const 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
228const 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, m.remove_source_branch, m.squash, m.squash_message
226FROM merge_requests m JOIN users u ON u.id = m.author_id`
229FROM merge_requests m JOIN users u ON u.id = m.author_id`
227
230
228func scanMR(row *sql.Row) (MergeRequest, error) {
231func scanMR(row *sql.Row) (MergeRequest, error) {
229 var m MergeRequest
232 var m MergeRequest
230 var created, updated string
233 var created, updated string
231 var draft int
234 var draft, remove, squash int
232 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 {
235 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, &remove, &squash, &m.SquashMessage); err != nil {
233 if errors.Is(err, sql.ErrNoRows) {
236 if errors.Is(err, sql.ErrNoRows) {
234 return MergeRequest{}, errNotFound
237 return MergeRequest{}, errNotFound
235 }
238 }
236 return MergeRequest{}, err
239 return MergeRequest{}, err
237 }
240 }
241 applyMR(&m, created, updated, draft, remove, squash)
242 return m, nil
243}
244
245func applyMR(m *MergeRequest, created, updated string, draft, remove, squash int) {
238 m.CreatedAt = parseTime(created)
246 m.CreatedAt = parseTime(created)
239 m.UpdatedAt = parseTime(updated)
247 m.UpdatedAt = parseTime(updated)
240 m.Draft = draft == 1
248 m.Draft = draft == 1
241 return m, nil
249 m.RemoveSourceBranch = remove == 1
250 m.Squash = squash == 1
242}
251}
243
252
244// ListMergeRequests geeft verzoeken, open eerst.
253// ListMergeRequests geeft verzoeken, open eerst.
@@ -284,13 +293,11 @@ func scanMRList(rows *sql.Rows) ([]MergeRequest, error) {
284 for rows.Next() {
293 for rows.Next() {
285 var m MergeRequest
294 var m MergeRequest
286 var created, updated string
295 var created, updated string
287 var draft int
296 var draft, remove, squash int
288 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 {
297 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, &remove, &squash, &m.SquashMessage); err != nil {
289 return nil, err
298 return nil, err
290 }
299 }
291 m.CreatedAt = parseTime(created)
300 applyMR(&m, created, updated, draft, remove, squash)
292 m.UpdatedAt = parseTime(updated)
293 m.Draft = draft == 1
294 out = append(out, m)
301 out = append(out, m)
295 }
302 }
296 return out, rows.Err()
303 return out, rows.Err()
internal/store/merge_opts_test.go added +40 −0
@@ -0,0 +1,40 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 )
7
8 func TestMergeOptionsDefaultAndSave(t *testing.T) {
9 s := openStore(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 repo, err := s.CreateRepo(ctx, "user", tim.ID, "app", "", "master", "private")
16 if err != nil {
17 t.Fatal(err)
18 }
19 mr, err := s.CreateMergeRequest(ctx, repo.ID, tim.ID, "titel", "", "feature", "master")
20 if err != nil {
21 t.Fatal(err)
22 }
23 if !mr.RemoveSourceBranch || mr.Squash || mr.SquashMessage != "" {
24 t.Fatalf("standaard %+v", mr)
25 }
26 if err := s.SetMergeOptions(ctx, mr.ID, false, true, " één commit "); err != nil {
27 t.Fatal(err)
28 }
29 got, err := s.MergeRequestByNumber(ctx, repo.ID, mr.Number)
30 if err != nil {
31 t.Fatal(err)
32 }
33 if got.RemoveSourceBranch || !got.Squash || got.SquashMessage != " één commit " {
34 t.Fatalf("opgeslagen %+v", got)
35 }
36 list, err := s.ListMergeRequests(ctx, repo.ID)
37 if err != nil || len(list) != 1 || list[0].Squash != got.Squash || list[0].RemoveSourceBranch != got.RemoveSourceBranch {
38 t.Fatalf("lijst %+v %v", list, err)
39 }
40 }
@@ -0,0 +1,40 @@
1package store
2
3import (
4 "context"
5 "testing"
6)
7
8func TestMergeOptionsDefaultAndSave(t *testing.T) {
9 s := openStore(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 repo, err := s.CreateRepo(ctx, "user", tim.ID, "app", "", "master", "private")
16 if err != nil {
17 t.Fatal(err)
18 }
19 mr, err := s.CreateMergeRequest(ctx, repo.ID, tim.ID, "titel", "", "feature", "master")
20 if err != nil {
21 t.Fatal(err)
22 }
23 if !mr.RemoveSourceBranch || mr.Squash || mr.SquashMessage != "" {
24 t.Fatalf("standaard %+v", mr)
25 }
26 if err := s.SetMergeOptions(ctx, mr.ID, false, true, " één commit "); err != nil {
27 t.Fatal(err)
28 }
29 got, err := s.MergeRequestByNumber(ctx, repo.ID, mr.Number)
30 if err != nil {
31 t.Fatal(err)
32 }
33 if got.RemoveSourceBranch || !got.Squash || got.SquashMessage != " één commit " {
34 t.Fatalf("opgeslagen %+v", got)
35 }
36 list, err := s.ListMergeRequests(ctx, repo.ID)
37 if err != nil || len(list) != 1 || list[0].Squash != got.Squash || list[0].RemoveSourceBranch != got.RemoveSourceBranch {
38 t.Fatalf("lijst %+v %v", list, err)
39 }
40}
internal/store/mr_extra.go +14 −0
@@ -8,6 +8,20 @@ import (
8 8 "gitlab.com/Timfa/bluegit/internal/i18n"
9 9 )
10 10
11 // SetMergeOptions bewaart of de bronbranch weg mag en of de commits één commit worden.
12 func (s *Store) SetMergeOptions(ctx context.Context, id int64, remove, squash bool, message string) error {
13 rb, sb := 0, 0
14 if remove {
15 rb = 1
16 }
17 if squash {
18 sb = 1
19 }
20 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET remove_source_branch = ?, squash = ?, squash_message = ?, updated_at = ? WHERE id = ?`,
21 rb, sb, trim(message, 20000), now(), id)
22 return err
23 }
24
11 25 // SetDraft zet of haalt het conceptvinkje weg.
12 26 func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {
13 27 bit := 0
@@ -8,6 +8,20 @@ import (
8 "gitlab.com/Timfa/bluegit/internal/i18n"
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9)
9)
10
10
11// SetMergeOptions bewaart of de bronbranch weg mag en of de commits één commit worden.
12func (s *Store) SetMergeOptions(ctx context.Context, id int64, remove, squash bool, message string) error {
13 rb, sb := 0, 0
14 if remove {
15 rb = 1
16 }
17 if squash {
18 sb = 1
19 }
20 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET remove_source_branch = ?, squash = ?, squash_message = ?, updated_at = ? WHERE id = ?`,
21 rb, sb, trim(message, 20000), now(), id)
22 return err
23}
24
11// SetDraft zet of haalt het conceptvinkje weg.
25// SetDraft zet of haalt het conceptvinkje weg.
12func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {
26func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {
13 bit := 0
27 bit := 0
internal/store/store.go +6 −0
@@ -92,6 +92,9 @@ func (s *Store) migrate() error {
92 92 `ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
93 93 `ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,
94 94 `ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,
95 `ALTER TABLE merge_requests ADD COLUMN remove_source_branch INTEGER NOT NULL DEFAULT 1`,
96 `ALTER TABLE merge_requests ADD COLUMN squash INTEGER NOT NULL DEFAULT 0`,
97 `ALTER TABLE merge_requests ADD COLUMN squash_message TEXT NOT NULL DEFAULT ''`,
95 98 `ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
96 99 `ALTER TABLE secrets ADD COLUMN invisible INTEGER NOT NULL DEFAULT 0`,
97 100 `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
@@ -251,6 +254,9 @@ CREATE TABLE IF NOT EXISTS merge_requests (
251 254 updated_at TEXT NOT NULL,
252 255 draft INTEGER NOT NULL DEFAULT 0,
253 256 labels TEXT NOT NULL DEFAULT '',
257 remove_source_branch INTEGER NOT NULL DEFAULT 1,
258 squash INTEGER NOT NULL DEFAULT 0,
259 squash_message TEXT NOT NULL DEFAULT '',
254 260 UNIQUE(repo_id, number)
255 261 );
256 262 CREATE TABLE IF NOT EXISTS pipelines (
@@ -92,6 +92,9 @@ func (s *Store) migrate() error {
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`,
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 ''`,
94 `ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,
95 `ALTER TABLE merge_requests ADD COLUMN remove_source_branch INTEGER NOT NULL DEFAULT 1`,
96 `ALTER TABLE merge_requests ADD COLUMN squash INTEGER NOT NULL DEFAULT 0`,
97 `ALTER TABLE merge_requests ADD COLUMN squash_message TEXT NOT NULL DEFAULT ''`,
95 `ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
98 `ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
96 `ALTER TABLE secrets ADD COLUMN invisible INTEGER NOT NULL DEFAULT 0`,
99 `ALTER TABLE secrets ADD COLUMN invisible INTEGER NOT NULL DEFAULT 0`,
97 `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
100 `ALTER TABLE webhooks ADD COLUMN fields_json TEXT NOT NULL DEFAULT ''`,
@@ -251,6 +254,9 @@ CREATE TABLE IF NOT EXISTS merge_requests (
251 updated_at TEXT NOT NULL,
254 updated_at TEXT NOT NULL,
252 draft INTEGER NOT NULL DEFAULT 0,
255 draft INTEGER NOT NULL DEFAULT 0,
253 labels TEXT NOT NULL DEFAULT '',
256 labels TEXT NOT NULL DEFAULT '',
257 remove_source_branch INTEGER NOT NULL DEFAULT 1,
258 squash INTEGER NOT NULL DEFAULT 0,
259 squash_message TEXT NOT NULL DEFAULT '',
254 UNIQUE(repo_id, number)
260 UNIQUE(repo_id, number)
255);
261);
256CREATE TABLE IF NOT EXISTS pipelines (
262CREATE TABLE IF NOT EXISTS pipelines (