BlueGit

timfa bluegit

Files

bluegit / internal / server / suggest.go

suggest.go

feat: breid branches en merge requests uit
timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa · 3 weeks ago
Failed 7cb4d08b History
suggest.go 5.1 KiB Download Raw
1package server
2
3import (
4 "html/template"
5 "net/http"
6 "os"
7 "strconv"
8 "strings"
9
10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 "gitlab.com/Timfa/bluegit/internal/markdown"
14 "gitlab.com/Timfa/bluegit/internal/store"
15)
16
17func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
18 rows := make([]NoteRow, len(notes))
19 index := map[int64]int{}
20 for i, n := range notes {
21 rows[i] = NoteRow{
22 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
23 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
24 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
25 HTML: template.HTML(markdown.Render(n.Body, "", "")),
26 }
27 index[n.ID] = i
28 }
29 for i := range rows {
30 parent := rows[i].ParentID
31 if parent == 0 {
32 continue
33 }
34 pi, ok := index[parent]
35 if !ok || rows[pi].ParentID != 0 {
36 rows[i].ParentID = 0
37 continue
38 }
39 rows[pi].Replies = append(rows[pi].Replies, rows[i])
40 }
41 return rows
42}
43
44func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
45 rows := buildNoteRows(notes, lang)
46 placed := map[int64]bool{}
47 var views []DiffFileView
48 for _, f := range files {
49 view := DiffFileView{Path: f.Path}
50 for _, ln := range f.Lines {
51 row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
52 if ln.New > 0 {
53 for _, note := range rows {
54 if note.ParentID != 0 {
55 continue
56 }
57 if note.Path == f.Path && note.End == ln.New {
58 row.Notes = append(row.Notes, note)
59 placed[note.ID] = true
60 }
61 }
62 }
63 view.Lines = append(view.Lines, row)
64 }
65 views = append(views, view)
66 }
67 var general []NoteRow
68 for _, note := range rows {
69 if note.ParentID != 0 {
70 continue
71 }
72 if note.Path == "" || !placed[note.ID] {
73 general = append(general, note)
74 }
75 }
76 return general, views
77}
78
79func repoPath(raw string) (string, bool) {
80 raw = strings.TrimSpace(raw)
81 if raw == "" {
82 return "", true
83 }
84 p := strings.ReplaceAll(raw, `\`, "/")
85 if strings.HasPrefix(p, "/") || strings.Contains(p, "..") || strings.ContainsAny(p, "\r\n") {
86 return "", false
87 }
88 return p, true
89}
90
91func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
92 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
93 if !ok || !s.csrfOK(w, r) {
94 return
95 }
96 mr, err := s.mrFromRequest(r, repo.ID)
97 if err != nil || mr.Status != "open" {
98 http.NotFound(w, r)
99 return
100 }
101 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
102 patterns, err := s.Store.ProtectedPatterns(r.Context(), repo.ID)
103 if err != nil {
104 s.redirect(w, r, back, "", s.trErr(r, err))
105 return
106 }
107 if !role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch)) {
108 s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
109 return
110 }
111 if s.StoragePath() == "" {
112 s.redirect(w, r, back, "", s.tr(r, "err.noStorage"))
113 return
114 }
115 title := strings.TrimSpace(r.FormValue("title"))
116 if title == "" || strings.ContainsAny(title, "\r\n") {
117 s.redirect(w, r, back, "", s.tr(r, "err.sugTitle"))
118 return
119 }
120 notes, err := s.Store.ListNotes(r.Context(), mr.ID)
121 if err != nil {
122 s.redirect(w, r, back, "", s.trErr(r, err))
123 return
124 }
125 byID := map[int64]store.Note{}
126 for _, n := range notes {
127 byID[n.ID] = n
128 }
129 var edits []gitrepo.SuggestionEdit
130 seen := map[int64]bool{}
131 for _, raw := range r.Form["id"] {
132 id, err := strconv.ParseInt(raw, 10, 64)
133 if err != nil || seen[id] {
134 continue
135 }
136 seen[id] = true
137 n, ok := byID[id]
138 if !ok || n.Suggestion == "" || n.FilePath == "" {
139 s.redirect(w, r, back, "", s.tr(r, "err.sugGone"))
140 return
141 }
142 edits = append(edits, gitrepo.SuggestionEdit{
143 Path: n.FilePath, Start: n.LineStart, End: n.LineEnd,
144 Base: n.BaseText, Replacement: n.Suggestion,
145 })
146 }
147 if len(edits) == 0 {
148 s.redirect(w, r, back, "", s.tr(r, "err.sugEmpty"))
149 return
150 }
151 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
152 files := map[string]string{}
153 for _, e := range edits {
154 if _, ok := files[e.Path]; ok {
155 continue
156 }
157 body, err := gitrepo.BlobText(r.Context(), s.Git, dir, mr.SourceBranch, e.Path)
158 if err != nil {
159 s.redirect(w, r, back, "", s.tr(r, "err.sugConflict", e.Path, e.Start, e.End))
160 return
161 }
162 files[e.Path] = body
163 }
164 updated, err := gitrepo.ApplySuggestions(files, edits)
165 if err != nil {
166 s.redirect(w, r, back, "", s.trErr(r, err))
167 return
168 }
169 branch := safeRev(mr.SourceBranch, "")
170 if branch == "" {
171 s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
172 return
173 }
174 work, err := s.scratchDir("suggest")
175 if err != nil {
176 s.redirect(w, r, back, "", s.commitProblem(r, err))
177 return
178 }
179 defer os.RemoveAll(work)
180 email := u.Username + "@users.git.timfalken.com"
181 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
182 return gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns)
183 }); err != nil {
184 s.redirect(w, r, back, "", s.commitProblem(r, err))
185 return
186 }
187 s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
188}