BlueGit

timfa bluegit

Files

bluegit / internal / server / mr_page.go

mr_page.go

fix: toon mergeblokkades en markeer een al gepushte merge
timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa · 3 weeks ago
81edde89 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.fillTpl(r, repo, "mr", &v.FormBody, &v.TplPick, &v.DescTpls)
62 s.render(w, "newmr", v)
63}
64
65func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
66 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
67 if !ok || !s.csrfOK(w, r) {
68 return
69 }
70 if u.ID == 0 {
71 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
72 return
73 }
74 body := r.FormValue("body")
75 if len(body) > 20000 {
76 body = body[:20000]
77 }
78 w.Header().Set("Content-Type", "text/html; charset=utf-8")
79 _, _ = w.Write([]byte(markdown.RenderTasks(body, "", "", "/"+repo.FullPath(), markdown.Tasks{Count: s.tr(r, "tpl.tasks")})))
80}
81
82func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
83 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
84 if !ok || !s.csrfOK(w, r) {
85 return
86 }
87 n, err := strconv.ParseInt(r.PathValue("number"), 10, 64)
88 if err != nil {
89 http.NotFound(w, r)
90 return
91 }
92 back := repoURL(repo) + "/-/merge-requests/" + r.PathValue("number")
93 if _, err := s.opUpdateMR(r.Context(), u, repo, n, r.FormValue("title"), r.FormValue("description"), r.FormValue("labels")); !s.uiOK(w, r, back, err) {
94 return
95 }
96 s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "")
97}
98
99func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
100 canText := mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
101 v.DescHTML = template.HTML(markdown.RenderTasks(mr.Description, "", "", "/"+repo.FullPath(), s.taskOpt(r, v.CSRF, repo, "mr", strconv.FormatInt(mr.Number, 10), canText)))
102 v.Labels = splitLabels(mr.Labels)
103 v.CanEditMR = canText
104 switch r.URL.Query().Get("tab") {
105 case "commits", "pipelines", "changes":
106 v.Tab = r.URL.Query().Get("tab")
107 default:
108 v.Tab = "overview"
109 }
110 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
111 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
112 rows := buildNoteRows(raw, s.langOf(r), noteRender{
113 RepoPath: "/" + repo.FullPath(), Post: repoURL(repo) + "/-/tasks", CSRF: v.CSRF,
114 Count: s.tr(r, "tpl.tasks"), Toggle: s.tr(r, "tpl.toggle"), ViewerID: u.ID,
115 })
116 v.Notes = stampNotes(v.CommitDiff, rows)
117 s.fillTimeline(r, v, repo, mr, rows)
118}
119
120func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
121 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
122 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
123 for _, name := range names {
124 v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})
125 }
126 tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
127 for _, name := range tags {
128 v.Tags = append(v.Tags, TagRow{Name: name})
129 }
130}
131
132// fillCompare vult commits (from..to) en de three-dot diff (from...to).
133func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) {
134 v.CompareFrom = from
135 v.CompareTo = to
136 if from == "" || to == "" || from == to {
137 return
138 }
139 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
140 commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50)
141 if err == nil && len(commits) > 0 {
142 v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
143 if len(commits) == 1 {
144 v.FormTitle = commits[0].Subject
145 }
146 }
147 if v.FormTitle == "" {
148 v.FormTitle = s.tr(r, "mr.mergeTitle", to, from)
149 }
150 files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to)
151 if err == nil {
152 v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files)
153 }
154 if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil {
155 v.Diff = stat
156 }
157}
158
159func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
160 lang := s.langOf(r)
161 items := []TimelineItem{{
162 Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
163 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
164 }}
165 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
166 for _, e := range events {
167 key := mrEventKey(e.Kind)
168 if key == "" {
169 continue
170 }
171 items = append(items, TimelineItem{
172 Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
173 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
174 })
175 }
176 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
177 for _, rev := range revs {
178 items = append(items, TimelineItem{
179 Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
180 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
181 })
182 }
183 pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID)
184 for _, p := range pipes {
185 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
186 status := displayStatus(p.Status, jobs)
187 label := s.tr(r, "pipe."+status)
188 v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
189 items = append(items, TimelineItem{
190 Kind: "pipeline", Actor: p.Actor,
191 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
192 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
193 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
194 })
195 }
196 for _, n := range rows {
197 if n.ParentID != 0 {
198 continue
199 }
200 item := TimelineItem{
201 ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
202 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
203 }
204 for _, rp := range n.Replies {
205 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
206 }
207 items = append(items, item)
208 }
209 sort.SliceStable(items, func(i, j int) bool {
210 if items[i].At.Equal(items[j].At) {
211 return items[i].Rank < items[j].Rank
212 }
213 return items[i].At.Before(items[j].At)
214 })
215 v.Timeline = items
216}
217
218func mrEventKey(kind string) string {
219 switch kind {
220 case "pushed":
221 return "mr.pushed"
222 case "retitled":
223 return "mr.retitled"
224 case "relabeled":
225 return "mr.relabeled"
226 case "merged":
227 return "mr.mergedEvent"
228 case "forced":
229 return "mr.forcedEvent"
230 case "closed":
231 return "mr.closedEvent"
232 case "reopened":
233 return "mr.reopenedEvent"
234 default:
235 return ""
236 }
237}
238
239func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow {
240 placed := map[int64]bool{}
241 if diff != nil {
242 for i := range diff.Files {
243 for j := range diff.Files[i].Lines {
244 ln := &diff.Files[i].Lines[j]
245 if ln.New == 0 {
246 continue
247 }
248 for _, note := range rows {
249 if note.ParentID != 0 {
250 continue
251 }
252 if note.Path == diff.Files[i].Path && note.End == ln.New {
253 ln.Notes = append(ln.Notes, note)
254 placed[note.ID] = true
255 }
256 }
257 }
258 }
259 }
260 var general []NoteRow
261 for _, note := range rows {
262 if note.ParentID != 0 {
263 continue
264 }
265 if note.Path == "" || !placed[note.ID] {
266 general = append(general, note)
267 }
268 }
269 return general
270}
271
272func splitLabels(raw string) []string {
273 var out []string
274 for _, part := range strings.Split(raw, ",") {
275 part = strings.TrimSpace(part)
276 if part != "" {
277 out = append(out, part)
278 }
279 }
280 return out
281}
282
283func normalizeLabels(raw string) string {
284 return strings.Join(splitLabels(raw), ", ")
285}
286
287func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) {
288 if s.StoragePath() == "" || branch == "" || after == "" {
289 return
290 }
291 ctx := context.Background()
292 mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch)
293 if err != nil || len(mrs) == 0 {
294 return
295 }
296 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
297 rev := after
298 limit := 1
299 if before != "" && strings.Trim(before, "0") != "" {
300 rev = before + ".." + after
301 limit = 20
302 }
303 subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit)
304 if err != nil || len(subjects) == 0 {
305 return
306 }
307 body := strings.Join(subjects, "\n")
308 for _, mr := range mrs {
309 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
310 }
311}