BlueGit

timfa bluegit

Files

bluegit / internal / server / mr_page.go

mr_page.go

feat: breid branches en merge requests uit
timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa · 3 weeks ago
Failed 7cb4d08b History
mr_page.go 9.1 KiB Download Raw
1package server
2
3import (
4 "context"
5 "html/template"
6 "net/http"
7 "sort"
8 "strconv"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/markdown"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func (s *Server) compare(w http.ResponseWriter, r *http.Request) {
19 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
20 if !ok {
21 return
22 }
23 v := s.repoView(w, r, repo, role, "branch.compare")
24 v.Title = s.tr(r, "branch.compare")
25 v.Page = "compare"
26 v.Wide = true
27 s.fillBranchChoices(r, &v, repo)
28 from := safeRev(r.URL.Query().Get("from"), repo.DefaultBranch)
29 to := safeRev(r.URL.Query().Get("to"), "")
30 s.fillCompare(r, &v, repo, from, to)
31 s.render(w, "compare", v)
32}
33
34func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
35 _, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
36 if !ok {
37 return
38 }
39 if !role.CanWriteCode() {
40 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
41 return
42 }
43 v := s.repoView(w, r, repo, role, "mr.create")
44 v.Title = s.tr(r, "mr.create")
45 v.Page = "newmr"
46 v.Wide = true
47 s.fillBranchChoices(r, &v, repo)
48 source := safeRev(r.URL.Query().Get("source"), "")
49 target := safeRev(r.URL.Query().Get("target"), repo.DefaultBranch)
50 if source == "" {
51 for _, b := range v.Branches {
52 if b.Name != target {
53 source = b.Name
54 break
55 }
56 }
57 }
58 s.fillCompare(r, &v, repo, target, source)
59 v.CompareFrom = source
60 v.CompareTo = target
61 s.render(w, "newmr", v)
62}
63
64func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
65 u, _, _, ok := s.guard(w, r, access.RoleReadonly)
66 if !ok || !s.csrfOK(w, r) {
67 return
68 }
69 if u.ID == 0 {
70 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
71 return
72 }
73 body := r.FormValue("body")
74 if len(body) > 20000 {
75 body = body[:20000]
76 }
77 w.Header().Set("Content-Type", "text/html; charset=utf-8")
78 _, _ = w.Write([]byte(markdown.Render(body, "", "")))
79}
80
81func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
82 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
83 if !ok || !s.csrfOK(w, r) {
84 return
85 }
86 mr, err := s.mrFromRequest(r, repo.ID)
87 if err != nil {
88 http.NotFound(w, r)
89 return
90 }
91 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
92 if mr.Status != "open" || u.ID == 0 || (u.ID != mr.AuthorID && !role.CanWriteCode()) {
93 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
94 return
95 }
96 title := strings.TrimSpace(r.FormValue("title"))
97 description := r.FormValue("description")
98 labels := normalizeLabels(r.FormValue("labels"))
99 if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, title, description, labels); err != nil {
100 s.redirect(w, r, back, "", s.trErr(r, err))
101 return
102 }
103 if title != mr.Title {
104 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "retitled", title)
105 }
106 if labels != normalizeLabels(mr.Labels) {
107 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "relabeled", labels)
108 }
109 s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "")
110}
111
112func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
113 v.DescHTML = template.HTML(markdown.Render(mr.Description, "", ""))
114 v.Labels = splitLabels(mr.Labels)
115 v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
116 switch r.URL.Query().Get("tab") {
117 case "commits", "pipelines", "changes":
118 v.Tab = r.URL.Query().Get("tab")
119 default:
120 v.Tab = "overview"
121 }
122 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
123 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
124 rows := buildNoteRows(raw, s.langOf(r))
125 v.Notes = stampNotes(v.CommitDiff, rows)
126 s.fillTimeline(r, v, repo, mr, rows)
127}
128
129func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
130 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
131 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
132 for _, name := range names {
133 v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})
134 }
135 tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
136 for _, name := range tags {
137 v.Tags = append(v.Tags, TagRow{Name: name})
138 }
139}
140
141// fillCompare vult commits (from..to) en de three-dot diff (from...to).
142func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) {
143 v.CompareFrom = from
144 v.CompareTo = to
145 if from == "" || to == "" || from == to {
146 return
147 }
148 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149 commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50)
150 if err == nil && len(commits) > 0 {
151 v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
152 if len(commits) == 1 {
153 v.FormTitle = commits[0].Subject
154 }
155 }
156 if v.FormTitle == "" {
157 v.FormTitle = s.tr(r, "mr.mergeTitle", to, from)
158 }
159 files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to)
160 if err == nil {
161 v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files)
162 }
163 if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil {
164 v.Diff = stat
165 }
166}
167
168func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
169 lang := s.langOf(r)
170 items := []TimelineItem{{
171 Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
172 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
173 }}
174 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
175 for _, e := range events {
176 key := mrEventKey(e.Kind)
177 if key == "" {
178 continue
179 }
180 items = append(items, TimelineItem{
181 Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
182 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
183 })
184 }
185 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
186 for _, rev := range revs {
187 items = append(items, TimelineItem{
188 Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
189 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
190 })
191 }
192 pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID)
193 for _, p := range pipes {
194 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
195 status := displayStatus(p.Status, jobs)
196 label := s.tr(r, "pipe."+status)
197 v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
198 items = append(items, TimelineItem{
199 Kind: "pipeline", Actor: p.Actor,
200 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
201 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
202 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
203 })
204 }
205 for _, n := range rows {
206 if n.ParentID != 0 {
207 continue
208 }
209 item := TimelineItem{
210 ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
211 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
212 }
213 for _, rp := range n.Replies {
214 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
215 }
216 items = append(items, item)
217 }
218 sort.SliceStable(items, func(i, j int) bool {
219 if items[i].At.Equal(items[j].At) {
220 return items[i].Rank < items[j].Rank
221 }
222 return items[i].At.Before(items[j].At)
223 })
224 v.Timeline = items
225}
226
227func mrEventKey(kind string) string {
228 switch kind {
229 case "pushed":
230 return "mr.pushed"
231 case "retitled":
232 return "mr.retitled"
233 case "relabeled":
234 return "mr.relabeled"
235 case "merged":
236 return "mr.mergedEvent"
237 case "closed":
238 return "mr.closedEvent"
239 case "reopened":
240 return "mr.reopenedEvent"
241 default:
242 return ""
243 }
244}
245
246func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow {
247 placed := map[int64]bool{}
248 if diff != nil {
249 for i := range diff.Files {
250 for j := range diff.Files[i].Lines {
251 ln := &diff.Files[i].Lines[j]
252 if ln.New == 0 {
253 continue
254 }
255 for _, note := range rows {
256 if note.ParentID != 0 {
257 continue
258 }
259 if note.Path == diff.Files[i].Path && note.End == ln.New {
260 ln.Notes = append(ln.Notes, note)
261 placed[note.ID] = true
262 }
263 }
264 }
265 }
266 }
267 var general []NoteRow
268 for _, note := range rows {
269 if note.ParentID != 0 {
270 continue
271 }
272 if note.Path == "" || !placed[note.ID] {
273 general = append(general, note)
274 }
275 }
276 return general
277}
278
279func splitLabels(raw string) []string {
280 var out []string
281 for _, part := range strings.Split(raw, ",") {
282 part = strings.TrimSpace(part)
283 if part != "" {
284 out = append(out, part)
285 }
286 }
287 return out
288}
289
290func normalizeLabels(raw string) string {
291 return strings.Join(splitLabels(raw), ", ")
292}
293
294func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) {
295 if s.StoragePath() == "" || branch == "" || after == "" {
296 return
297 }
298 ctx := context.Background()
299 mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch)
300 if err != nil || len(mrs) == 0 {
301 return
302 }
303 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
304 rev := after
305 limit := 1
306 if before != "" && strings.Trim(before, "0") != "" {
307 rev = before + ".." + after
308 limit = 20
309 }
310 subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit)
311 if err != nil || len(subjects) == 0 {
312 return
313 }
314 body := strings.Join(subjects, "\n")
315 for _, mr := range mrs {
316 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
317 }
318}