BlueGit

timfa bluegit

Merge branch 'cursor/mr-suggesties-65da' into 'master'

Reacties en suggesties op merge requests

See merge request Timfa/bluegit!8

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
c8dd37b05059c26822f6d4139b58ce1496f5aa47
14 files changed +1365 −24
internal/gitrepo/diff.go added +149 −0
@@ -0,0 +1,149 @@
1 package gitrepo
2
3 import (
4 "context"
5 "errors"
6 "os/exec"
7 "strconv"
8 "strings"
9 )
10
11 // DiffLine is één regel in een unified diff.
12 // New is het regelnummer in het nieuwe bestand. 0 betekent dat de regel
13 // alleen in het oude bestand staat.
14 type DiffLine struct {
15 Kind string
16 Old int
17 New int
18 Text string
19 }
20
21 // DiffFile is één bestand in een diff.
22 type DiffFile struct {
23 Path string
24 Lines []DiffLine
25 }
26
27 // DiffFiles vergelijkt source met de merge-base van target.
28 // Een diff zonder wijzigingen is een lege lijst.
29 func DiffFiles(ctx context.Context, gitBin, dir, target, source string) ([]DiffFile, error) {
30 out, err := runAllow(ctx, gitBin, nil, 1, "-C", dir, "diff", "--no-color", "--unified=3", target+"..."+source)
31 if err != nil {
32 return nil, err
33 }
34 return ParseDiff(out), nil
35 }
36
37 // BlobText leest een bestand op een revisie. Een ontbrekend bestand is een fout.
38 func BlobText(ctx context.Context, gitBin, dir, rev, path string) (string, error) {
39 return run(ctx, gitBin, nil, "-C", dir, "show", rev+":"+path)
40 }
41
42 // ParseDiff leest de tekst van git diff.
43 func ParseDiff(raw string) []DiffFile {
44 var files []DiffFile
45 var cur *DiffFile
46 var oldLine, newLine int
47 inHunk := false
48 for _, line := range strings.Split(raw, "\n") {
49 switch {
50 case strings.HasPrefix(line, "diff --git "):
51 files = append(files, DiffFile{})
52 cur = &files[len(files)-1]
53 oldLine, newLine = 0, 0
54 inHunk = false
55 case cur == nil:
56 continue
57 case !inHunk && strings.HasPrefix(line, "rename to "):
58 cur.Path = strings.TrimSpace(strings.TrimPrefix(line, "rename to "))
59 case !inHunk && strings.HasPrefix(line, "+++ "):
60 p := strings.TrimSpace(strings.TrimPrefix(line, "+++ "))
61 if p != "/dev/null" {
62 cur.Path = stripAB(p)
63 }
64 case strings.HasPrefix(line, "@@"):
65 oldLine, newLine = hunkStart(line)
66 oldLine--
67 newLine--
68 inHunk = true
69 cur.Lines = append(cur.Lines, DiffLine{Kind: "hunk", Text: line})
70 case !inHunk:
71 continue
72 case strings.HasPrefix(line, `\`):
73 continue
74 case strings.HasPrefix(line, "+"):
75 newLine++
76 cur.Lines = append(cur.Lines, DiffLine{Kind: "add", New: newLine, Text: line[1:]})
77 case strings.HasPrefix(line, "-"):
78 oldLine++
79 cur.Lines = append(cur.Lines, DiffLine{Kind: "del", Old: oldLine, Text: line[1:]})
80 case strings.HasPrefix(line, " "):
81 oldLine++
82 newLine++
83 cur.Lines = append(cur.Lines, DiffLine{Kind: "ctx", Old: oldLine, New: newLine, Text: line[1:]})
84 }
85 }
86 var out []DiffFile
87 for _, f := range files {
88 if f.Path != "" {
89 out = append(out, f)
90 }
91 }
92 return out
93 }
94
95 func hunkStart(line string) (old, new int) {
96 parts := strings.Fields(line)
97 if len(parts) < 3 {
98 return 0, 0
99 }
100 return sideStart(parts[1]), sideStart(parts[2])
101 }
102
103 func sideStart(s string) int {
104 s = strings.TrimLeft(s, "+-")
105 if i := strings.IndexByte(s, ','); i >= 0 {
106 s = s[:i]
107 }
108 n, _ := strconv.Atoi(s)
109 return n
110 }
111
112 func stripAB(p string) string {
113 if strings.HasPrefix(p, `"`) {
114 if u, err := strconv.Unquote(p); err == nil {
115 p = u
116 }
117 }
118 if strings.HasPrefix(p, "a/") || strings.HasPrefix(p, "b/") {
119 return p[2:]
120 }
121 return p
122 }
123
124 // runAllow is run, maar exitcode allow is geen fout. git diff doet dat bij wijzigingen.
125 func runAllow(ctx context.Context, bin string, env []string, allow int, args ...string) (string, error) {
126 if bin == "" {
127 bin = "git"
128 }
129 cmd := exec.CommandContext(ctx, bin, args...)
130 if env != nil {
131 cmd.Env = env
132 }
133 var stdout, stderr strings.Builder
134 cmd.Stdout = &stdout
135 cmd.Stderr = &stderr
136 err := cmd.Run()
137 if err == nil {
138 return stdout.String(), nil
139 }
140 var ee *exec.ExitError
141 if errors.As(err, &ee) && ee.ExitCode() == allow {
142 return stdout.String(), nil
143 }
144 msg := strings.TrimSpace(stderr.String())
145 if msg == "" {
146 msg = err.Error()
147 }
148 return "", errors.New(msg)
149 }
@@ -0,0 +1,149 @@
1package gitrepo
2
3import (
4 "context"
5 "errors"
6 "os/exec"
7 "strconv"
8 "strings"
9)
10
11// DiffLine is één regel in een unified diff.
12// New is het regelnummer in het nieuwe bestand. 0 betekent dat de regel
13// alleen in het oude bestand staat.
14type DiffLine struct {
15 Kind string
16 Old int
17 New int
18 Text string
19}
20
21// DiffFile is één bestand in een diff.
22type DiffFile struct {
23 Path string
24 Lines []DiffLine
25}
26
27// DiffFiles vergelijkt source met de merge-base van target.
28// Een diff zonder wijzigingen is een lege lijst.
29func DiffFiles(ctx context.Context, gitBin, dir, target, source string) ([]DiffFile, error) {
30 out, err := runAllow(ctx, gitBin, nil, 1, "-C", dir, "diff", "--no-color", "--unified=3", target+"..."+source)
31 if err != nil {
32 return nil, err
33 }
34 return ParseDiff(out), nil
35}
36
37// BlobText leest een bestand op een revisie. Een ontbrekend bestand is een fout.
38func BlobText(ctx context.Context, gitBin, dir, rev, path string) (string, error) {
39 return run(ctx, gitBin, nil, "-C", dir, "show", rev+":"+path)
40}
41
42// ParseDiff leest de tekst van git diff.
43func ParseDiff(raw string) []DiffFile {
44 var files []DiffFile
45 var cur *DiffFile
46 var oldLine, newLine int
47 inHunk := false
48 for _, line := range strings.Split(raw, "\n") {
49 switch {
50 case strings.HasPrefix(line, "diff --git "):
51 files = append(files, DiffFile{})
52 cur = &files[len(files)-1]
53 oldLine, newLine = 0, 0
54 inHunk = false
55 case cur == nil:
56 continue
57 case !inHunk && strings.HasPrefix(line, "rename to "):
58 cur.Path = strings.TrimSpace(strings.TrimPrefix(line, "rename to "))
59 case !inHunk && strings.HasPrefix(line, "+++ "):
60 p := strings.TrimSpace(strings.TrimPrefix(line, "+++ "))
61 if p != "/dev/null" {
62 cur.Path = stripAB(p)
63 }
64 case strings.HasPrefix(line, "@@"):
65 oldLine, newLine = hunkStart(line)
66 oldLine--
67 newLine--
68 inHunk = true
69 cur.Lines = append(cur.Lines, DiffLine{Kind: "hunk", Text: line})
70 case !inHunk:
71 continue
72 case strings.HasPrefix(line, `\`):
73 continue
74 case strings.HasPrefix(line, "+"):
75 newLine++
76 cur.Lines = append(cur.Lines, DiffLine{Kind: "add", New: newLine, Text: line[1:]})
77 case strings.HasPrefix(line, "-"):
78 oldLine++
79 cur.Lines = append(cur.Lines, DiffLine{Kind: "del", Old: oldLine, Text: line[1:]})
80 case strings.HasPrefix(line, " "):
81 oldLine++
82 newLine++
83 cur.Lines = append(cur.Lines, DiffLine{Kind: "ctx", Old: oldLine, New: newLine, Text: line[1:]})
84 }
85 }
86 var out []DiffFile
87 for _, f := range files {
88 if f.Path != "" {
89 out = append(out, f)
90 }
91 }
92 return out
93}
94
95func hunkStart(line string) (old, new int) {
96 parts := strings.Fields(line)
97 if len(parts) < 3 {
98 return 0, 0
99 }
100 return sideStart(parts[1]), sideStart(parts[2])
101}
102
103func sideStart(s string) int {
104 s = strings.TrimLeft(s, "+-")
105 if i := strings.IndexByte(s, ','); i >= 0 {
106 s = s[:i]
107 }
108 n, _ := strconv.Atoi(s)
109 return n
110}
111
112func stripAB(p string) string {
113 if strings.HasPrefix(p, `"`) {
114 if u, err := strconv.Unquote(p); err == nil {
115 p = u
116 }
117 }
118 if strings.HasPrefix(p, "a/") || strings.HasPrefix(p, "b/") {
119 return p[2:]
120 }
121 return p
122}
123
124// runAllow is run, maar exitcode allow is geen fout. git diff doet dat bij wijzigingen.
125func runAllow(ctx context.Context, bin string, env []string, allow int, args ...string) (string, error) {
126 if bin == "" {
127 bin = "git"
128 }
129 cmd := exec.CommandContext(ctx, bin, args...)
130 if env != nil {
131 cmd.Env = env
132 }
133 var stdout, stderr strings.Builder
134 cmd.Stdout = &stdout
135 cmd.Stderr = &stderr
136 err := cmd.Run()
137 if err == nil {
138 return stdout.String(), nil
139 }
140 var ee *exec.ExitError
141 if errors.As(err, &ee) && ee.ExitCode() == allow {
142 return stdout.String(), nil
143 }
144 msg := strings.TrimSpace(stderr.String())
145 if msg == "" {
146 msg = err.Error()
147 }
148 return "", errors.New(msg)
149}
internal/gitrepo/suggest.go added +179 −0
@@ -0,0 +1,179 @@
1 package gitrepo
2
3 import (
4 "context"
5 "os"
6 "path/filepath"
7 "sort"
8 "strings"
9
10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 )
13
14 // SuggestionEdit vervangt de regels Start t/m End (1-based, inclusief)
15 // als die nog gelijk zijn aan Base.
16 type SuggestionEdit struct {
17 Path, Base, Replacement string
18 Start, End int
19 }
20
21 // ParseSuggestion haalt de eerste ```suggestion-blok uit een reactie.
22 // De tekst is zonder de afsluitende newline van het blok.
23 func ParseSuggestion(body string) (string, bool) {
24 body = strings.ReplaceAll(body, "\r\n", "\n")
25 const open = "```suggestion"
26 i := strings.Index(body, open)
27 if i < 0 {
28 return "", false
29 }
30 rest := body[i+len(open):]
31 nl := strings.IndexByte(rest, '\n')
32 if nl < 0 {
33 return "", false
34 }
35 rest = rest[nl+1:]
36 end := strings.Index(rest, "```")
37 if end < 0 {
38 return "", false
39 }
40 return strings.TrimSuffix(rest[:end], "\n"), true
41 }
42
43 // SplitLines splitst een bestand op newlines. Een afsluitende newline telt niet als lege regel.
44 func SplitLines(s string) []string {
45 if s == "" {
46 return nil
47 }
48 s = strings.TrimSuffix(s, "\n")
49 return strings.Split(s, "\n")
50 }
51
52 // ApplySuggestions past alle edits toe. Bij een conflict of overlap verandert er niets.
53 func ApplySuggestions(files map[string]string, edits []SuggestionEdit) (map[string]string, error) {
54 byPath := map[string][]SuggestionEdit{}
55 for _, e := range edits {
56 byPath[e.Path] = append(byPath[e.Path], e)
57 }
58 out := map[string]string{}
59 changed := false
60 for path, group := range byPath {
61 raw, ok := files[path]
62 if !ok {
63 return nil, i18n.E("err.sugFile")
64 }
65 sort.Slice(group, func(i, j int) bool { return group[i].Start < group[j].Start })
66 for i := 1; i < len(group); i++ {
67 if group[i].Start <= group[i-1].End {
68 return nil, i18n.E("err.sugOverlap", path)
69 }
70 }
71 lines := SplitLines(raw)
72 nl := strings.HasSuffix(raw, "\n") || raw == ""
73 sort.Slice(group, func(i, j int) bool { return group[i].Start > group[j].Start })
74 for _, e := range group {
75 if e.Start < 1 || e.End < e.Start || e.End > len(lines) {
76 return nil, i18n.E("err.sugConflict", path, e.Start, e.End)
77 }
78 base := strings.Join(lines[e.Start-1:e.End], "\n")
79 if base != e.Base {
80 return nil, i18n.E("err.sugConflict", path, e.Start, e.End)
81 }
82 var mid []string
83 if e.Replacement != "" {
84 mid = strings.Split(e.Replacement, "\n")
85 }
86 next := append([]string{}, lines[:e.Start-1]...)
87 next = append(next, mid...)
88 next = append(next, lines[e.End:]...)
89 lines = next
90 }
91 next := ""
92 if len(lines) > 0 {
93 next = strings.Join(lines, "\n")
94 if nl {
95 next += "\n"
96 }
97 }
98 if next != raw {
99 changed = true
100 out[path] = next
101 }
102 }
103 if !changed {
104 return nil, i18n.E("err.sugSame")
105 }
106 return out, nil
107 }
108
109 // CommitOnBranch schrijft files op branch en pusht één commit.
110 // De push loopt door de hook, met role en de beschermde patronen.
111 func CommitOnBranch(ctx context.Context, gitBin, bare, work, branch, author, email, title, description string, files map[string]string, role access.Role, patterns []string) error {
112 if err := os.RemoveAll(work); err != nil {
113 return err
114 }
115 if err := os.MkdirAll(filepath.Dir(work), 0o755); err != nil {
116 return err
117 }
118 if _, err := run(ctx, gitBin, nil, "clone", bare, work); err != nil {
119 return err
120 }
121 if _, err := run(ctx, gitBin, nil, "-C", work, "checkout", branch); err != nil {
122 return err
123 }
124 var paths []string
125 for path, body := range files {
126 if !safeWorkPath(path) {
127 return i18n.E("err.sugFile")
128 }
129 dst := filepath.Join(work, filepath.FromSlash(path))
130 if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
131 return err
132 }
133 if err := os.WriteFile(dst, []byte(body), 0o644); err != nil {
134 return err
135 }
136 paths = append(paths, path)
137 }
138 sort.Strings(paths)
139 args := append([]string{"-C", work, "add", "--"}, paths...)
140 if _, err := run(ctx, gitBin, nil, args...); err != nil {
141 return err
142 }
143 env := identityEnv(author, email)
144 commit := []string{"-C", work, "-c", "commit.gpgsign=false", "commit", "-m", title}
145 if strings.TrimSpace(description) != "" {
146 commit = append(commit, "-m", description)
147 }
148 if _, err := run(ctx, gitBin, env, commit...); err != nil {
149 return err
150 }
151 pushEnv := append(env, PushEnv(role, patterns)...)
152 if _, err := run(ctx, gitBin, pushEnv, "-C", work, "push", "origin", "HEAD:"+branch); err != nil {
153 return err
154 }
155 return nil
156 }
157
158 func identityEnv(author, email string) []string {
159 env := make([]string, 0, len(os.Environ())+4)
160 for _, e := range os.Environ() {
161 if strings.HasPrefix(e, "GIT_AUTHOR_") || strings.HasPrefix(e, "GIT_COMMITTER_") {
162 continue
163 }
164 env = append(env, e)
165 }
166 return append(env,
167 "GIT_AUTHOR_NAME="+author,
168 "GIT_AUTHOR_EMAIL="+email,
169 "GIT_COMMITTER_NAME="+author,
170 "GIT_COMMITTER_EMAIL="+email,
171 )
172 }
173
174 func safeWorkPath(p string) bool {
175 if p == "" || strings.HasPrefix(p, "/") || strings.Contains(p, `\`) || strings.Contains(p, "..") {
176 return false
177 }
178 return true
179 }
@@ -0,0 +1,179 @@
1package gitrepo
2
3import (
4 "context"
5 "os"
6 "path/filepath"
7 "sort"
8 "strings"
9
10 "gitlab.com/Timfa/bluegit/internal/access"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12)
13
14// SuggestionEdit vervangt de regels Start t/m End (1-based, inclusief)
15// als die nog gelijk zijn aan Base.
16type SuggestionEdit struct {
17 Path, Base, Replacement string
18 Start, End int
19}
20
21// ParseSuggestion haalt de eerste ```suggestion-blok uit een reactie.
22// De tekst is zonder de afsluitende newline van het blok.
23func ParseSuggestion(body string) (string, bool) {
24 body = strings.ReplaceAll(body, "\r\n", "\n")
25 const open = "```suggestion"
26 i := strings.Index(body, open)
27 if i < 0 {
28 return "", false
29 }
30 rest := body[i+len(open):]
31 nl := strings.IndexByte(rest, '\n')
32 if nl < 0 {
33 return "", false
34 }
35 rest = rest[nl+1:]
36 end := strings.Index(rest, "```")
37 if end < 0 {
38 return "", false
39 }
40 return strings.TrimSuffix(rest[:end], "\n"), true
41}
42
43// SplitLines splitst een bestand op newlines. Een afsluitende newline telt niet als lege regel.
44func SplitLines(s string) []string {
45 if s == "" {
46 return nil
47 }
48 s = strings.TrimSuffix(s, "\n")
49 return strings.Split(s, "\n")
50}
51
52// ApplySuggestions past alle edits toe. Bij een conflict of overlap verandert er niets.
53func ApplySuggestions(files map[string]string, edits []SuggestionEdit) (map[string]string, error) {
54 byPath := map[string][]SuggestionEdit{}
55 for _, e := range edits {
56 byPath[e.Path] = append(byPath[e.Path], e)
57 }
58 out := map[string]string{}
59 changed := false
60 for path, group := range byPath {
61 raw, ok := files[path]
62 if !ok {
63 return nil, i18n.E("err.sugFile")
64 }
65 sort.Slice(group, func(i, j int) bool { return group[i].Start < group[j].Start })
66 for i := 1; i < len(group); i++ {
67 if group[i].Start <= group[i-1].End {
68 return nil, i18n.E("err.sugOverlap", path)
69 }
70 }
71 lines := SplitLines(raw)
72 nl := strings.HasSuffix(raw, "\n") || raw == ""
73 sort.Slice(group, func(i, j int) bool { return group[i].Start > group[j].Start })
74 for _, e := range group {
75 if e.Start < 1 || e.End < e.Start || e.End > len(lines) {
76 return nil, i18n.E("err.sugConflict", path, e.Start, e.End)
77 }
78 base := strings.Join(lines[e.Start-1:e.End], "\n")
79 if base != e.Base {
80 return nil, i18n.E("err.sugConflict", path, e.Start, e.End)
81 }
82 var mid []string
83 if e.Replacement != "" {
84 mid = strings.Split(e.Replacement, "\n")
85 }
86 next := append([]string{}, lines[:e.Start-1]...)
87 next = append(next, mid...)
88 next = append(next, lines[e.End:]...)
89 lines = next
90 }
91 next := ""
92 if len(lines) > 0 {
93 next = strings.Join(lines, "\n")
94 if nl {
95 next += "\n"
96 }
97 }
98 if next != raw {
99 changed = true
100 out[path] = next
101 }
102 }
103 if !changed {
104 return nil, i18n.E("err.sugSame")
105 }
106 return out, nil
107}
108
109// CommitOnBranch schrijft files op branch en pusht één commit.
110// De push loopt door de hook, met role en de beschermde patronen.
111func CommitOnBranch(ctx context.Context, gitBin, bare, work, branch, author, email, title, description string, files map[string]string, role access.Role, patterns []string) error {
112 if err := os.RemoveAll(work); err != nil {
113 return err
114 }
115 if err := os.MkdirAll(filepath.Dir(work), 0o755); err != nil {
116 return err
117 }
118 if _, err := run(ctx, gitBin, nil, "clone", bare, work); err != nil {
119 return err
120 }
121 if _, err := run(ctx, gitBin, nil, "-C", work, "checkout", branch); err != nil {
122 return err
123 }
124 var paths []string
125 for path, body := range files {
126 if !safeWorkPath(path) {
127 return i18n.E("err.sugFile")
128 }
129 dst := filepath.Join(work, filepath.FromSlash(path))
130 if err := os.MkdirAll(filepath.Dir(dst), 0o755); err != nil {
131 return err
132 }
133 if err := os.WriteFile(dst, []byte(body), 0o644); err != nil {
134 return err
135 }
136 paths = append(paths, path)
137 }
138 sort.Strings(paths)
139 args := append([]string{"-C", work, "add", "--"}, paths...)
140 if _, err := run(ctx, gitBin, nil, args...); err != nil {
141 return err
142 }
143 env := identityEnv(author, email)
144 commit := []string{"-C", work, "-c", "commit.gpgsign=false", "commit", "-m", title}
145 if strings.TrimSpace(description) != "" {
146 commit = append(commit, "-m", description)
147 }
148 if _, err := run(ctx, gitBin, env, commit...); err != nil {
149 return err
150 }
151 pushEnv := append(env, PushEnv(role, patterns)...)
152 if _, err := run(ctx, gitBin, pushEnv, "-C", work, "push", "origin", "HEAD:"+branch); err != nil {
153 return err
154 }
155 return nil
156}
157
158func identityEnv(author, email string) []string {
159 env := make([]string, 0, len(os.Environ())+4)
160 for _, e := range os.Environ() {
161 if strings.HasPrefix(e, "GIT_AUTHOR_") || strings.HasPrefix(e, "GIT_COMMITTER_") {
162 continue
163 }
164 env = append(env, e)
165 }
166 return append(env,
167 "GIT_AUTHOR_NAME="+author,
168 "GIT_AUTHOR_EMAIL="+email,
169 "GIT_COMMITTER_NAME="+author,
170 "GIT_COMMITTER_EMAIL="+email,
171 )
172}
173
174func safeWorkPath(p string) bool {
175 if p == "" || strings.HasPrefix(p, "/") || strings.Contains(p, `\`) || strings.Contains(p, "..") {
176 return false
177 }
178 return true
179}
internal/gitrepo/suggest_test.go added +84 −0
@@ -0,0 +1,84 @@
1 package gitrepo
2
3 import (
4 "strconv"
5 "strings"
6 "testing"
7 )
8
9 func TestParseDiffAndSuggestion(t *testing.T) {
10 raw := "" +
11 "diff --git a/hello.txt b/hello.txt\n" +
12 "--- a/hello.txt\n" +
13 "+++ b/hello.txt\n" +
14 "@@ -1,3 +1,4 @@\n" +
15 " alpha\n" +
16 "-beta\n" +
17 "+BETA\n" +
18 "+extra\n" +
19 " gamma\n"
20 files := ParseDiff(raw)
21 if len(files) != 1 || files[0].Path != "hello.txt" {
22 t.Fatalf("%+v", files)
23 }
24 var news []int
25 for _, ln := range files[0].Lines {
26 if ln.New > 0 {
27 news = append(news, ln.New)
28 if ln.New == 2 && (ln.Kind != "add" || ln.Text != "BETA") {
29 t.Fatalf("regel 2 %+v", ln)
30 }
31 }
32 if ln.Kind == "del" && (ln.New != 0 || ln.Text != "beta") {
33 t.Fatalf("verwijderd %+v", ln)
34 }
35 }
36 gotNums := make([]string, len(news))
37 for i, n := range news {
38 gotNums[i] = strconv.Itoa(n)
39 }
40 if strings.Join(gotNums, ",") != "1,2,3,4" {
41 t.Fatalf("nieuwe regels %v", news)
42 }
43 body := "zie\n\n```suggestion\nbeta\nextra\n```\n"
44 got, ok := ParseSuggestion(body)
45 if !ok || got != "beta\nextra" {
46 t.Fatalf("%q %v", got, ok)
47 }
48 if _, ok := ParseSuggestion("alleen tekst"); ok {
49 t.Fatal("geen blok")
50 }
51 }
52
53 func TestApplySuggestions(t *testing.T) {
54 files := map[string]string{"hello.txt": "alpha\nbeta\ngamma\n"}
55 out, err := ApplySuggestions(files, []SuggestionEdit{{
56 Path: "hello.txt", Start: 2, End: 2, Base: "beta", Replacement: "BETA",
57 }})
58 if err != nil || out["hello.txt"] != "alpha\nBETA\ngamma\n" {
59 t.Fatalf("%q %v", out["hello.txt"], err)
60 }
61 if _, err := ApplySuggestions(files, []SuggestionEdit{{
62 Path: "hello.txt", Start: 2, End: 2, Base: "oud", Replacement: "BETA",
63 }}); err == nil || !strings.Contains(err.Error(), "hello.txt:2-2") {
64 t.Fatal(err)
65 }
66 if _, err := ApplySuggestions(files, []SuggestionEdit{
67 {Path: "hello.txt", Start: 1, End: 2, Base: "alpha\nbeta", Replacement: "a"},
68 {Path: "hello.txt", Start: 2, End: 3, Base: "beta\ngamma", Replacement: "b"},
69 }); err == nil || !strings.Contains(err.Error(), "overlap") {
70 t.Fatal(err)
71 }
72 two, err := ApplySuggestions(files, []SuggestionEdit{
73 {Path: "hello.txt", Start: 1, End: 1, Base: "alpha", Replacement: "ALPHA"},
74 {Path: "hello.txt", Start: 3, End: 3, Base: "gamma", Replacement: "GAMMA"},
75 })
76 if err != nil || two["hello.txt"] != "ALPHA\nbeta\nGAMMA\n" {
77 t.Fatalf("%q %v", two["hello.txt"], err)
78 }
79 if _, err := ApplySuggestions(files, []SuggestionEdit{{
80 Path: "hello.txt", Start: 2, End: 2, Base: "beta", Replacement: "beta",
81 }}); err == nil {
82 t.Fatal("lege wijziging")
83 }
84 }
@@ -0,0 +1,84 @@
1package gitrepo
2
3import (
4 "strconv"
5 "strings"
6 "testing"
7)
8
9func TestParseDiffAndSuggestion(t *testing.T) {
10 raw := "" +
11 "diff --git a/hello.txt b/hello.txt\n" +
12 "--- a/hello.txt\n" +
13 "+++ b/hello.txt\n" +
14 "@@ -1,3 +1,4 @@\n" +
15 " alpha\n" +
16 "-beta\n" +
17 "+BETA\n" +
18 "+extra\n" +
19 " gamma\n"
20 files := ParseDiff(raw)
21 if len(files) != 1 || files[0].Path != "hello.txt" {
22 t.Fatalf("%+v", files)
23 }
24 var news []int
25 for _, ln := range files[0].Lines {
26 if ln.New > 0 {
27 news = append(news, ln.New)
28 if ln.New == 2 && (ln.Kind != "add" || ln.Text != "BETA") {
29 t.Fatalf("regel 2 %+v", ln)
30 }
31 }
32 if ln.Kind == "del" && (ln.New != 0 || ln.Text != "beta") {
33 t.Fatalf("verwijderd %+v", ln)
34 }
35 }
36 gotNums := make([]string, len(news))
37 for i, n := range news {
38 gotNums[i] = strconv.Itoa(n)
39 }
40 if strings.Join(gotNums, ",") != "1,2,3,4" {
41 t.Fatalf("nieuwe regels %v", news)
42 }
43 body := "zie\n\n```suggestion\nbeta\nextra\n```\n"
44 got, ok := ParseSuggestion(body)
45 if !ok || got != "beta\nextra" {
46 t.Fatalf("%q %v", got, ok)
47 }
48 if _, ok := ParseSuggestion("alleen tekst"); ok {
49 t.Fatal("geen blok")
50 }
51}
52
53func TestApplySuggestions(t *testing.T) {
54 files := map[string]string{"hello.txt": "alpha\nbeta\ngamma\n"}
55 out, err := ApplySuggestions(files, []SuggestionEdit{{
56 Path: "hello.txt", Start: 2, End: 2, Base: "beta", Replacement: "BETA",
57 }})
58 if err != nil || out["hello.txt"] != "alpha\nBETA\ngamma\n" {
59 t.Fatalf("%q %v", out["hello.txt"], err)
60 }
61 if _, err := ApplySuggestions(files, []SuggestionEdit{{
62 Path: "hello.txt", Start: 2, End: 2, Base: "oud", Replacement: "BETA",
63 }}); err == nil || !strings.Contains(err.Error(), "hello.txt:2-2") {
64 t.Fatal(err)
65 }
66 if _, err := ApplySuggestions(files, []SuggestionEdit{
67 {Path: "hello.txt", Start: 1, End: 2, Base: "alpha\nbeta", Replacement: "a"},
68 {Path: "hello.txt", Start: 2, End: 3, Base: "beta\ngamma", Replacement: "b"},
69 }); err == nil || !strings.Contains(err.Error(), "overlap") {
70 t.Fatal(err)
71 }
72 two, err := ApplySuggestions(files, []SuggestionEdit{
73 {Path: "hello.txt", Start: 1, End: 1, Base: "alpha", Replacement: "ALPHA"},
74 {Path: "hello.txt", Start: 3, End: 3, Base: "gamma", Replacement: "GAMMA"},
75 })
76 if err != nil || two["hello.txt"] != "ALPHA\nbeta\nGAMMA\n" {
77 t.Fatalf("%q %v", two["hello.txt"], err)
78 }
79 if _, err := ApplySuggestions(files, []SuggestionEdit{{
80 Path: "hello.txt", Start: 2, End: 2, Base: "beta", Replacement: "beta",
81 }}); err == nil {
82 t.Fatal("lege wijziging")
83 }
84}
internal/i18n/catalog.go +21 −0
@@ -391,4 +391,25 @@ var en = map[string]string{
391 391 "err.whRoom": "room is invalid",
392 392 "err.whServer": "server URL is missing",
393 393 "err.whMethod": "method must be GET, POST, PUT or PATCH",
394
395 "mr.changes": "Changes",
396 "action.cancel": "Cancel",
397 "sug.applyWord": "Apply suggestions",
398 "sug.include": "Include this suggestion",
399 "sug.title": "Title",
400 "sug.description": "Description",
401 "sug.optional": "Optional.",
402 "sug.submit": "Create commit",
403 "sug.hint": "The suggestion block replaces the selected lines.",
404 "sug.bubble": "Comment on the selected lines",
405 "err.sugConflict": "%s:%d-%d has changed",
406 "err.sugOverlap": "suggestions in %s overlap",
407 "err.sugEmpty": "choose a suggestion",
408 "err.sugTitle": "a title is required",
409 "err.sugLines": "those lines are not in the file",
410 "err.sugFile": "that file is not available",
411 "err.sugGone": "that suggestion is not on this merge request",
412 "err.sugSame": "the suggestions do not change the file",
413 "err.sugBranch": "you cannot push to %s",
414 "flash.suggestions": "Suggestions applied",
394 415 }
@@ -391,4 +391,25 @@ var en = map[string]string{
391 "err.whRoom": "room is invalid",
391 "err.whRoom": "room is invalid",
392 "err.whServer": "server URL is missing",
392 "err.whServer": "server URL is missing",
393 "err.whMethod": "method must be GET, POST, PUT or PATCH",
393 "err.whMethod": "method must be GET, POST, PUT or PATCH",
394
395 "mr.changes": "Changes",
396 "action.cancel": "Cancel",
397 "sug.applyWord": "Apply suggestions",
398 "sug.include": "Include this suggestion",
399 "sug.title": "Title",
400 "sug.description": "Description",
401 "sug.optional": "Optional.",
402 "sug.submit": "Create commit",
403 "sug.hint": "The suggestion block replaces the selected lines.",
404 "sug.bubble": "Comment on the selected lines",
405 "err.sugConflict": "%s:%d-%d has changed",
406 "err.sugOverlap": "suggestions in %s overlap",
407 "err.sugEmpty": "choose a suggestion",
408 "err.sugTitle": "a title is required",
409 "err.sugLines": "those lines are not in the file",
410 "err.sugFile": "that file is not available",
411 "err.sugGone": "that suggestion is not on this merge request",
412 "err.sugSame": "the suggestions do not change the file",
413 "err.sugBranch": "you cannot push to %s",
414 "flash.suggestions": "Suggestions applied",
394}
415}
internal/i18n/catalog_lang.go +63 −0
@@ -388,6 +388,27 @@ var nl = map[string]string{
388 388 "err.whRoom": "kamer is ongeldig",
389 389 "err.whServer": "server-URL ontbreekt",
390 390 "err.whMethod": "methode moet GET, POST, PUT of PATCH zijn",
391
392 "mr.changes": "Wijzigingen",
393 "action.cancel": "Annuleren",
394 "sug.applyWord": "Suggesties toepassen",
395 "sug.include": "Deze suggestie meenemen",
396 "sug.title": "Titel",
397 "sug.description": "Beschrijving",
398 "sug.optional": "Optioneel.",
399 "sug.submit": "Commit maken",
400 "sug.hint": "Het suggestion-blok vervangt de geselecteerde regels.",
401 "sug.bubble": "Reageren op de geselecteerde regels",
402 "err.sugConflict": "%s:%d-%d is intussen veranderd",
403 "err.sugOverlap": "suggesties in %s overlappen",
404 "err.sugEmpty": "kies een suggestie",
405 "err.sugTitle": "een titel is verplicht",
406 "err.sugLines": "die regels staan niet in het bestand",
407 "err.sugFile": "dat bestand is niet beschikbaar",
408 "err.sugGone": "die suggestie hoort niet bij deze merge request",
409 "err.sugSame": "de suggesties veranderen het bestand niet",
410 "err.sugBranch": "je kunt niet pushen naar %s",
411 "flash.suggestions": "Suggesties toegepast",
391 412 }
392 413
393 414 var de = map[string]string{
@@ -778,6 +799,27 @@ var de = map[string]string{
778 799 "err.whRoom": "Raum ist ungültig",
779 800 "err.whServer": "Server-URL fehlt",
780 801 "err.whMethod": "Methode muss GET, POST, PUT oder PATCH sein",
802
803 "mr.changes": "Änderungen",
804 "action.cancel": "Abbrechen",
805 "sug.applyWord": "Vorschläge anwenden",
806 "sug.include": "Diesen Vorschlag übernehmen",
807 "sug.title": "Titel",
808 "sug.description": "Beschreibung",
809 "sug.optional": "Optional.",
810 "sug.submit": "Commit erstellen",
811 "sug.hint": "Der suggestion-Block ersetzt die ausgewählten Zeilen.",
812 "sug.bubble": "Die ausgewählten Zeilen kommentieren",
813 "err.sugConflict": "%s:%d-%d hat sich inzwischen geändert",
814 "err.sugOverlap": "Vorschläge in %s überlappen sich",
815 "err.sugEmpty": "wähle einen Vorschlag",
816 "err.sugTitle": "ein Titel ist erforderlich",
817 "err.sugLines": "diese Zeilen stehen nicht in der Datei",
818 "err.sugFile": "diese Datei ist nicht verfügbar",
819 "err.sugGone": "dieser Vorschlag gehört nicht zu diesem Merge-Request",
820 "err.sugSame": "die Vorschläge ändern die Datei nicht",
821 "err.sugBranch": "du kannst nicht nach %s pushen",
822 "flash.suggestions": "Vorschläge angewendet",
781 823 }
782 824
783 825 var fr = map[string]string{
@@ -1168,4 +1210,25 @@ var fr = map[string]string{
1168 1210 "err.whRoom": "salon invalide",
1169 1211 "err.whServer": "l’URL du serveur manque",
1170 1212 "err.whMethod": "la méthode doit être GET, POST, PUT ou PATCH",
1213
1214 "mr.changes": "Modifications",
1215 "action.cancel": "Annuler",
1216 "sug.applyWord": "Appliquer les suggestions",
1217 "sug.include": "Inclure cette suggestion",
1218 "sug.title": "Titre",
1219 "sug.description": "Description",
1220 "sug.optional": "Facultatif.",
1221 "sug.submit": "Créer le commit",
1222 "sug.hint": "Le bloc suggestion remplace les lignes sélectionnées.",
1223 "sug.bubble": "Commenter les lignes sélectionnées",
1224 "err.sugConflict": "%s:%d-%d a changé entre-temps",
1225 "err.sugOverlap": "les suggestions dans %s se chevauchent",
1226 "err.sugEmpty": "choisis une suggestion",
1227 "err.sugTitle": "un titre est obligatoire",
1228 "err.sugLines": "ces lignes ne sont pas dans le fichier",
1229 "err.sugFile": "ce fichier n’est pas disponible",
1230 "err.sugGone": "cette suggestion n’appartient pas à cette merge request",
1231 "err.sugSame": "les suggestions ne modifient pas le fichier",
1232 "err.sugBranch": "tu ne peux pas pousser vers %s",
1233 "flash.suggestions": "Suggestions appliquées",
1171 1234 }
@@ -388,6 +388,27 @@ var nl = map[string]string{
388 "err.whRoom": "kamer is ongeldig",
388 "err.whRoom": "kamer is ongeldig",
389 "err.whServer": "server-URL ontbreekt",
389 "err.whServer": "server-URL ontbreekt",
390 "err.whMethod": "methode moet GET, POST, PUT of PATCH zijn",
390 "err.whMethod": "methode moet GET, POST, PUT of PATCH zijn",
391
392 "mr.changes": "Wijzigingen",
393 "action.cancel": "Annuleren",
394 "sug.applyWord": "Suggesties toepassen",
395 "sug.include": "Deze suggestie meenemen",
396 "sug.title": "Titel",
397 "sug.description": "Beschrijving",
398 "sug.optional": "Optioneel.",
399 "sug.submit": "Commit maken",
400 "sug.hint": "Het suggestion-blok vervangt de geselecteerde regels.",
401 "sug.bubble": "Reageren op de geselecteerde regels",
402 "err.sugConflict": "%s:%d-%d is intussen veranderd",
403 "err.sugOverlap": "suggesties in %s overlappen",
404 "err.sugEmpty": "kies een suggestie",
405 "err.sugTitle": "een titel is verplicht",
406 "err.sugLines": "die regels staan niet in het bestand",
407 "err.sugFile": "dat bestand is niet beschikbaar",
408 "err.sugGone": "die suggestie hoort niet bij deze merge request",
409 "err.sugSame": "de suggesties veranderen het bestand niet",
410 "err.sugBranch": "je kunt niet pushen naar %s",
411 "flash.suggestions": "Suggesties toegepast",
391}
412}
392
413
393var de = map[string]string{
414var de = map[string]string{
@@ -778,6 +799,27 @@ var de = map[string]string{
778 "err.whRoom": "Raum ist ungültig",
799 "err.whRoom": "Raum ist ungültig",
779 "err.whServer": "Server-URL fehlt",
800 "err.whServer": "Server-URL fehlt",
780 "err.whMethod": "Methode muss GET, POST, PUT oder PATCH sein",
801 "err.whMethod": "Methode muss GET, POST, PUT oder PATCH sein",
802
803 "mr.changes": "Änderungen",
804 "action.cancel": "Abbrechen",
805 "sug.applyWord": "Vorschläge anwenden",
806 "sug.include": "Diesen Vorschlag übernehmen",
807 "sug.title": "Titel",
808 "sug.description": "Beschreibung",
809 "sug.optional": "Optional.",
810 "sug.submit": "Commit erstellen",
811 "sug.hint": "Der suggestion-Block ersetzt die ausgewählten Zeilen.",
812 "sug.bubble": "Die ausgewählten Zeilen kommentieren",
813 "err.sugConflict": "%s:%d-%d hat sich inzwischen geändert",
814 "err.sugOverlap": "Vorschläge in %s überlappen sich",
815 "err.sugEmpty": "wähle einen Vorschlag",
816 "err.sugTitle": "ein Titel ist erforderlich",
817 "err.sugLines": "diese Zeilen stehen nicht in der Datei",
818 "err.sugFile": "diese Datei ist nicht verfügbar",
819 "err.sugGone": "dieser Vorschlag gehört nicht zu diesem Merge-Request",
820 "err.sugSame": "die Vorschläge ändern die Datei nicht",
821 "err.sugBranch": "du kannst nicht nach %s pushen",
822 "flash.suggestions": "Vorschläge angewendet",
781}
823}
782
824
783var fr = map[string]string{
825var fr = map[string]string{
@@ -1168,4 +1210,25 @@ var fr = map[string]string{
1168 "err.whRoom": "salon invalide",
1210 "err.whRoom": "salon invalide",
1169 "err.whServer": "l’URL du serveur manque",
1211 "err.whServer": "l’URL du serveur manque",
1170 "err.whMethod": "la méthode doit être GET, POST, PUT ou PATCH",
1212 "err.whMethod": "la méthode doit être GET, POST, PUT ou PATCH",
1213
1214 "mr.changes": "Modifications",
1215 "action.cancel": "Annuler",
1216 "sug.applyWord": "Appliquer les suggestions",
1217 "sug.include": "Inclure cette suggestion",
1218 "sug.title": "Titre",
1219 "sug.description": "Description",
1220 "sug.optional": "Facultatif.",
1221 "sug.submit": "Créer le commit",
1222 "sug.hint": "Le bloc suggestion remplace les lignes sélectionnées.",
1223 "sug.bubble": "Commenter les lignes sélectionnées",
1224 "err.sugConflict": "%s:%d-%d a changé entre-temps",
1225 "err.sugOverlap": "les suggestions dans %s se chevauchent",
1226 "err.sugEmpty": "choisis une suggestion",
1227 "err.sugTitle": "un titre est obligatoire",
1228 "err.sugLines": "ces lignes ne sont pas dans le fichier",
1229 "err.sugFile": "ce fichier n’est pas disponible",
1230 "err.sugGone": "cette suggestion n’appartient pas à cette merge request",
1231 "err.sugSame": "les suggestions ne modifient pas le fichier",
1232 "err.sugBranch": "tu ne peux pas pousser vers %s",
1233 "flash.suggestions": "Suggestions appliquées",
1171}
1234}
internal/server/repo_handlers.go +36 −6
@@ -226,26 +226,28 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
226 226 }
227 227 v := s.repoView(w, r, repo, role, mr.Title)
228 228 v.MR = &mr
229 v.Wide = true
229 230 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
231 v.CanComment = role.AtLeast(access.RoleReadonly)
230 232 v.CanMerge = mr.Status == "open" && role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch))
233 v.CanApply = mr.Status == "open" && role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch))
231 234 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
232 235 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
233 236 if err == nil {
234 237 v.Diff = diff
235 238 }
239 files, _ := gitrepo.DiffFiles(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
236 240 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
237 for _, n := range notes {
238 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: i18n.FormatDate(s.langOf(r), n.CreatedAt)})
239 }
241 v.Notes, v.DiffFiles = arrangeNotes(notes, files, s.langOf(r))
240 242 s.render(w, "mr", v)
241 243 }
242 244
243 245 func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
244 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
246 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
245 247 if !ok || !s.csrfOK(w, r) {
246 248 return
247 249 }
248 if u.ID == 0 {
250 if u.ID == 0 || !role.AtLeast(access.RoleReadonly) {
249 251 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
250 252 return
251 253 }
@@ -255,7 +257,35 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
255 257 return
256 258 }
257 259 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
258 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
260 path, pathOK := repoPath(r.FormValue("path"))
261 if !pathOK {
262 s.redirect(w, r, back, "", s.tr(r, "err.sugFile"))
263 return
264 }
265 if path == "" {
266 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
267 s.redirect(w, r, back, "", s.trErr(r, err))
268 return
269 }
270 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
271 return
272 }
273 start, _ := strconv.Atoi(r.FormValue("line_start"))
274 end, _ := strconv.Atoi(r.FormValue("line_end"))
275 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
276 blob, err := gitrepo.BlobText(r.Context(), s.Git, dir, mr.SourceBranch, path)
277 if err != nil {
278 s.redirect(w, r, back, "", s.tr(r, "err.sugFile"))
279 return
280 }
281 lines := gitrepo.SplitLines(blob)
282 if start < 1 || end < start || end > len(lines) {
283 s.redirect(w, r, back, "", s.tr(r, "err.sugLines"))
284 return
285 }
286 base := strings.Join(lines[start-1:end], "\n")
287 suggestion, _ := gitrepo.ParseSuggestion(r.FormValue("body"))
288 if _, err := s.Store.AddLineNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body"), path, start, end, suggestion, base); err != nil {
259 289 s.redirect(w, r, back, "", s.trErr(r, err))
260 290 return
261 291 }
@@ -226,26 +226,28 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
226 }
226 }
227 v := s.repoView(w, r, repo, role, mr.Title)
227 v := s.repoView(w, r, repo, role, mr.Title)
228 v.MR = &mr
228 v.MR = &mr
229 v.Wide = true
229 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
230 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
231 v.CanComment = role.AtLeast(access.RoleReadonly)
230 v.CanMerge = mr.Status == "open" && role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch))
232 v.CanMerge = mr.Status == "open" && role.CanMerge(access.BranchProtected(patterns, mr.TargetBranch))
233 v.CanApply = mr.Status == "open" && role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch))
231 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
234 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
232 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
235 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
233 if err == nil {
236 if err == nil {
234 v.Diff = diff
237 v.Diff = diff
235 }
238 }
239 files, _ := gitrepo.DiffFiles(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
236 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
240 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
237 for _, n := range notes {
241 v.Notes, v.DiffFiles = arrangeNotes(notes, files, s.langOf(r))
238 v.Notes = append(v.Notes, NoteRow{Author: n.Author, Body: n.Body, When: i18n.FormatDate(s.langOf(r), n.CreatedAt)})
239 }
240 s.render(w, "mr", v)
242 s.render(w, "mr", v)
241}
243}
242
244
243func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
245func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
244 u, repo, _, ok := s.guard(w, r, access.RoleReadonly)
246 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
245 if !ok || !s.csrfOK(w, r) {
247 if !ok || !s.csrfOK(w, r) {
246 return
248 return
247 }
249 }
248 if u.ID == 0 {
250 if u.ID == 0 || !role.AtLeast(access.RoleReadonly) {
249 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
251 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
250 return
252 return
251 }
253 }
@@ -255,7 +257,35 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
255 return
257 return
256 }
258 }
257 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
259 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
258 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
260 path, pathOK := repoPath(r.FormValue("path"))
261 if !pathOK {
262 s.redirect(w, r, back, "", s.tr(r, "err.sugFile"))
263 return
264 }
265 if path == "" {
266 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
267 s.redirect(w, r, back, "", s.trErr(r, err))
268 return
269 }
270 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
271 return
272 }
273 start, _ := strconv.Atoi(r.FormValue("line_start"))
274 end, _ := strconv.Atoi(r.FormValue("line_end"))
275 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
276 blob, err := gitrepo.BlobText(r.Context(), s.Git, dir, mr.SourceBranch, path)
277 if err != nil {
278 s.redirect(w, r, back, "", s.tr(r, "err.sugFile"))
279 return
280 }
281 lines := gitrepo.SplitLines(blob)
282 if start < 1 || end < start || end > len(lines) {
283 s.redirect(w, r, back, "", s.tr(r, "err.sugLines"))
284 return
285 }
286 base := strings.Join(lines[start-1:end], "\n")
287 suggestion, _ := gitrepo.ParseSuggestion(r.FormValue("body"))
288 if _, err := s.Store.AddLineNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body"), path, start, end, suggestion, base); err != nil {
259 s.redirect(w, r, back, "", s.trErr(r, err))
289 s.redirect(w, r, back, "", s.trErr(r, err))
260 return
290 return
261 }
291 }
internal/server/server.go +23 −1
@@ -116,6 +116,7 @@ func (s *Server) Handler() http.Handler {
116 116 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
117 117 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
118 118 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
119 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
119 120 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
120 121 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
121 122 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
@@ -418,6 +419,8 @@ type View struct {
418 419 CanWrite bool
419 420 CanAdmin bool
420 421 CanMerge bool
422 CanComment bool
423 CanApply bool
421 424 Commits []CommitRow
422 425 Commit *CommitRow
423 426 Entries []EntryRow
@@ -429,6 +432,7 @@ type View struct {
429 432 MRs []store.MergeRequest
430 433 MR *store.MergeRequest
431 434 Diff string
435 DiffFiles []DiffFileView
432 436 Pipes []store.Pipeline
433 437 Pipe *store.Pipeline
434 438 Jobs []store.Job
@@ -496,7 +500,25 @@ type RepoCard struct {
496 500
497 501 // NoteRow is een reactie in de interface.
498 502 type NoteRow struct {
499 Author, Body, When string
503 ID int64
504 Author, Body, When, Path string
505 Start, End int
506 HasSuggestion bool
507 }
508
509 // DiffFileView is één bestand in de merge-request-diff.
510 type DiffFileView struct {
511 Path string
512 Lines []DiffLineView
513 }
514
515 // DiffLineView is één diffregel, met de reacties die op het nieuwe regelnummer eindigen.
516 type DiffLineView struct {
517 Kind string
518 Text string
519 Old int
520 New int
521 Notes []NoteRow
500 522 }
501 523
502 524 // FileRow is een rij in de bestandstabel of de boom.
@@ -116,6 +116,7 @@ func (s *Server) Handler() http.Handler {
116 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
116 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
117 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
117 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
118 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
118 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/notes", s.createNote)
119 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/suggestions", s.applySuggestions)
119 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
120 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines", s.pipelines)
120 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
121 mux.HandleFunc("POST /{owner}/{repo}/-/pipelines", s.runPipeline)
121 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
122 mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}", s.pipeline)
@@ -418,6 +419,8 @@ type View struct {
418 CanWrite bool
419 CanWrite bool
419 CanAdmin bool
420 CanAdmin bool
420 CanMerge bool
421 CanMerge bool
422 CanComment bool
423 CanApply bool
421 Commits []CommitRow
424 Commits []CommitRow
422 Commit *CommitRow
425 Commit *CommitRow
423 Entries []EntryRow
426 Entries []EntryRow
@@ -429,6 +432,7 @@ type View struct {
429 MRs []store.MergeRequest
432 MRs []store.MergeRequest
430 MR *store.MergeRequest
433 MR *store.MergeRequest
431 Diff string
434 Diff string
435 DiffFiles []DiffFileView
432 Pipes []store.Pipeline
436 Pipes []store.Pipeline
433 Pipe *store.Pipeline
437 Pipe *store.Pipeline
434 Jobs []store.Job
438 Jobs []store.Job
@@ -496,7 +500,25 @@ type RepoCard struct {
496
500
497// NoteRow is een reactie in de interface.
501// NoteRow is een reactie in de interface.
498type NoteRow struct {
502type NoteRow struct {
499 Author, Body, When string
503 ID int64
504 Author, Body, When, Path string
505 Start, End int
506 HasSuggestion bool
507}
508
509// DiffFileView is één bestand in de merge-request-diff.
510type DiffFileView struct {
511 Path string
512 Lines []DiffLineView
513}
514
515// DiffLineView is één diffregel, met de reacties die op het nieuwe regelnummer eindigen.
516type DiffLineView struct {
517 Kind string
518 Text string
519 Old int
520 New int
521 Notes []NoteRow
500}
522}
501
523
502// FileRow is een rij in de bestandstabel of de boom.
524// FileRow is een rij in de bestandstabel of de boom.
internal/server/static/style.css +55 −0
@@ -247,6 +247,61 @@ img.tile { object-fit: cover; background: #fff; }
247 247 html.cunei, html.cunei body, html.cunei button, html.cunei input, html.cunei select, html.cunei textarea {
248 248 font-family: "Noto Sans Cuneiform", "Segoe UI", sans-serif;
249 249 }
250 .applybar {
251 position: sticky; top: 0; z-index: 6; display: flex; justify-content: flex-end;
252 padding: 0.45rem 0; background: rgba(243, 246, 251, 0.94);
253 }
254 .applybar[hidden] { display: none; }
255 .sugmodal {
256 border: 1px solid var(--line); border-radius: 16px; padding: 1rem 1.1rem;
257 width: min(32rem, 92vw); box-shadow: var(--shadow);
258 }
259 .sugmodal::backdrop { background: rgba(20, 32, 51, 0.45); }
260 .sugmodal h2 { margin: 0 0 0.4rem; }
261 .diff {
262 background: white; border: 1px solid var(--line); border-radius: 12px;
263 overflow: auto; user-select: none; margin: 0.4rem 0 1rem;
264 }
265 .difffile + .difffile { border-top: 1px solid var(--line); }
266 .difffile header {
267 padding: 0.5rem 0.75rem; background: #f6f8fa; border-bottom: 1px solid var(--line); font-weight: 650;
268 }
269 .diffline {
270 position: relative; display: grid; grid-template-columns: 16px 3.2rem minmax(0, 1fr);
271 font-family: ui-monospace, monospace; font-size: 0.84rem; line-height: 1.5;
272 }
273 .diffline code { white-space: pre; padding: 0 0.7rem 0 0.35rem; }
274 .diffline .ln { color: #8c959f; text-align: right; padding-right: 0.45rem; }
275 .gutter { background: #eef2f7; cursor: ns-resize; }
276 .gutter.off { background: transparent; cursor: default; }
277 .kind-add { background: #e6ffec; }
278 .kind-del { background: #ffebe9; }
279 .kind-hunk { color: #8c959f; background: #f6f8fa; }
280 .diffline.picked { box-shadow: inset 3px 0 0 var(--blue); }
281 .diffline.picked .gutter { background: #bfdbfe; }
282 .linenote, .lineform {
283 margin: 0.35rem 0.6rem 0.55rem 2.6rem; background: #f6f8fa;
284 border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.7rem;
285 }
286 .linenote pre.note, ul.clean pre.note {
287 background: white; color: var(--ink); border: 1px solid var(--line); margin: 0.35rem 0;
288 }
289 label.sugcheck { display: flex; align-items: center; gap: 0.45rem; }
290 label.sugcheck input { width: auto; }
291 .bubble {
292 position: absolute; left: 18px; top: 0.15rem; z-index: 3;
293 width: 28px; height: 28px; padding: 0; border-radius: 8px;
294 background: white; border: 1px solid var(--line); box-shadow: var(--shadow);
295 }
296 .bubble-icon {
297 width: 14px; height: 10px; border: 2px solid var(--blue); border-radius: 7px;
298 display: inline-block; position: relative; background: white;
299 }
300 .bubble-icon::after {
301 content: ""; position: absolute; left: 2px; bottom: -6px;
302 border-width: 6px 5px 0 0; border-style: solid;
303 border-color: var(--blue) transparent transparent transparent;
304 }
250 305 @media (max-width: 800px) {
251 306 .proj, .fileview { grid-template-columns: 1fr; }
252 307 .heat-foot { flex-direction: column; align-items: flex-start; }
@@ -247,6 +247,61 @@ img.tile { object-fit: cover; background: #fff; }
247html.cunei, html.cunei body, html.cunei button, html.cunei input, html.cunei select, html.cunei textarea {
247html.cunei, html.cunei body, html.cunei button, html.cunei input, html.cunei select, html.cunei textarea {
248 font-family: "Noto Sans Cuneiform", "Segoe UI", sans-serif;
248 font-family: "Noto Sans Cuneiform", "Segoe UI", sans-serif;
249}
249}
250.applybar {
251 position: sticky; top: 0; z-index: 6; display: flex; justify-content: flex-end;
252 padding: 0.45rem 0; background: rgba(243, 246, 251, 0.94);
253}
254.applybar[hidden] { display: none; }
255.sugmodal {
256 border: 1px solid var(--line); border-radius: 16px; padding: 1rem 1.1rem;
257 width: min(32rem, 92vw); box-shadow: var(--shadow);
258}
259.sugmodal::backdrop { background: rgba(20, 32, 51, 0.45); }
260.sugmodal h2 { margin: 0 0 0.4rem; }
261.diff {
262 background: white; border: 1px solid var(--line); border-radius: 12px;
263 overflow: auto; user-select: none; margin: 0.4rem 0 1rem;
264}
265.difffile + .difffile { border-top: 1px solid var(--line); }
266.difffile header {
267 padding: 0.5rem 0.75rem; background: #f6f8fa; border-bottom: 1px solid var(--line); font-weight: 650;
268}
269.diffline {
270 position: relative; display: grid; grid-template-columns: 16px 3.2rem minmax(0, 1fr);
271 font-family: ui-monospace, monospace; font-size: 0.84rem; line-height: 1.5;
272}
273.diffline code { white-space: pre; padding: 0 0.7rem 0 0.35rem; }
274.diffline .ln { color: #8c959f; text-align: right; padding-right: 0.45rem; }
275.gutter { background: #eef2f7; cursor: ns-resize; }
276.gutter.off { background: transparent; cursor: default; }
277.kind-add { background: #e6ffec; }
278.kind-del { background: #ffebe9; }
279.kind-hunk { color: #8c959f; background: #f6f8fa; }
280.diffline.picked { box-shadow: inset 3px 0 0 var(--blue); }
281.diffline.picked .gutter { background: #bfdbfe; }
282.linenote, .lineform {
283 margin: 0.35rem 0.6rem 0.55rem 2.6rem; background: #f6f8fa;
284 border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.7rem;
285}
286.linenote pre.note, ul.clean pre.note {
287 background: white; color: var(--ink); border: 1px solid var(--line); margin: 0.35rem 0;
288}
289label.sugcheck { display: flex; align-items: center; gap: 0.45rem; }
290label.sugcheck input { width: auto; }
291.bubble {
292 position: absolute; left: 18px; top: 0.15rem; z-index: 3;
293 width: 28px; height: 28px; padding: 0; border-radius: 8px;
294 background: white; border: 1px solid var(--line); box-shadow: var(--shadow);
295}
296.bubble-icon {
297 width: 14px; height: 10px; border: 2px solid var(--blue); border-radius: 7px;
298 display: inline-block; position: relative; background: white;
299}
300.bubble-icon::after {
301 content: ""; position: absolute; left: 2px; bottom: -6px;
302 border-width: 6px 5px 0 0; border-style: solid;
303 border-color: var(--blue) transparent transparent transparent;
304}
250@media (max-width: 800px) {
305@media (max-width: 800px) {
251 .proj, .fileview { grid-template-columns: 1fr; }
306 .proj, .fileview { grid-template-columns: 1fr; }
252 .heat-foot { flex-direction: column; align-items: flex-start; }
307 .heat-foot { flex-direction: column; align-items: flex-start; }
internal/server/static/suggest.js added +145 −0
@@ -0,0 +1,145 @@
1 (function () {
2 var root = document.querySelector(".diff");
3 if (!root) return;
4 var form = root.querySelector("[data-line-form]");
5 var bubble = root.querySelector("[data-bubble]");
6 var dragging = false;
7 var anchor = 0;
8 var file = null;
9
10 function rowsOf(section) {
11 return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line]"));
12 }
13 function clearSel() {
14 root.querySelectorAll(".picked").forEach(function (el) {
15 el.classList.remove("picked");
16 });
17 }
18 function chosenRows() {
19 if (!file) return [];
20 var rows = rowsOf(file);
21 var picked = rows.filter(function (row) { return row.classList.contains("picked"); });
22 return picked;
23 }
24 function selectFrom(section, fromLine, toLine) {
25 var rows = rowsOf(section);
26 var ia = -1;
27 var ib = -1;
28 rows.forEach(function (row, i) {
29 var n = Number(row.getAttribute("data-line"));
30 if (n === fromLine) ia = i;
31 if (n === toLine) ib = i;
32 });
33 if (ia < 0 || ib < 0) return;
34 var step = ib >= ia ? 1 : -1;
35 var picked = [rows[ia]];
36 for (var i = ia + step; step > 0 ? i <= ib : i >= ib; i += step) {
37 var prev = Number(picked[picked.length - 1].getAttribute("data-line"));
38 var n = Number(rows[i].getAttribute("data-line"));
39 if (Math.abs(n - prev) !== 1) break;
40 picked.push(rows[i]);
41 }
42 clearSel();
43 picked.forEach(function (row) { row.classList.add("picked"); });
44 }
45 function hideBubble() {
46 if (!bubble) return;
47 bubble.hidden = true;
48 }
49 function showBubble() {
50 var picked = chosenRows();
51 if (!bubble || !picked.length) {
52 hideBubble();
53 return;
54 }
55 var last = picked[picked.length - 1];
56 if (Number(last.getAttribute("data-line")) < Number(picked[0].getAttribute("data-line"))) {
57 last = picked[0];
58 }
59 last.appendChild(bubble);
60 bubble.hidden = false;
61 }
62
63 if (root.getAttribute("data-can-comment") === "1" && form && bubble) {
64 root.addEventListener("mousedown", function (ev) {
65 if (ev.target.closest("form, button, input, textarea, a, label")) return;
66 var gutter = ev.target.closest(".gutter");
67 if (!gutter || gutter.classList.contains("off")) return;
68 var row = gutter.closest(".diffline");
69 file = gutter.closest(".difffile");
70 anchor = Number(row.getAttribute("data-line"));
71 dragging = true;
72 form.hidden = true;
73 selectFrom(file, anchor, anchor);
74 hideBubble();
75 ev.preventDefault();
76 });
77 window.addEventListener("mousemove", function (ev) {
78 if (!dragging || !file) return;
79 var el = document.elementFromPoint(ev.clientX, ev.clientY);
80 if (!el) return;
81 var row = el.closest(".diffline[data-line]");
82 if (!row || row.closest(".difffile") !== file) return;
83 selectFrom(file, anchor, Number(row.getAttribute("data-line")));
84 });
85 window.addEventListener("mouseup", function () {
86 if (!dragging) return;
87 dragging = false;
88 showBubble();
89 });
90 bubble.addEventListener("click", function () {
91 var picked = chosenRows();
92 if (!picked.length || !file) return;
93 var nums = picked.map(function (row) { return Number(row.getAttribute("data-line")); });
94 var start = Math.min.apply(null, nums);
95 var end = Math.max.apply(null, nums);
96 var text = picked.slice().sort(function (a, b) {
97 return Number(a.getAttribute("data-line")) - Number(b.getAttribute("data-line"));
98 }).map(function (row) {
99 return row.querySelector("code").textContent;
100 }).join("\n");
101 form.querySelector('[name="path"]').value = file.getAttribute("data-path");
102 form.querySelector('[name="line_start"]').value = String(start);
103 form.querySelector('[name="line_end"]').value = String(end);
104 form.querySelector('[name="body"]').value = "```suggestion\n" + text + "\n```\n";
105 var last = picked[picked.length - 1];
106 last.insertAdjacentElement("afterend", form);
107 form.hidden = false;
108 form.querySelector("textarea").focus();
109 });
110 form.querySelector("[data-line-cancel]").addEventListener("click", function () {
111 form.hidden = true;
112 clearSel();
113 hideBubble();
114 });
115 }
116
117 var bar = document.querySelector("[data-apply-bar]");
118 var dialog = document.querySelector("[data-apply-dialog]");
119 if (bar && dialog) {
120 function refresh() {
121 var boxes = document.querySelectorAll("[data-suggestion]:checked");
122 bar.hidden = boxes.length === 0;
123 var count = bar.querySelector("[data-apply-count]");
124 if (count) count.textContent = String(boxes.length);
125 }
126 document.addEventListener("change", function (ev) {
127 if (ev.target.matches && ev.target.matches("[data-suggestion]")) refresh();
128 });
129 bar.querySelector("[data-apply-open]").addEventListener("click", function () {
130 var box = dialog.querySelector("[data-apply-ids]");
131 box.textContent = "";
132 document.querySelectorAll("[data-suggestion]:checked").forEach(function (el) {
133 var input = document.createElement("input");
134 input.type = "hidden";
135 input.name = "id";
136 input.value = el.getAttribute("data-suggestion");
137 box.appendChild(input);
138 });
139 dialog.showModal();
140 });
141 dialog.querySelector("[data-apply-cancel]").addEventListener("click", function () {
142 dialog.close();
143 });
144 }
145 })();
@@ -0,0 +1,145 @@
1(function () {
2 var root = document.querySelector(".diff");
3 if (!root) return;
4 var form = root.querySelector("[data-line-form]");
5 var bubble = root.querySelector("[data-bubble]");
6 var dragging = false;
7 var anchor = 0;
8 var file = null;
9
10 function rowsOf(section) {
11 return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line]"));
12 }
13 function clearSel() {
14 root.querySelectorAll(".picked").forEach(function (el) {
15 el.classList.remove("picked");
16 });
17 }
18 function chosenRows() {
19 if (!file) return [];
20 var rows = rowsOf(file);
21 var picked = rows.filter(function (row) { return row.classList.contains("picked"); });
22 return picked;
23 }
24 function selectFrom(section, fromLine, toLine) {
25 var rows = rowsOf(section);
26 var ia = -1;
27 var ib = -1;
28 rows.forEach(function (row, i) {
29 var n = Number(row.getAttribute("data-line"));
30 if (n === fromLine) ia = i;
31 if (n === toLine) ib = i;
32 });
33 if (ia < 0 || ib < 0) return;
34 var step = ib >= ia ? 1 : -1;
35 var picked = [rows[ia]];
36 for (var i = ia + step; step > 0 ? i <= ib : i >= ib; i += step) {
37 var prev = Number(picked[picked.length - 1].getAttribute("data-line"));
38 var n = Number(rows[i].getAttribute("data-line"));
39 if (Math.abs(n - prev) !== 1) break;
40 picked.push(rows[i]);
41 }
42 clearSel();
43 picked.forEach(function (row) { row.classList.add("picked"); });
44 }
45 function hideBubble() {
46 if (!bubble) return;
47 bubble.hidden = true;
48 }
49 function showBubble() {
50 var picked = chosenRows();
51 if (!bubble || !picked.length) {
52 hideBubble();
53 return;
54 }
55 var last = picked[picked.length - 1];
56 if (Number(last.getAttribute("data-line")) < Number(picked[0].getAttribute("data-line"))) {
57 last = picked[0];
58 }
59 last.appendChild(bubble);
60 bubble.hidden = false;
61 }
62
63 if (root.getAttribute("data-can-comment") === "1" && form && bubble) {
64 root.addEventListener("mousedown", function (ev) {
65 if (ev.target.closest("form, button, input, textarea, a, label")) return;
66 var gutter = ev.target.closest(".gutter");
67 if (!gutter || gutter.classList.contains("off")) return;
68 var row = gutter.closest(".diffline");
69 file = gutter.closest(".difffile");
70 anchor = Number(row.getAttribute("data-line"));
71 dragging = true;
72 form.hidden = true;
73 selectFrom(file, anchor, anchor);
74 hideBubble();
75 ev.preventDefault();
76 });
77 window.addEventListener("mousemove", function (ev) {
78 if (!dragging || !file) return;
79 var el = document.elementFromPoint(ev.clientX, ev.clientY);
80 if (!el) return;
81 var row = el.closest(".diffline[data-line]");
82 if (!row || row.closest(".difffile") !== file) return;
83 selectFrom(file, anchor, Number(row.getAttribute("data-line")));
84 });
85 window.addEventListener("mouseup", function () {
86 if (!dragging) return;
87 dragging = false;
88 showBubble();
89 });
90 bubble.addEventListener("click", function () {
91 var picked = chosenRows();
92 if (!picked.length || !file) return;
93 var nums = picked.map(function (row) { return Number(row.getAttribute("data-line")); });
94 var start = Math.min.apply(null, nums);
95 var end = Math.max.apply(null, nums);
96 var text = picked.slice().sort(function (a, b) {
97 return Number(a.getAttribute("data-line")) - Number(b.getAttribute("data-line"));
98 }).map(function (row) {
99 return row.querySelector("code").textContent;
100 }).join("\n");
101 form.querySelector('[name="path"]').value = file.getAttribute("data-path");
102 form.querySelector('[name="line_start"]').value = String(start);
103 form.querySelector('[name="line_end"]').value = String(end);
104 form.querySelector('[name="body"]').value = "```suggestion\n" + text + "\n```\n";
105 var last = picked[picked.length - 1];
106 last.insertAdjacentElement("afterend", form);
107 form.hidden = false;
108 form.querySelector("textarea").focus();
109 });
110 form.querySelector("[data-line-cancel]").addEventListener("click", function () {
111 form.hidden = true;
112 clearSel();
113 hideBubble();
114 });
115 }
116
117 var bar = document.querySelector("[data-apply-bar]");
118 var dialog = document.querySelector("[data-apply-dialog]");
119 if (bar && dialog) {
120 function refresh() {
121 var boxes = document.querySelectorAll("[data-suggestion]:checked");
122 bar.hidden = boxes.length === 0;
123 var count = bar.querySelector("[data-apply-count]");
124 if (count) count.textContent = String(boxes.length);
125 }
126 document.addEventListener("change", function (ev) {
127 if (ev.target.matches && ev.target.matches("[data-suggestion]")) refresh();
128 });
129 bar.querySelector("[data-apply-open]").addEventListener("click", function () {
130 var box = dialog.querySelector("[data-apply-ids]");
131 box.textContent = "";
132 document.querySelectorAll("[data-suggestion]:checked").forEach(function (el) {
133 var input = document.createElement("input");
134 input.type = "hidden";
135 input.name = "id";
136 input.value = el.getAttribute("data-suggestion");
137 box.appendChild(input);
138 });
139 dialog.showModal();
140 });
141 dialog.querySelector("[data-apply-cancel]").addEventListener("click", function () {
142 dialog.close();
143 });
144 }
145})();
internal/server/suggest.go added +158 −0
@@ -0,0 +1,158 @@
1 package server
2
3 import (
4 "net/http"
5 "os"
6 "strconv"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/gitrepo"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/store"
13 )
14
15 func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
16 rows := make([]NoteRow, len(notes))
17 for i, n := range notes {
18 rows[i] = NoteRow{
19 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
20 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
21 When: i18n.FormatDate(lang, n.CreatedAt),
22 }
23 }
24 placed := map[int64]bool{}
25 var views []DiffFileView
26 for _, f := range files {
27 view := DiffFileView{Path: f.Path}
28 for _, ln := range f.Lines {
29 row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
30 if ln.New > 0 {
31 for _, note := range rows {
32 if note.Path == f.Path && note.End == ln.New {
33 row.Notes = append(row.Notes, note)
34 placed[note.ID] = true
35 }
36 }
37 }
38 view.Lines = append(view.Lines, row)
39 }
40 views = append(views, view)
41 }
42 var general []NoteRow
43 for _, note := range rows {
44 if note.Path == "" || !placed[note.ID] {
45 general = append(general, note)
46 }
47 }
48 return general, views
49 }
50
51 func repoPath(raw string) (string, bool) {
52 raw = strings.TrimSpace(raw)
53 if raw == "" {
54 return "", true
55 }
56 p := strings.ReplaceAll(raw, `\`, "/")
57 if strings.HasPrefix(p, "/") || strings.Contains(p, "..") || strings.ContainsAny(p, "\r\n") {
58 return "", false
59 }
60 return p, true
61 }
62
63 func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
64 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
65 if !ok || !s.csrfOK(w, r) {
66 return
67 }
68 mr, err := s.mrFromRequest(r, repo.ID)
69 if err != nil || mr.Status != "open" {
70 http.NotFound(w, r)
71 return
72 }
73 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
74 patterns, err := s.Store.ProtectedPatterns(r.Context(), repo.ID)
75 if err != nil {
76 s.redirect(w, r, back, "", s.trErr(r, err))
77 return
78 }
79 if !role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch)) {
80 s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
81 return
82 }
83 if s.StoragePath() == "" {
84 s.redirect(w, r, back, "", s.tr(r, "err.noStorage"))
85 return
86 }
87 title := strings.TrimSpace(r.FormValue("title"))
88 if title == "" || strings.ContainsAny(title, "\r\n") {
89 s.redirect(w, r, back, "", s.tr(r, "err.sugTitle"))
90 return
91 }
92 notes, err := s.Store.ListNotes(r.Context(), mr.ID)
93 if err != nil {
94 s.redirect(w, r, back, "", s.trErr(r, err))
95 return
96 }
97 byID := map[int64]store.Note{}
98 for _, n := range notes {
99 byID[n.ID] = n
100 }
101 var edits []gitrepo.SuggestionEdit
102 seen := map[int64]bool{}
103 for _, raw := range r.Form["id"] {
104 id, err := strconv.ParseInt(raw, 10, 64)
105 if err != nil || seen[id] {
106 continue
107 }
108 seen[id] = true
109 n, ok := byID[id]
110 if !ok || n.Suggestion == "" || n.FilePath == "" {
111 s.redirect(w, r, back, "", s.tr(r, "err.sugGone"))
112 return
113 }
114 edits = append(edits, gitrepo.SuggestionEdit{
115 Path: n.FilePath, Start: n.LineStart, End: n.LineEnd,
116 Base: n.BaseText, Replacement: n.Suggestion,
117 })
118 }
119 if len(edits) == 0 {
120 s.redirect(w, r, back, "", s.tr(r, "err.sugEmpty"))
121 return
122 }
123 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
124 files := map[string]string{}
125 for _, e := range edits {
126 if _, ok := files[e.Path]; ok {
127 continue
128 }
129 body, err := gitrepo.BlobText(r.Context(), s.Git, dir, mr.SourceBranch, e.Path)
130 if err != nil {
131 s.redirect(w, r, back, "", s.tr(r, "err.sugConflict", e.Path, e.Start, e.End))
132 return
133 }
134 files[e.Path] = body
135 }
136 updated, err := gitrepo.ApplySuggestions(files, edits)
137 if err != nil {
138 s.redirect(w, r, back, "", s.trErr(r, err))
139 return
140 }
141 branch := safeRev(mr.SourceBranch, "")
142 if branch == "" {
143 s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
144 return
145 }
146 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
147 work := s.StoragePath() + "/tmp/suggest-" + strconv.FormatInt(mr.ID, 10)
148 email := u.Username + "@users.git.timfalken.com"
149 if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
150 _ = os.RemoveAll(work)
151 s.redirect(w, r, back, "", s.trErr(r, err))
152 return
153 }
154 _ = os.RemoveAll(work)
155 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
156 s.AfterPush(repo, u, before, after)
157 s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
158 }
@@ -0,0 +1,158 @@
1package server
2
3import (
4 "net/http"
5 "os"
6 "strconv"
7 "strings"
8
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/gitrepo"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/store"
13)
14
15func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
16 rows := make([]NoteRow, len(notes))
17 for i, n := range notes {
18 rows[i] = NoteRow{
19 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
20 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
21 When: i18n.FormatDate(lang, n.CreatedAt),
22 }
23 }
24 placed := map[int64]bool{}
25 var views []DiffFileView
26 for _, f := range files {
27 view := DiffFileView{Path: f.Path}
28 for _, ln := range f.Lines {
29 row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
30 if ln.New > 0 {
31 for _, note := range rows {
32 if note.Path == f.Path && note.End == ln.New {
33 row.Notes = append(row.Notes, note)
34 placed[note.ID] = true
35 }
36 }
37 }
38 view.Lines = append(view.Lines, row)
39 }
40 views = append(views, view)
41 }
42 var general []NoteRow
43 for _, note := range rows {
44 if note.Path == "" || !placed[note.ID] {
45 general = append(general, note)
46 }
47 }
48 return general, views
49}
50
51func repoPath(raw string) (string, bool) {
52 raw = strings.TrimSpace(raw)
53 if raw == "" {
54 return "", true
55 }
56 p := strings.ReplaceAll(raw, `\`, "/")
57 if strings.HasPrefix(p, "/") || strings.Contains(p, "..") || strings.ContainsAny(p, "\r\n") {
58 return "", false
59 }
60 return p, true
61}
62
63func (s *Server) applySuggestions(w http.ResponseWriter, r *http.Request) {
64 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
65 if !ok || !s.csrfOK(w, r) {
66 return
67 }
68 mr, err := s.mrFromRequest(r, repo.ID)
69 if err != nil || mr.Status != "open" {
70 http.NotFound(w, r)
71 return
72 }
73 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
74 patterns, err := s.Store.ProtectedPatterns(r.Context(), repo.ID)
75 if err != nil {
76 s.redirect(w, r, back, "", s.trErr(r, err))
77 return
78 }
79 if !role.CanPushBranch(access.BranchProtected(patterns, mr.SourceBranch)) {
80 s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
81 return
82 }
83 if s.StoragePath() == "" {
84 s.redirect(w, r, back, "", s.tr(r, "err.noStorage"))
85 return
86 }
87 title := strings.TrimSpace(r.FormValue("title"))
88 if title == "" || strings.ContainsAny(title, "\r\n") {
89 s.redirect(w, r, back, "", s.tr(r, "err.sugTitle"))
90 return
91 }
92 notes, err := s.Store.ListNotes(r.Context(), mr.ID)
93 if err != nil {
94 s.redirect(w, r, back, "", s.trErr(r, err))
95 return
96 }
97 byID := map[int64]store.Note{}
98 for _, n := range notes {
99 byID[n.ID] = n
100 }
101 var edits []gitrepo.SuggestionEdit
102 seen := map[int64]bool{}
103 for _, raw := range r.Form["id"] {
104 id, err := strconv.ParseInt(raw, 10, 64)
105 if err != nil || seen[id] {
106 continue
107 }
108 seen[id] = true
109 n, ok := byID[id]
110 if !ok || n.Suggestion == "" || n.FilePath == "" {
111 s.redirect(w, r, back, "", s.tr(r, "err.sugGone"))
112 return
113 }
114 edits = append(edits, gitrepo.SuggestionEdit{
115 Path: n.FilePath, Start: n.LineStart, End: n.LineEnd,
116 Base: n.BaseText, Replacement: n.Suggestion,
117 })
118 }
119 if len(edits) == 0 {
120 s.redirect(w, r, back, "", s.tr(r, "err.sugEmpty"))
121 return
122 }
123 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
124 files := map[string]string{}
125 for _, e := range edits {
126 if _, ok := files[e.Path]; ok {
127 continue
128 }
129 body, err := gitrepo.BlobText(r.Context(), s.Git, dir, mr.SourceBranch, e.Path)
130 if err != nil {
131 s.redirect(w, r, back, "", s.tr(r, "err.sugConflict", e.Path, e.Start, e.End))
132 return
133 }
134 files[e.Path] = body
135 }
136 updated, err := gitrepo.ApplySuggestions(files, edits)
137 if err != nil {
138 s.redirect(w, r, back, "", s.trErr(r, err))
139 return
140 }
141 branch := safeRev(mr.SourceBranch, "")
142 if branch == "" {
143 s.redirect(w, r, back, "", s.tr(r, "err.sugBranch", mr.SourceBranch))
144 return
145 }
146 before, _ := gitrepo.Refs(r.Context(), s.Git, dir)
147 work := s.StoragePath() + "/tmp/suggest-" + strconv.FormatInt(mr.ID, 10)
148 email := u.Username + "@users.git.timfalken.com"
149 if err := gitrepo.CommitOnBranch(r.Context(), s.Git, dir, work, branch, u.Username, email, title, r.FormValue("description"), updated, role, patterns); err != nil {
150 _ = os.RemoveAll(work)
151 s.redirect(w, r, back, "", s.trErr(r, err))
152 return
153 }
154 _ = os.RemoveAll(work)
155 after, _ := gitrepo.Refs(r.Context(), s.Git, dir)
156 s.AfterPush(repo, u, before, after)
157 s.redirect(w, r, back, s.tr(r, "flash.suggestions"), "")
158}
internal/server/suggest_test.go added +340 −0
@@ -0,0 +1,340 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/gitrepo"
18 "gitlab.com/Timfa/bluegit/internal/store"
19 )
20
21 func TestSuggestionsAndReadonlyComments(t *testing.T) {
22 if _, err := exec.LookPath("git"); err != nil {
23 t.Skip("git ontbreekt")
24 }
25 storage := t.TempDir()
26 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
27 if err != nil {
28 t.Fatal(err)
29 }
30 t.Cleanup(func() { _ = st.Close() })
31 cfg := config.Config{
32 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
33 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
34 Git: config.Git{Binary: "git", DefaultBranch: "master"},
35 }
36 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
37 ts := httptest.NewServer(srv.Handler())
38 t.Cleanup(ts.Close)
39
40 jar, _ := cookiejar.New(nil)
41 tim := &http.Client{Jar: jar}
42 res, err := tim.Get(ts.URL + "/login")
43 if err != nil {
44 t.Fatal(err)
45 }
46 page := read(t, res)
47 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
48 "csrf": {csrfOf(t, page)}, "name": {"review"}, "visibility": {"public"},
49 })
50 if err != nil {
51 t.Fatal(err)
52 }
53 page = read(t, res)
54 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
55 if err != nil {
56 t.Fatal(err)
57 }
58 token := between(read(t, res), `<p class="code">`, "</p>")
59 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/review.git"
60 work := t.TempDir()
61 git(t, work, "init", "-b", "master")
62 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
63 git(t, work, "config", "user.name", "tim")
64 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nbeta\ngamma\n")
65 git(t, work, "add", "hello.txt")
66 git(t, work, "commit", "-m", "start")
67 git(t, work, "remote", "add", "origin", remote)
68 git(t, work, "push", "-u", "origin", "master")
69 git(t, work, "checkout", "-b", "feature")
70 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nBETA\ngamma\n")
71 git(t, work, "add", "hello.txt")
72 git(t, work, "commit", "-m", "hoofdletters")
73 git(t, work, "push", "-u", "origin", "feature")
74
75 res, err = tim.Get(ts.URL + "/tim/review/-/merge-requests")
76 if err != nil {
77 t.Fatal(err)
78 }
79 page = read(t, res)
80 res, err = tim.PostForm(ts.URL+"/tim/review/-/merge-requests", url.Values{
81 "csrf": {csrfOf(t, page)}, "title": {"Hoofdletters"}, "source": {"feature"}, "target": {"master"},
82 })
83 if err != nil {
84 t.Fatal(err)
85 }
86 opened := read(t, res)
87 if !strings.Contains(opened, "BETA") || !strings.Contains(opened, `data-line="2"`) || !strings.Contains(opened, "Apply suggestions") {
88 t.Fatalf("diff of toepassen:\n%s", opened)
89 }
90
91 ctx := context.Background()
92 repo, err := st.RepoByPath(ctx, "tim", "review")
93 if err != nil {
94 t.Fatal(err)
95 }
96 bob, err := st.UpsertUser(ctx, 2, "bob", "", false)
97 if err != nil {
98 t.Fatal(err)
99 }
100 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
101 if err != nil {
102 t.Fatal(err)
103 }
104 sam, err := st.UpsertUser(ctx, 4, "sam", "", false)
105 if err != nil {
106 t.Fatal(err)
107 }
108 if err := st.SetMember(ctx, "repo", repo.ID, "bob", "readonly"); err != nil {
109 t.Fatal(err)
110 }
111 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
112 t.Fatal(err)
113 }
114 bobC := clientAs(t, ts.URL, st, bob.ID)
115 adaC := clientAs(t, ts.URL, st, ada.ID)
116 samC := clientAs(t, ts.URL, st, sam.ID)
117
118 res, err = samC.Get(ts.URL + "/tim/review/-/merge-requests/1")
119 if err != nil {
120 t.Fatal(err)
121 }
122 samPage := read(t, res)
123 if strings.Contains(samPage, `name="body"`) || strings.Contains(samPage, "data-can-comment") {
124 t.Fatal("zonder rol is er een reactieformulier")
125 }
126 res, err = samC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
127 "csrf": {csrfOf(t, samPage)}, "body": {"hoort niet"},
128 })
129 if err != nil {
130 t.Fatal(err)
131 }
132 if res.StatusCode != http.StatusForbidden {
133 t.Fatalf("sam status %d", res.StatusCode)
134 }
135 _ = read(t, res)
136
137 res, err = bobC.Get(ts.URL + "/tim/review/-/merge-requests/1")
138 if err != nil {
139 t.Fatal(err)
140 }
141 bobPage := read(t, res)
142 if !strings.Contains(bobPage, `data-can-comment="1"`) || !strings.Contains(bobPage, `class="gutter"`) {
143 t.Fatal("readonly mist de diffbalk")
144 }
145 if strings.Contains(bobPage, "data-suggestion") || strings.Contains(bobPage, "Apply suggestions") {
146 t.Fatal("readonly kan suggesties aanvinken")
147 }
148 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
149 "csrf": {csrfOf(t, bobPage)}, "body": {"algemeen"},
150 })
151 if err != nil {
152 t.Fatal(err)
153 }
154 bobPage = read(t, res)
155 if !strings.Contains(bobPage, "algemeen") {
156 t.Fatal("algemene reactie ontbreekt")
157 }
158 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
159 "csrf": {csrfOf(t, bobPage)}, "path": {"hello.txt"}, "line_start": {"2"}, "line_end": {"2"},
160 "body": {"```suggestion\nfixed\n```"},
161 })
162 if err != nil {
163 t.Fatal(err)
164 }
165 bobPage = read(t, res)
166 if !strings.Contains(bobPage, "fixed") || strings.Contains(bobPage, "data-suggestion") {
167 t.Fatalf("regelreactie:\n%s", bobPage)
168 }
169 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
170 "csrf": {csrfOf(t, bobPage)}, "id": {"2"}, "title": {"mag niet"},
171 })
172 if err != nil {
173 t.Fatal(err)
174 }
175 if res.StatusCode != http.StatusForbidden {
176 t.Fatalf("readonly toepassen %d", res.StatusCode)
177 }
178 _ = read(t, res)
179
180 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nBETA2\ngamma\n")
181 git(t, work, "add", "hello.txt")
182 git(t, work, "commit", "-m", "intussen")
183 git(t, work, "push", "origin", "feature")
184
185 res, err = adaC.Get(ts.URL + "/tim/review/-/merge-requests/1")
186 if err != nil {
187 t.Fatal(err)
188 }
189 adaPage := read(t, res)
190 ids := suggestionIDs(adaPage)
191 if len(ids) != 1 {
192 t.Fatalf("suggesties %v\n%s", ids, adaPage)
193 }
194 res, err = adaC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
195 "csrf": {csrfOf(t, adaPage)}, "id": {ids[0]}, "title": {"te laat"},
196 })
197 if err != nil {
198 t.Fatal(err)
199 }
200 conflict := read(t, res)
201 if !strings.Contains(conflict, "hello.txt:2-2 has changed") {
202 t.Fatalf("conflict:\n%s", conflict)
203 }
204
205 res, err = bobC.Get(ts.URL + "/tim/review/-/merge-requests/1")
206 if err != nil {
207 t.Fatal(err)
208 }
209 bobPage = read(t, res)
210 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
211 "csrf": {csrfOf(t, bobPage)}, "path": {"hello.txt"}, "line_start": {"2"}, "line_end": {"3"},
212 "body": {"```suggestion\nfixed\nGAMMA\n```"},
213 })
214 if err != nil {
215 t.Fatal(err)
216 }
217 _ = read(t, res)
218
219 if err := st.AddProtected(ctx, repo.ID, "feature"); err != nil {
220 t.Fatal(err)
221 }
222 res, err = adaC.Get(ts.URL + "/tim/review/-/merge-requests/1")
223 if err != nil {
224 t.Fatal(err)
225 }
226 adaPage = read(t, res)
227 if strings.Contains(adaPage, "data-suggestion") {
228 t.Fatal("ontwikkelaar ziet een vakje op een beschermde bronbranch")
229 }
230 fresh := suggestionIDs(read(t, mustGet(t, tim, ts.URL+"/tim/review/-/merge-requests/1")))
231 if len(fresh) != 2 {
232 t.Fatalf("beheerder ziet %v", fresh)
233 }
234 res, err = adaC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
235 "csrf": {csrfOf(t, adaPage)}, "id": {fresh[1]}, "title": {"van ada"},
236 })
237 if err != nil {
238 t.Fatal(err)
239 }
240 denied := read(t, res)
241 if !strings.Contains(denied, "you cannot push to feature") {
242 t.Fatalf("beschermd:\n%s", denied)
243 }
244
245 bare := gitrepo.Dir(storage, "tim", "review")
246 before := strings.TrimSpace(mustGit(t, bare, "rev-list", "--count", "feature"))
247 res, err = tim.Get(ts.URL + "/tim/review/-/merge-requests/1")
248 if err != nil {
249 t.Fatal(err)
250 }
251 timPage := read(t, res)
252 res, err = tim.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
253 "csrf": {csrfOf(t, timPage)}, "id": {fresh[1]}, "title": {"Suggestie van bob"}, "description": {"twee regels"},
254 })
255 if err != nil {
256 t.Fatal(err)
257 }
258 applied := read(t, res)
259 if !strings.Contains(applied, "Suggestions applied") {
260 t.Fatalf("toepassen:\n%s", applied)
261 }
262 body := mustGit(t, bare, "show", "feature:hello.txt")
263 if body != "alpha\nfixed\nGAMMA\n" {
264 t.Fatalf("bestand %q", body)
265 }
266 after := strings.TrimSpace(mustGit(t, bare, "rev-list", "--count", "feature"))
267 msg := mustGit(t, bare, "log", "-1", "--format=%s%n%b", "feature")
268 who := mustGit(t, bare, "log", "-1", "--format=%ae", "feature")
269 if after != bumpCount(before) || !strings.Contains(msg, "Suggestie van bob") || !strings.Contains(msg, "twee regels") || strings.TrimSpace(who) != "tim@users.git.timfalken.com" {
270 t.Fatalf("voor %s na %s\n%s", before, after, msg)
271 }
272 }
273
274 func bumpCount(n string) string {
275 i := 0
276 for _, c := range n {
277 i = i*10 + int(c-'0')
278 }
279 return strconvItoa(i + 1)
280 }
281
282 func strconvItoa(n int) string {
283 if n == 0 {
284 return "0"
285 }
286 var b [16]byte
287 i := len(b)
288 for n > 0 {
289 i--
290 b[i] = byte('0' + n%10)
291 n /= 10
292 }
293 return string(b[i:])
294 }
295
296 func clientAs(t *testing.T, base string, st *store.Store, userID int64) *http.Client {
297 t.Helper()
298 sess, err := st.CreateSession(context.Background(), userID, "dev", time.Now().Add(time.Hour))
299 if err != nil {
300 t.Fatal(err)
301 }
302 jar, _ := cookiejar.New(nil)
303 u, _ := url.Parse(base)
304 jar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
305 return &http.Client{Jar: jar}
306 }
307
308 func mustGit(t *testing.T, dir string, args ...string) string {
309 t.Helper()
310 out, err := gitOut(dir, args...)
311 if err != nil {
312 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
313 }
314 return out
315 }
316
317 func mustGet(t *testing.T, c *http.Client, raw string) *http.Response {
318 t.Helper()
319 res, err := c.Get(raw)
320 if err != nil {
321 t.Fatal(err)
322 }
323 return res
324 }
325
326 func suggestionIDs(html string) []string {
327 var out []string
328 const needle = `data-suggestion="`
329 for {
330 i := strings.Index(html, needle)
331 if i < 0 {
332 break
333 }
334 html = html[i+len(needle):]
335 j := strings.Index(html, `"`)
336 out = append(out, html[:j])
337 html = html[j:]
338 }
339 return out
340 }
@@ -0,0 +1,340 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strings"
12 "testing"
13 "time"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/gitrepo"
18 "gitlab.com/Timfa/bluegit/internal/store"
19)
20
21func TestSuggestionsAndReadonlyComments(t *testing.T) {
22 if _, err := exec.LookPath("git"); err != nil {
23 t.Skip("git ontbreekt")
24 }
25 storage := t.TempDir()
26 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
27 if err != nil {
28 t.Fatal(err)
29 }
30 t.Cleanup(func() { _ = st.Close() })
31 cfg := config.Config{
32 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
33 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
34 Git: config.Git{Binary: "git", DefaultBranch: "master"},
35 }
36 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
37 ts := httptest.NewServer(srv.Handler())
38 t.Cleanup(ts.Close)
39
40 jar, _ := cookiejar.New(nil)
41 tim := &http.Client{Jar: jar}
42 res, err := tim.Get(ts.URL + "/login")
43 if err != nil {
44 t.Fatal(err)
45 }
46 page := read(t, res)
47 res, err = tim.PostForm(ts.URL+"/new/repo", url.Values{
48 "csrf": {csrfOf(t, page)}, "name": {"review"}, "visibility": {"public"},
49 })
50 if err != nil {
51 t.Fatal(err)
52 }
53 page = read(t, res)
54 res, err = tim.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
55 if err != nil {
56 t.Fatal(err)
57 }
58 token := between(read(t, res), `<p class="code">`, "</p>")
59 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/review.git"
60 work := t.TempDir()
61 git(t, work, "init", "-b", "master")
62 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
63 git(t, work, "config", "user.name", "tim")
64 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nbeta\ngamma\n")
65 git(t, work, "add", "hello.txt")
66 git(t, work, "commit", "-m", "start")
67 git(t, work, "remote", "add", "origin", remote)
68 git(t, work, "push", "-u", "origin", "master")
69 git(t, work, "checkout", "-b", "feature")
70 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nBETA\ngamma\n")
71 git(t, work, "add", "hello.txt")
72 git(t, work, "commit", "-m", "hoofdletters")
73 git(t, work, "push", "-u", "origin", "feature")
74
75 res, err = tim.Get(ts.URL + "/tim/review/-/merge-requests")
76 if err != nil {
77 t.Fatal(err)
78 }
79 page = read(t, res)
80 res, err = tim.PostForm(ts.URL+"/tim/review/-/merge-requests", url.Values{
81 "csrf": {csrfOf(t, page)}, "title": {"Hoofdletters"}, "source": {"feature"}, "target": {"master"},
82 })
83 if err != nil {
84 t.Fatal(err)
85 }
86 opened := read(t, res)
87 if !strings.Contains(opened, "BETA") || !strings.Contains(opened, `data-line="2"`) || !strings.Contains(opened, "Apply suggestions") {
88 t.Fatalf("diff of toepassen:\n%s", opened)
89 }
90
91 ctx := context.Background()
92 repo, err := st.RepoByPath(ctx, "tim", "review")
93 if err != nil {
94 t.Fatal(err)
95 }
96 bob, err := st.UpsertUser(ctx, 2, "bob", "", false)
97 if err != nil {
98 t.Fatal(err)
99 }
100 ada, err := st.UpsertUser(ctx, 3, "ada", "", false)
101 if err != nil {
102 t.Fatal(err)
103 }
104 sam, err := st.UpsertUser(ctx, 4, "sam", "", false)
105 if err != nil {
106 t.Fatal(err)
107 }
108 if err := st.SetMember(ctx, "repo", repo.ID, "bob", "readonly"); err != nil {
109 t.Fatal(err)
110 }
111 if err := st.SetMember(ctx, "repo", repo.ID, "ada", "developer"); err != nil {
112 t.Fatal(err)
113 }
114 bobC := clientAs(t, ts.URL, st, bob.ID)
115 adaC := clientAs(t, ts.URL, st, ada.ID)
116 samC := clientAs(t, ts.URL, st, sam.ID)
117
118 res, err = samC.Get(ts.URL + "/tim/review/-/merge-requests/1")
119 if err != nil {
120 t.Fatal(err)
121 }
122 samPage := read(t, res)
123 if strings.Contains(samPage, `name="body"`) || strings.Contains(samPage, "data-can-comment") {
124 t.Fatal("zonder rol is er een reactieformulier")
125 }
126 res, err = samC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
127 "csrf": {csrfOf(t, samPage)}, "body": {"hoort niet"},
128 })
129 if err != nil {
130 t.Fatal(err)
131 }
132 if res.StatusCode != http.StatusForbidden {
133 t.Fatalf("sam status %d", res.StatusCode)
134 }
135 _ = read(t, res)
136
137 res, err = bobC.Get(ts.URL + "/tim/review/-/merge-requests/1")
138 if err != nil {
139 t.Fatal(err)
140 }
141 bobPage := read(t, res)
142 if !strings.Contains(bobPage, `data-can-comment="1"`) || !strings.Contains(bobPage, `class="gutter"`) {
143 t.Fatal("readonly mist de diffbalk")
144 }
145 if strings.Contains(bobPage, "data-suggestion") || strings.Contains(bobPage, "Apply suggestions") {
146 t.Fatal("readonly kan suggesties aanvinken")
147 }
148 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
149 "csrf": {csrfOf(t, bobPage)}, "body": {"algemeen"},
150 })
151 if err != nil {
152 t.Fatal(err)
153 }
154 bobPage = read(t, res)
155 if !strings.Contains(bobPage, "algemeen") {
156 t.Fatal("algemene reactie ontbreekt")
157 }
158 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
159 "csrf": {csrfOf(t, bobPage)}, "path": {"hello.txt"}, "line_start": {"2"}, "line_end": {"2"},
160 "body": {"```suggestion\nfixed\n```"},
161 })
162 if err != nil {
163 t.Fatal(err)
164 }
165 bobPage = read(t, res)
166 if !strings.Contains(bobPage, "fixed") || strings.Contains(bobPage, "data-suggestion") {
167 t.Fatalf("regelreactie:\n%s", bobPage)
168 }
169 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
170 "csrf": {csrfOf(t, bobPage)}, "id": {"2"}, "title": {"mag niet"},
171 })
172 if err != nil {
173 t.Fatal(err)
174 }
175 if res.StatusCode != http.StatusForbidden {
176 t.Fatalf("readonly toepassen %d", res.StatusCode)
177 }
178 _ = read(t, res)
179
180 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\nBETA2\ngamma\n")
181 git(t, work, "add", "hello.txt")
182 git(t, work, "commit", "-m", "intussen")
183 git(t, work, "push", "origin", "feature")
184
185 res, err = adaC.Get(ts.URL + "/tim/review/-/merge-requests/1")
186 if err != nil {
187 t.Fatal(err)
188 }
189 adaPage := read(t, res)
190 ids := suggestionIDs(adaPage)
191 if len(ids) != 1 {
192 t.Fatalf("suggesties %v\n%s", ids, adaPage)
193 }
194 res, err = adaC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
195 "csrf": {csrfOf(t, adaPage)}, "id": {ids[0]}, "title": {"te laat"},
196 })
197 if err != nil {
198 t.Fatal(err)
199 }
200 conflict := read(t, res)
201 if !strings.Contains(conflict, "hello.txt:2-2 has changed") {
202 t.Fatalf("conflict:\n%s", conflict)
203 }
204
205 res, err = bobC.Get(ts.URL + "/tim/review/-/merge-requests/1")
206 if err != nil {
207 t.Fatal(err)
208 }
209 bobPage = read(t, res)
210 res, err = bobC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/notes", url.Values{
211 "csrf": {csrfOf(t, bobPage)}, "path": {"hello.txt"}, "line_start": {"2"}, "line_end": {"3"},
212 "body": {"```suggestion\nfixed\nGAMMA\n```"},
213 })
214 if err != nil {
215 t.Fatal(err)
216 }
217 _ = read(t, res)
218
219 if err := st.AddProtected(ctx, repo.ID, "feature"); err != nil {
220 t.Fatal(err)
221 }
222 res, err = adaC.Get(ts.URL + "/tim/review/-/merge-requests/1")
223 if err != nil {
224 t.Fatal(err)
225 }
226 adaPage = read(t, res)
227 if strings.Contains(adaPage, "data-suggestion") {
228 t.Fatal("ontwikkelaar ziet een vakje op een beschermde bronbranch")
229 }
230 fresh := suggestionIDs(read(t, mustGet(t, tim, ts.URL+"/tim/review/-/merge-requests/1")))
231 if len(fresh) != 2 {
232 t.Fatalf("beheerder ziet %v", fresh)
233 }
234 res, err = adaC.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
235 "csrf": {csrfOf(t, adaPage)}, "id": {fresh[1]}, "title": {"van ada"},
236 })
237 if err != nil {
238 t.Fatal(err)
239 }
240 denied := read(t, res)
241 if !strings.Contains(denied, "you cannot push to feature") {
242 t.Fatalf("beschermd:\n%s", denied)
243 }
244
245 bare := gitrepo.Dir(storage, "tim", "review")
246 before := strings.TrimSpace(mustGit(t, bare, "rev-list", "--count", "feature"))
247 res, err = tim.Get(ts.URL + "/tim/review/-/merge-requests/1")
248 if err != nil {
249 t.Fatal(err)
250 }
251 timPage := read(t, res)
252 res, err = tim.PostForm(ts.URL+"/tim/review/-/merge-requests/1/suggestions", url.Values{
253 "csrf": {csrfOf(t, timPage)}, "id": {fresh[1]}, "title": {"Suggestie van bob"}, "description": {"twee regels"},
254 })
255 if err != nil {
256 t.Fatal(err)
257 }
258 applied := read(t, res)
259 if !strings.Contains(applied, "Suggestions applied") {
260 t.Fatalf("toepassen:\n%s", applied)
261 }
262 body := mustGit(t, bare, "show", "feature:hello.txt")
263 if body != "alpha\nfixed\nGAMMA\n" {
264 t.Fatalf("bestand %q", body)
265 }
266 after := strings.TrimSpace(mustGit(t, bare, "rev-list", "--count", "feature"))
267 msg := mustGit(t, bare, "log", "-1", "--format=%s%n%b", "feature")
268 who := mustGit(t, bare, "log", "-1", "--format=%ae", "feature")
269 if after != bumpCount(before) || !strings.Contains(msg, "Suggestie van bob") || !strings.Contains(msg, "twee regels") || strings.TrimSpace(who) != "tim@users.git.timfalken.com" {
270 t.Fatalf("voor %s na %s\n%s", before, after, msg)
271 }
272}
273
274func bumpCount(n string) string {
275 i := 0
276 for _, c := range n {
277 i = i*10 + int(c-'0')
278 }
279 return strconvItoa(i + 1)
280}
281
282func strconvItoa(n int) string {
283 if n == 0 {
284 return "0"
285 }
286 var b [16]byte
287 i := len(b)
288 for n > 0 {
289 i--
290 b[i] = byte('0' + n%10)
291 n /= 10
292 }
293 return string(b[i:])
294}
295
296func clientAs(t *testing.T, base string, st *store.Store, userID int64) *http.Client {
297 t.Helper()
298 sess, err := st.CreateSession(context.Background(), userID, "dev", time.Now().Add(time.Hour))
299 if err != nil {
300 t.Fatal(err)
301 }
302 jar, _ := cookiejar.New(nil)
303 u, _ := url.Parse(base)
304 jar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
305 return &http.Client{Jar: jar}
306}
307
308func mustGit(t *testing.T, dir string, args ...string) string {
309 t.Helper()
310 out, err := gitOut(dir, args...)
311 if err != nil {
312 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
313 }
314 return out
315}
316
317func mustGet(t *testing.T, c *http.Client, raw string) *http.Response {
318 t.Helper()
319 res, err := c.Get(raw)
320 if err != nil {
321 t.Fatal(err)
322 }
323 return res
324}
325
326func suggestionIDs(html string) []string {
327 var out []string
328 const needle = `data-suggestion="`
329 for {
330 i := strings.Index(html, needle)
331 if i < 0 {
332 break
333 }
334 html = html[i+len(needle):]
335 j := strings.Index(html, `"`)
336 out = append(out, html[:j])
337 html = html[j:]
338 }
339 return out
340}
internal/server/templates/collab.html +60 −2
@@ -37,17 +37,75 @@
37 37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
38 38 </form>
39 39 {{end}}
40 <h2>{{t "mr.changes"}}</h2>
41 {{if .CanApply}}
42 <div class="applybar" hidden data-apply-bar>
43 <button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
44 </div>
45 <dialog class="sugmodal" data-apply-dialog>
46 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
47 <input type="hidden" name="csrf" value="{{.CSRF}}">
48 <div data-apply-ids></div>
49 <h2>{{t "sug.applyWord"}}</h2>
50 <label>{{t "sug.title"}} <input name="title" required></label>
51 <label>{{t "sug.description"}} <textarea name="description"></textarea></label>
52 <p class="muted">{{t "sug.optional"}}</p>
53 <div class="row">
54 <button type="submit">{{t "sug.submit"}}</button>
55 <button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
56 </div>
57 </form>
58 </dialog>
59 {{end}}
60 <div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
61 {{range .DiffFiles}}
62 <section class="difffile" data-path="{{.Path}}">
63 <header>{{.Path}}</header>
64 {{range .Lines}}
65 <div class="diffline kind-{{.Kind}}"{{if .New}} data-line="{{.New}}"{{end}}>
66 <span class="gutter{{if not .New}} off{{end}}"></span>
67 <span class="ln">{{if .New}}{{.New}}{{else if .Old}}{{.Old}}{{end}}</span>
68 <code>{{.Text}}</code>
69 </div>
70 {{range .Notes}}
71 <article class="linenote" id="note-{{.ID}}">
72 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
73 <div class="muted">{{.Path}}:{{.Start}}-{{.End}}</div>
74 <pre class="note">{{.Body}}</pre>
75 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
76 </article>
77 {{end}}
78 {{end}}
79 </section>
80 {{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
81 {{if .CanComment}}
82 <form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
83 <input type="hidden" name="csrf" value="{{.CSRF}}">
84 <input type="hidden" name="path" value="">
85 <input type="hidden" name="line_start" value="">
86 <input type="hidden" name="line_end" value="">
87 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
88 <p class="muted">{{t "sug.hint"}}</p>
89 <div class="row">
90 <button type="submit">{{t "action.post"}}</button>
91 <button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
92 </div>
93 </form>
94 <button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
95 {{end}}
96 </div>
40 97 <h2>{{t "mr.comments"}}</h2>
41 98 <ul class="clean">
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
99 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>{{if .Path}} <span class="muted">{{.Path}}:{{.Start}}-{{.End}}</span>{{end}}<pre class="note">{{.Body}}</pre></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
43 100 </ul>
44 {{if .User}}
101 {{if .CanComment}}
45 102 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
46 103 <input type="hidden" name="csrf" value="{{.CSRF}}">
47 104 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
48 105 <button type="submit">{{t "action.post"}}</button>
49 106 </form>
50 107 {{end}}
108 <script src="/assets/suggest.js"></script>
51 109 {{template "layout-end" .}}
52 110 {{end}}
53 111
@@ -37,17 +37,75 @@
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
37 <input type="hidden" name="csrf" value="{{.CSRF}}"><button class="ghost" type="submit">{{t "action.close"}}</button>
38</form>
38</form>
39{{end}}
39{{end}}
40<h2>{{t "mr.changes"}}</h2>
41{{if .CanApply}}
42<div class="applybar" hidden data-apply-bar>
43 <button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
44</div>
45<dialog class="sugmodal" data-apply-dialog>
46 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
47 <input type="hidden" name="csrf" value="{{.CSRF}}">
48 <div data-apply-ids></div>
49 <h2>{{t "sug.applyWord"}}</h2>
50 <label>{{t "sug.title"}} <input name="title" required></label>
51 <label>{{t "sug.description"}} <textarea name="description"></textarea></label>
52 <p class="muted">{{t "sug.optional"}}</p>
53 <div class="row">
54 <button type="submit">{{t "sug.submit"}}</button>
55 <button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
56 </div>
57 </form>
58</dialog>
59{{end}}
60<div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
61{{range .DiffFiles}}
62<section class="difffile" data-path="{{.Path}}">
63 <header>{{.Path}}</header>
64 {{range .Lines}}
65 <div class="diffline kind-{{.Kind}}"{{if .New}} data-line="{{.New}}"{{end}}>
66 <span class="gutter{{if not .New}} off{{end}}"></span>
67 <span class="ln">{{if .New}}{{.New}}{{else if .Old}}{{.Old}}{{end}}</span>
68 <code>{{.Text}}</code>
69 </div>
70 {{range .Notes}}
71 <article class="linenote" id="note-{{.ID}}">
72 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
73 <div class="muted">{{.Path}}:{{.Start}}-{{.End}}</div>
74 <pre class="note">{{.Body}}</pre>
75 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
76 </article>
77 {{end}}
78 {{end}}
79</section>
80{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
81{{if .CanComment}}
82<form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
83 <input type="hidden" name="csrf" value="{{.CSRF}}">
84 <input type="hidden" name="path" value="">
85 <input type="hidden" name="line_start" value="">
86 <input type="hidden" name="line_end" value="">
87 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
88 <p class="muted">{{t "sug.hint"}}</p>
89 <div class="row">
90 <button type="submit">{{t "action.post"}}</button>
91 <button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
92 </div>
93</form>
94<button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
95{{end}}
96</div>
40<h2>{{t "mr.comments"}}</h2>
97<h2>{{t "mr.comments"}}</h2>
41<ul class="clean">
98<ul class="clean">
42 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><p>{{.Body}}</p></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
99 {{range .Notes}}<li><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>{{if .Path}} <span class="muted">{{.Path}}:{{.Start}}-{{.End}}</span>{{end}}<pre class="note">{{.Body}}</pre></li>{{else}}<li class="muted">{{t "mr.noComments"}}</li>{{end}}
43</ul>
100</ul>
44{{if .User}}
101{{if .CanComment}}
45<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
102<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
46 <input type="hidden" name="csrf" value="{{.CSRF}}">
103 <input type="hidden" name="csrf" value="{{.CSRF}}">
47 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
104 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
48 <button type="submit">{{t "action.post"}}</button>
105 <button type="submit">{{t "action.post"}}</button>
49</form>
106</form>
50{{end}}
107{{end}}
108<script src="/assets/suggest.js"></script>
51{{template "layout-end" .}}
109{{template "layout-end" .}}
52{{end}}
110{{end}}
53
111
internal/store/notes.go +41 −14
@@ -10,31 +10,54 @@ import (
10 10 )
11 11
12 12 // Note is een reactie op een merge request.
13 // FilePath leeg is een algemene reactie. Suggestion is de vervangende tekst,
14 // BaseText de regels zoals ze bij het plaatsen in het bestand stonden.
13 15 type Note struct {
14 ID int64
15 RepoID int64
16 MRID int64
17 AuthorID int64
18 Author string
19 Body string
20 CreatedAt time.Time
16 ID int64
17 RepoID int64
18 MRID int64
19 AuthorID int64
20 Author string
21 Body string
22 FilePath string
23 LineStart int
24 LineEnd int
25 Suggestion string
26 BaseText string
27 CreatedAt time.Time
21 28 }
22 29
23 // AddNote bewaart een reactie en telt hem als bijdrage.
30 // AddNote bewaart een algemene reactie en telt hem als bijdrage.
24 31 func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
32 return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "")
33 }
34
35 // AddLineNote bewaart een reactie op regels, optioneel met een suggestie.
36 func (s *Store) AddLineNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
37 if path == "" || start < 1 || end < start {
38 return Note{}, i18n.E("err.sugLines")
39 }
40 return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base)
41 }
42
43 func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
25 44 body = strings.TrimSpace(body)
26 45 if body == "" {
27 46 return Note{}, i18n.E("err.noteEmpty")
28 47 }
29 body = trim(body, 4000)
48 limit := 4000
49 if path != "" {
50 limit = 20000
51 }
52 body = trim(body, limit)
30 53 tx, err := s.db.BeginTx(ctx, nil)
31 54 if err != nil {
32 55 return Note{}, err
33 56 }
34 57 defer func() { _ = tx.Rollback() }()
35 58 ts := now()
36 res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at) VALUES (?, ?, ?, ?, ?)`,
37 repoID, mrID, authorID, body, ts)
59 res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at, file_path, line_start, line_end, suggestion, base_text) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
60 repoID, mrID, authorID, body, ts, path, start, end, suggestion, base)
38 61 if err != nil {
39 62 return Note{}, err
40 63 }
@@ -46,12 +69,16 @@ func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body
46 69 if err := tx.Commit(); err != nil {
47 70 return Note{}, err
48 71 }
49 return Note{ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body, CreatedAt: parseTime(ts)}, nil
72 return Note{
73 ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,
74 FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,
75 CreatedAt: parseTime(ts),
76 }, nil
50 77 }
51 78
52 79 // ListNotes geeft de reacties van één merge request, oudste eerst.
53 80 func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
54 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at
81 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text
55 82 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
56 83 if err != nil {
57 84 return nil, err
@@ -61,7 +88,7 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
61 88 for rows.Next() {
62 89 var n Note
63 90 var created string
64 if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created); err != nil {
91 if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText); err != nil {
65 92 return nil, err
66 93 }
67 94 n.CreatedAt = parseTime(created)
@@ -10,31 +10,54 @@ import (
10)
10)
11
11
12// Note is een reactie op een merge request.
12// Note is een reactie op een merge request.
13// FilePath leeg is een algemene reactie. Suggestion is de vervangende tekst,
14// BaseText de regels zoals ze bij het plaatsen in het bestand stonden.
13type Note struct {
15type Note struct {
14 ID int64
16 ID int64
15 RepoID int64
17 RepoID int64
16 MRID int64
18 MRID int64
17 AuthorID int64
19 AuthorID int64
18 Author string
20 Author string
19 Body string
21 Body string
20 CreatedAt time.Time
22 FilePath string
23 LineStart int
24 LineEnd int
25 Suggestion string
26 BaseText string
27 CreatedAt time.Time
21}
28}
22
29
23// AddNote bewaart een reactie en telt hem als bijdrage.
30// AddNote bewaart een algemene reactie en telt hem als bijdrage.
24func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
31func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
32 return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "")
33}
34
35// AddLineNote bewaart een reactie op regels, optioneel met een suggestie.
36func (s *Store) AddLineNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
37 if path == "" || start < 1 || end < start {
38 return Note{}, i18n.E("err.sugLines")
39 }
40 return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base)
41}
42
43func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
25 body = strings.TrimSpace(body)
44 body = strings.TrimSpace(body)
26 if body == "" {
45 if body == "" {
27 return Note{}, i18n.E("err.noteEmpty")
46 return Note{}, i18n.E("err.noteEmpty")
28 }
47 }
29 body = trim(body, 4000)
48 limit := 4000
49 if path != "" {
50 limit = 20000
51 }
52 body = trim(body, limit)
30 tx, err := s.db.BeginTx(ctx, nil)
53 tx, err := s.db.BeginTx(ctx, nil)
31 if err != nil {
54 if err != nil {
32 return Note{}, err
55 return Note{}, err
33 }
56 }
34 defer func() { _ = tx.Rollback() }()
57 defer func() { _ = tx.Rollback() }()
35 ts := now()
58 ts := now()
36 res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at) VALUES (?, ?, ?, ?, ?)`,
59 res, err := tx.ExecContext(ctx, `INSERT INTO notes (repo_id, mr_id, author_id, body, created_at, file_path, line_start, line_end, suggestion, base_text) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
37 repoID, mrID, authorID, body, ts)
60 repoID, mrID, authorID, body, ts, path, start, end, suggestion, base)
38 if err != nil {
61 if err != nil {
39 return Note{}, err
62 return Note{}, err
40 }
63 }
@@ -46,12 +69,16 @@ func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body
46 if err := tx.Commit(); err != nil {
69 if err := tx.Commit(); err != nil {
47 return Note{}, err
70 return Note{}, err
48 }
71 }
49 return Note{ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body, CreatedAt: parseTime(ts)}, nil
72 return Note{
73 ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,
74 FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,
75 CreatedAt: parseTime(ts),
76 }, nil
50}
77}
51
78
52// ListNotes geeft de reacties van één merge request, oudste eerst.
79// ListNotes geeft de reacties van één merge request, oudste eerst.
53func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
80func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
54 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at
81 rows, err := s.db.QueryContext(ctx, `SELECT n.id, n.repo_id, n.mr_id, n.author_id, u.username, n.body, n.created_at, n.file_path, n.line_start, n.line_end, n.suggestion, n.base_text
55 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
82 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
56 if err != nil {
83 if err != nil {
57 return nil, err
84 return nil, err
@@ -61,7 +88,7 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
61 for rows.Next() {
88 for rows.Next() {
62 var n Note
89 var n Note
63 var created string
90 var created string
64 if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created); err != nil {
91 if err := rows.Scan(&n.ID, &n.RepoID, &n.MRID, &n.AuthorID, &n.Author, &n.Body, &created, &n.FilePath, &n.LineStart, &n.LineEnd, &n.Suggestion, &n.BaseText); err != nil {
65 return nil, err
92 return nil, err
66 }
93 }
67 n.CreatedAt = parseTime(created)
94 n.CreatedAt = parseTime(created)
internal/store/store.go +11 −1
@@ -63,6 +63,11 @@ func (s *Store) migrate() error {
63 63 `ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64 64 `ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65 65 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
66 `ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
67 `ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,
68 `ALTER TABLE notes ADD COLUMN line_end INTEGER NOT NULL DEFAULT 0`,
69 `ALTER TABLE notes ADD COLUMN suggestion TEXT NOT NULL DEFAULT ''`,
70 `ALTER TABLE notes ADD COLUMN base_text TEXT NOT NULL DEFAULT ''`,
66 71 }
67 72 for _, q := range alters {
68 73 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -297,7 +302,12 @@ CREATE TABLE IF NOT EXISTS notes (
297 302 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
298 303 author_id INTEGER NOT NULL REFERENCES users(id),
299 304 body TEXT NOT NULL,
300 created_at TEXT NOT NULL
305 created_at TEXT NOT NULL,
306 file_path TEXT NOT NULL DEFAULT '',
307 line_start INTEGER NOT NULL DEFAULT 0,
308 line_end INTEGER NOT NULL DEFAULT 0,
309 suggestion TEXT NOT NULL DEFAULT '',
310 base_text TEXT NOT NULL DEFAULT ''
301 311 );
302 312 CREATE TABLE IF NOT EXISTS commit_pushers (
303 313 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
@@ -63,6 +63,11 @@ func (s *Store) migrate() error {
63 `ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
63 `ALTER TABLE groups ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64 `ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
64 `ALTER TABLE repos ADD COLUMN logo_mime TEXT NOT NULL DEFAULT ''`,
65 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
65 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
66 `ALTER TABLE notes ADD COLUMN file_path TEXT NOT NULL DEFAULT ''`,
67 `ALTER TABLE notes ADD COLUMN line_start INTEGER NOT NULL DEFAULT 0`,
68 `ALTER TABLE notes ADD COLUMN line_end INTEGER NOT NULL DEFAULT 0`,
69 `ALTER TABLE notes ADD COLUMN suggestion TEXT NOT NULL DEFAULT ''`,
70 `ALTER TABLE notes ADD COLUMN base_text TEXT NOT NULL DEFAULT ''`,
66 }
71 }
67 for _, q := range alters {
72 for _, q := range alters {
68 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
73 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -297,7 +302,12 @@ CREATE TABLE IF NOT EXISTS notes (
297 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
302 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
298 author_id INTEGER NOT NULL REFERENCES users(id),
303 author_id INTEGER NOT NULL REFERENCES users(id),
299 body TEXT NOT NULL,
304 body TEXT NOT NULL,
300 created_at TEXT NOT NULL
305 created_at TEXT NOT NULL,
306 file_path TEXT NOT NULL DEFAULT '',
307 line_start INTEGER NOT NULL DEFAULT 0,
308 line_end INTEGER NOT NULL DEFAULT 0,
309 suggestion TEXT NOT NULL DEFAULT '',
310 base_text TEXT NOT NULL DEFAULT ''
301);
311);
302CREATE TABLE IF NOT EXISTS commit_pushers (
312CREATE TABLE IF NOT EXISTS commit_pushers (
303 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
313 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,