BlueGit

timfa bluegit

Merge branch 'cursor/commit-detail-65da' into 'cursor/image-presets-info-65da'

feat: commitpagina zoals GitLab

See merge request Timfa/bluegit!27

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
1dadf80254f2e33150c8fb0353ead66ff9e8e516
Pipeline
Failed
34 files changed +3094 −165
internal/gitrepo/branch.go added +98 −0
@@ -0,0 +1,98 @@
1 package gitrepo
2
3 import (
4 "context"
5 "strconv"
6 "strings"
7 )
8
9 // BranchTip is de punt van een lokale branch.
10 type BranchTip struct {
11 Name, SHA, Subject, Date string
12 }
13
14 // BranchTips geeft elke lokale branch met zijn laatste commit.
15 func BranchTips(ctx context.Context, gitBin, dir string) ([]BranchTip, error) {
16 const format = "%(refname:short)%00%(objectname)%00%(subject)%00%(creatordate:short)"
17 out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format="+format, "refs/heads")
18 if err != nil {
19 return nil, err
20 }
21 var tips []BranchTip
22 for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {
23 if line == "" {
24 continue
25 }
26 parts := strings.Split(line, "\x00")
27 if len(parts) < 4 || parts[0] == "" {
28 continue
29 }
30 tips = append(tips, BranchTip{Name: parts[0], SHA: parts[1], Subject: parts[2], Date: parts[3]})
31 }
32 return tips, nil
33 }
34
35 // AheadBehind telt commits die branch voor en achter base heeft.
36 // Links in de git-telling is achter, rechts is voor.
37 func AheadBehind(ctx context.Context, gitBin, dir, base, branch string) (ahead, behind int, err error) {
38 out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--left-right", "--count", base+"..."+branch)
39 if err != nil {
40 return 0, 0, err
41 }
42 fields := strings.Fields(out)
43 if len(fields) != 2 {
44 return 0, 0, nil
45 }
46 behind, _ = strconv.Atoi(fields[0])
47 ahead, _ = strconv.Atoi(fields[1])
48 return ahead, behind, nil
49 }
50
51 // CreateBranch maakt name op rev. rev is een branch, tag of commit.
52 func CreateBranch(ctx context.Context, gitBin, dir, name, rev string) error {
53 sha, err := run(ctx, gitBin, nil, "-C", dir, "rev-parse", "--verify", "--end-of-options", rev+"^{commit}")
54 if err != nil {
55 return err
56 }
57 _, err = run(ctx, gitBin, nil, "-C", dir, "branch", "--", name, strings.TrimSpace(sha))
58 return err
59 }
60
61 // DeleteBranch verwijdert een lokale branch.
62 func DeleteBranch(ctx context.Context, gitBin, dir, name string) error {
63 _, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-D", "--", name)
64 return err
65 }
66
67 // RenameBranch hernoemt een lokale branch.
68 func RenameBranch(ctx context.Context, gitBin, dir, oldName, newName string) error {
69 _, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-m", "--", oldName, newName)
70 return err
71 }
72
73 // ComparePatch is de three-dot diff van from...to, dezelfde vorm als een commit.
74 func ComparePatch(ctx context.Context, gitBin, dir, from, to string) ([]PatchFile, error) {
75 out, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", from+"..."+to)
76 if err != nil {
77 return nil, err
78 }
79 return ParsePatch(out), nil
80 }
81
82 // Subjects geeft de onderwerpen van rev, nieuwste eerst.
83 func Subjects(ctx context.Context, gitBin, dir, rev string, limit int) ([]string, error) {
84 if limit < 1 {
85 limit = 1
86 }
87 out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%s", "-n", strconv.Itoa(limit), rev)
88 if err != nil {
89 return nil, err
90 }
91 var subjects []string
92 for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {
93 if line != "" {
94 subjects = append(subjects, line)
95 }
96 }
97 return subjects, nil
98 }
@@ -0,0 +1,98 @@
1package gitrepo
2
3import (
4 "context"
5 "strconv"
6 "strings"
7)
8
9// BranchTip is de punt van een lokale branch.
10type BranchTip struct {
11 Name, SHA, Subject, Date string
12}
13
14// BranchTips geeft elke lokale branch met zijn laatste commit.
15func BranchTips(ctx context.Context, gitBin, dir string) ([]BranchTip, error) {
16 const format = "%(refname:short)%00%(objectname)%00%(subject)%00%(creatordate:short)"
17 out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref", "--format="+format, "refs/heads")
18 if err != nil {
19 return nil, err
20 }
21 var tips []BranchTip
22 for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {
23 if line == "" {
24 continue
25 }
26 parts := strings.Split(line, "\x00")
27 if len(parts) < 4 || parts[0] == "" {
28 continue
29 }
30 tips = append(tips, BranchTip{Name: parts[0], SHA: parts[1], Subject: parts[2], Date: parts[3]})
31 }
32 return tips, nil
33}
34
35// AheadBehind telt commits die branch voor en achter base heeft.
36// Links in de git-telling is achter, rechts is voor.
37func AheadBehind(ctx context.Context, gitBin, dir, base, branch string) (ahead, behind int, err error) {
38 out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--left-right", "--count", base+"..."+branch)
39 if err != nil {
40 return 0, 0, err
41 }
42 fields := strings.Fields(out)
43 if len(fields) != 2 {
44 return 0, 0, nil
45 }
46 behind, _ = strconv.Atoi(fields[0])
47 ahead, _ = strconv.Atoi(fields[1])
48 return ahead, behind, nil
49}
50
51// CreateBranch maakt name op rev. rev is een branch, tag of commit.
52func CreateBranch(ctx context.Context, gitBin, dir, name, rev string) error {
53 sha, err := run(ctx, gitBin, nil, "-C", dir, "rev-parse", "--verify", "--end-of-options", rev+"^{commit}")
54 if err != nil {
55 return err
56 }
57 _, err = run(ctx, gitBin, nil, "-C", dir, "branch", "--", name, strings.TrimSpace(sha))
58 return err
59}
60
61// DeleteBranch verwijdert een lokale branch.
62func DeleteBranch(ctx context.Context, gitBin, dir, name string) error {
63 _, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-D", "--", name)
64 return err
65}
66
67// RenameBranch hernoemt een lokale branch.
68func RenameBranch(ctx context.Context, gitBin, dir, oldName, newName string) error {
69 _, err := run(ctx, gitBin, nil, "-C", dir, "branch", "-m", "--", oldName, newName)
70 return err
71}
72
73// ComparePatch is de three-dot diff van from...to, dezelfde vorm als een commit.
74func ComparePatch(ctx context.Context, gitBin, dir, from, to string) ([]PatchFile, error) {
75 out, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", from+"..."+to)
76 if err != nil {
77 return nil, err
78 }
79 return ParsePatch(out), nil
80}
81
82// Subjects geeft de onderwerpen van rev, nieuwste eerst.
83func Subjects(ctx context.Context, gitBin, dir, rev string, limit int) ([]string, error) {
84 if limit < 1 {
85 limit = 1
86 }
87 out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%s", "-n", strconv.Itoa(limit), rev)
88 if err != nil {
89 return nil, err
90 }
91 var subjects []string
92 for _, line := range strings.Split(strings.TrimRight(out, "\n"), "\n") {
93 if line != "" {
94 subjects = append(subjects, line)
95 }
96 }
97 return subjects, nil
98}
internal/gitrepo/branch_test.go added +73 −0
@@ -0,0 +1,73 @@
1 package gitrepo
2
3 import (
4 "context"
5 "os"
6 "os/exec"
7 "path/filepath"
8 "testing"
9 )
10
11 func TestBranchOps(t *testing.T) {
12 if _, err := exec.LookPath("git"); err != nil {
13 t.Skip("git ontbreekt")
14 }
15 dir := t.TempDir()
16 git := func(args ...string) {
17 t.Helper()
18 cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
19 cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")
20 if out, err := cmd.CombinedOutput(); err != nil {
21 t.Fatalf("git %v: %v\n%s", args, err, out)
22 }
23 }
24 git("init", "-b", "master")
25 git("config", "commit.gpgsign", "false")
26 if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("een\n"), 0o644); err != nil {
27 t.Fatal(err)
28 }
29 git("add", "hello.txt")
30 git("commit", "-m", "start")
31 git("checkout", "-b", "topic")
32 if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("twee\n"), 0o644); err != nil {
33 t.Fatal(err)
34 }
35 git("add", "hello.txt")
36 git("commit", "-m", "onderwerp-xyz")
37
38 ctx := context.Background()
39 tips, err := BranchTips(ctx, "git", dir)
40 if err != nil || len(tips) != 2 {
41 t.Fatalf("tips %v %v", tips, err)
42 }
43 ahead, behind, err := AheadBehind(ctx, "git", dir, "master", "topic")
44 if err != nil || ahead != 1 || behind != 0 {
45 t.Fatalf("voor/achter %d %d %v", ahead, behind, err)
46 }
47 if err := CreateBranch(ctx, "git", dir, "wip", "topic"); err != nil {
48 t.Fatal(err)
49 }
50 if err := RenameBranch(ctx, "git", dir, "wip", "wip2"); err != nil {
51 t.Fatal(err)
52 }
53 if err := DeleteBranch(ctx, "git", dir, "wip2"); err != nil {
54 t.Fatal(err)
55 }
56 names, err := Branches(ctx, "git", dir)
57 if err != nil {
58 t.Fatal(err)
59 }
60 for _, name := range names {
61 if name == "wip" || name == "wip2" {
62 t.Fatalf("branch bleef bestaan: %v", names)
63 }
64 }
65 files, err := ComparePatch(ctx, "git", dir, "master", "topic")
66 if err != nil || len(files) != 1 || files[0].Path != "hello.txt" {
67 t.Fatalf("vergelijk %v %v", files, err)
68 }
69 subjects, err := Subjects(ctx, "git", dir, "master..topic", 20)
70 if err != nil || len(subjects) != 1 || subjects[0] != "onderwerp-xyz" {
71 t.Fatalf("onderwerpen %v %v", subjects, err)
72 }
73 }
@@ -0,0 +1,73 @@
1package gitrepo
2
3import (
4 "context"
5 "os"
6 "os/exec"
7 "path/filepath"
8 "testing"
9)
10
11func TestBranchOps(t *testing.T) {
12 if _, err := exec.LookPath("git"); err != nil {
13 t.Skip("git ontbreekt")
14 }
15 dir := t.TempDir()
16 git := func(args ...string) {
17 t.Helper()
18 cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
19 cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")
20 if out, err := cmd.CombinedOutput(); err != nil {
21 t.Fatalf("git %v: %v\n%s", args, err, out)
22 }
23 }
24 git("init", "-b", "master")
25 git("config", "commit.gpgsign", "false")
26 if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("een\n"), 0o644); err != nil {
27 t.Fatal(err)
28 }
29 git("add", "hello.txt")
30 git("commit", "-m", "start")
31 git("checkout", "-b", "topic")
32 if err := os.WriteFile(filepath.Join(dir, "hello.txt"), []byte("twee\n"), 0o644); err != nil {
33 t.Fatal(err)
34 }
35 git("add", "hello.txt")
36 git("commit", "-m", "onderwerp-xyz")
37
38 ctx := context.Background()
39 tips, err := BranchTips(ctx, "git", dir)
40 if err != nil || len(tips) != 2 {
41 t.Fatalf("tips %v %v", tips, err)
42 }
43 ahead, behind, err := AheadBehind(ctx, "git", dir, "master", "topic")
44 if err != nil || ahead != 1 || behind != 0 {
45 t.Fatalf("voor/achter %d %d %v", ahead, behind, err)
46 }
47 if err := CreateBranch(ctx, "git", dir, "wip", "topic"); err != nil {
48 t.Fatal(err)
49 }
50 if err := RenameBranch(ctx, "git", dir, "wip", "wip2"); err != nil {
51 t.Fatal(err)
52 }
53 if err := DeleteBranch(ctx, "git", dir, "wip2"); err != nil {
54 t.Fatal(err)
55 }
56 names, err := Branches(ctx, "git", dir)
57 if err != nil {
58 t.Fatal(err)
59 }
60 for _, name := range names {
61 if name == "wip" || name == "wip2" {
62 t.Fatalf("branch bleef bestaan: %v", names)
63 }
64 }
65 files, err := ComparePatch(ctx, "git", dir, "master", "topic")
66 if err != nil || len(files) != 1 || files[0].Path != "hello.txt" {
67 t.Fatalf("vergelijk %v %v", files, err)
68 }
69 subjects, err := Subjects(ctx, "git", dir, "master..topic", 20)
70 if err != nil || len(subjects) != 1 || subjects[0] != "onderwerp-xyz" {
71 t.Fatalf("onderwerpen %v %v", subjects, err)
72 }
73}
internal/gitrepo/patch.go added +198 −0
@@ -0,0 +1,198 @@
1 package gitrepo
2
3 import (
4 "context"
5 "strconv"
6 "strings"
7 )
8
9 // PatchFile is één bestand in de diff van een commit tegen zijn eerste parent.
10 // Een root-commit wordt vergeleken met de lege boom.
11 type PatchFile struct {
12 Status string
13 Path string
14 OldPath string
15 Added int
16 Deleted int
17 Binary bool
18 Lines []DiffLine
19 }
20
21 // CommitPatch leest de parents en de diff van sha.
22 // Een mergecommit wordt tegen de eerste parent gezet.
23 func CommitPatch(ctx context.Context, gitBin, dir, sha string) (parents []string, files []PatchFile, err error) {
24 out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--parents", "-n", "1", sha)
25 if err != nil {
26 return nil, nil, err
27 }
28 fields := strings.Fields(out)
29 if len(fields) == 0 {
30 return nil, nil, err
31 }
32 if len(fields) > 1 {
33 parents = append([]string(nil), fields[1:]...)
34 }
35 base := ""
36 if len(parents) > 0 {
37 base = parents[0]
38 } else {
39 empty, err := run(ctx, gitBin, nil, "hash-object", "-t", "tree", "--stdin")
40 if err != nil {
41 return nil, nil, err
42 }
43 base = strings.TrimSpace(empty)
44 }
45 raw, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", base, sha)
46 if err != nil {
47 return nil, nil, err
48 }
49 return parents, ParsePatch(raw), nil
50 }
51
52 // ParsePatch leest de tekst van git diff, inclusief hernoemen en binaire bestanden.
53 func ParsePatch(raw string) []PatchFile {
54 var files []PatchFile
55 var cur *PatchFile
56 var oldGuess, newGuess string
57 var oldLine, newLine int
58 inHunk := false
59 skipBinary := false
60 for _, line := range strings.Split(raw, "\n") {
61 switch {
62 case strings.HasPrefix(line, "diff --git "):
63 files = append(files, PatchFile{Status: "modified"})
64 cur = &files[len(files)-1]
65 oldGuess, newGuess = splitDiffPaths(line)
66 cur.Path = newGuess
67 oldLine, newLine = 0, 0
68 inHunk = false
69 skipBinary = false
70 case cur == nil || skipBinary:
71 continue
72 case strings.HasPrefix(line, "new file mode "):
73 cur.Status = "added"
74 case strings.HasPrefix(line, "deleted file mode "):
75 cur.Status = "deleted"
76 if oldGuess != "" {
77 cur.Path = oldGuess
78 }
79 case strings.HasPrefix(line, "rename from ") || strings.HasPrefix(line, "copy from "):
80 cur.Status = "renamed"
81 cur.OldPath = metaPath(line)
82 case strings.HasPrefix(line, "rename to ") || strings.HasPrefix(line, "copy to "):
83 cur.Status = "renamed"
84 if p := metaPath(line); p != "" {
85 cur.Path = p
86 }
87 case strings.HasPrefix(line, "Binary files ") || strings.HasPrefix(line, "GIT binary patch"):
88 cur.Binary = true
89 cur.Lines = nil
90 cur.Added, cur.Deleted = 0, 0
91 skipBinary = true
92 inHunk = false
93 case strings.HasPrefix(line, "@@"):
94 oldLine, newLine = hunkStart(line)
95 oldLine--
96 newLine--
97 inHunk = true
98 cur.Lines = append(cur.Lines, DiffLine{Kind: "hunk", Text: line})
99 case !inHunk:
100 continue
101 case strings.HasPrefix(line, `\`):
102 continue
103 case strings.HasPrefix(line, "+"):
104 newLine++
105 cur.Added++
106 cur.Lines = append(cur.Lines, DiffLine{Kind: "add", New: newLine, Text: line[1:]})
107 case strings.HasPrefix(line, "-"):
108 oldLine++
109 cur.Deleted++
110 cur.Lines = append(cur.Lines, DiffLine{Kind: "del", Old: oldLine, Text: line[1:]})
111 case strings.HasPrefix(line, " "):
112 oldLine++
113 newLine++
114 cur.Lines = append(cur.Lines, DiffLine{Kind: "ctx", Old: oldLine, New: newLine, Text: line[1:]})
115 }
116 }
117 var out []PatchFile
118 for _, f := range files {
119 if f.Path == "" {
120 continue
121 }
122 if f.Status != "renamed" {
123 f.OldPath = ""
124 }
125 out = append(out, f)
126 }
127 return out
128 }
129
130 func splitDiffPaths(line string) (oldPath, newPath string) {
131 rest := strings.TrimSpace(strings.TrimPrefix(line, "diff --git "))
132 a, b, ok := splitQuotedPair(rest)
133 if !ok {
134 return "", ""
135 }
136 return stripAB(a), stripAB(b)
137 }
138
139 func splitQuotedPair(s string) (string, string, bool) {
140 s = strings.TrimSpace(s)
141 if s == "" {
142 return "", "", false
143 }
144 if strings.HasPrefix(s, `"`) {
145 a, rest, ok := unquotePrefix(s)
146 if !ok {
147 return "", "", false
148 }
149 rest = strings.TrimSpace(rest)
150 if strings.HasPrefix(rest, `"`) {
151 b, _, ok := unquotePrefix(rest)
152 return a, b, ok
153 }
154 return a, rest, rest != ""
155 }
156 i := strings.Index(s, " b/")
157 if i < 0 {
158 return "", "", false
159 }
160 return s[:i], s[i+1:], true
161 }
162
163 func unquotePrefix(s string) (string, string, bool) {
164 if len(s) < 2 || s[0] != '"' {
165 return "", "", false
166 }
167 for i := 1; i < len(s); i++ {
168 if s[i] == '\\' {
169 i++
170 continue
171 }
172 if s[i] == '"' {
173 u, err := strconv.Unquote(s[:i+1])
174 if err != nil {
175 return "", "", false
176 }
177 return u, s[i+1:], true
178 }
179 }
180 return "", "", false
181 }
182
183 func metaPath(line string) string {
184 if i := strings.IndexByte(line, ' '); i >= 0 {
185 line = line[i+1:]
186 }
187 // "rename from pad" heeft twee spaties in het commando.
188 if i := strings.IndexByte(line, ' '); i >= 0 && !strings.HasPrefix(line, `"`) && (strings.HasPrefix(line, "from ") || strings.HasPrefix(line, "to ")) {
189 line = line[i+1:]
190 }
191 line = strings.TrimSpace(line)
192 if strings.HasPrefix(line, `"`) {
193 if u, err := strconv.Unquote(line); err == nil {
194 return u
195 }
196 }
197 return line
198 }
@@ -0,0 +1,198 @@
1package gitrepo
2
3import (
4 "context"
5 "strconv"
6 "strings"
7)
8
9// PatchFile is één bestand in de diff van een commit tegen zijn eerste parent.
10// Een root-commit wordt vergeleken met de lege boom.
11type PatchFile struct {
12 Status string
13 Path string
14 OldPath string
15 Added int
16 Deleted int
17 Binary bool
18 Lines []DiffLine
19}
20
21// CommitPatch leest de parents en de diff van sha.
22// Een mergecommit wordt tegen de eerste parent gezet.
23func CommitPatch(ctx context.Context, gitBin, dir, sha string) (parents []string, files []PatchFile, err error) {
24 out, err := run(ctx, gitBin, nil, "-C", dir, "rev-list", "--parents", "-n", "1", sha)
25 if err != nil {
26 return nil, nil, err
27 }
28 fields := strings.Fields(out)
29 if len(fields) == 0 {
30 return nil, nil, err
31 }
32 if len(fields) > 1 {
33 parents = append([]string(nil), fields[1:]...)
34 }
35 base := ""
36 if len(parents) > 0 {
37 base = parents[0]
38 } else {
39 empty, err := run(ctx, gitBin, nil, "hash-object", "-t", "tree", "--stdin")
40 if err != nil {
41 return nil, nil, err
42 }
43 base = strings.TrimSpace(empty)
44 }
45 raw, err := runAllow(ctx, gitBin, nil, 1, "-c", "core.quotepath=false", "-C", dir, "diff", "--no-color", "--find-renames", "--unified=3", base, sha)
46 if err != nil {
47 return nil, nil, err
48 }
49 return parents, ParsePatch(raw), nil
50}
51
52// ParsePatch leest de tekst van git diff, inclusief hernoemen en binaire bestanden.
53func ParsePatch(raw string) []PatchFile {
54 var files []PatchFile
55 var cur *PatchFile
56 var oldGuess, newGuess string
57 var oldLine, newLine int
58 inHunk := false
59 skipBinary := false
60 for _, line := range strings.Split(raw, "\n") {
61 switch {
62 case strings.HasPrefix(line, "diff --git "):
63 files = append(files, PatchFile{Status: "modified"})
64 cur = &files[len(files)-1]
65 oldGuess, newGuess = splitDiffPaths(line)
66 cur.Path = newGuess
67 oldLine, newLine = 0, 0
68 inHunk = false
69 skipBinary = false
70 case cur == nil || skipBinary:
71 continue
72 case strings.HasPrefix(line, "new file mode "):
73 cur.Status = "added"
74 case strings.HasPrefix(line, "deleted file mode "):
75 cur.Status = "deleted"
76 if oldGuess != "" {
77 cur.Path = oldGuess
78 }
79 case strings.HasPrefix(line, "rename from ") || strings.HasPrefix(line, "copy from "):
80 cur.Status = "renamed"
81 cur.OldPath = metaPath(line)
82 case strings.HasPrefix(line, "rename to ") || strings.HasPrefix(line, "copy to "):
83 cur.Status = "renamed"
84 if p := metaPath(line); p != "" {
85 cur.Path = p
86 }
87 case strings.HasPrefix(line, "Binary files ") || strings.HasPrefix(line, "GIT binary patch"):
88 cur.Binary = true
89 cur.Lines = nil
90 cur.Added, cur.Deleted = 0, 0
91 skipBinary = true
92 inHunk = false
93 case strings.HasPrefix(line, "@@"):
94 oldLine, newLine = hunkStart(line)
95 oldLine--
96 newLine--
97 inHunk = true
98 cur.Lines = append(cur.Lines, DiffLine{Kind: "hunk", Text: line})
99 case !inHunk:
100 continue
101 case strings.HasPrefix(line, `\`):
102 continue
103 case strings.HasPrefix(line, "+"):
104 newLine++
105 cur.Added++
106 cur.Lines = append(cur.Lines, DiffLine{Kind: "add", New: newLine, Text: line[1:]})
107 case strings.HasPrefix(line, "-"):
108 oldLine++
109 cur.Deleted++
110 cur.Lines = append(cur.Lines, DiffLine{Kind: "del", Old: oldLine, Text: line[1:]})
111 case strings.HasPrefix(line, " "):
112 oldLine++
113 newLine++
114 cur.Lines = append(cur.Lines, DiffLine{Kind: "ctx", Old: oldLine, New: newLine, Text: line[1:]})
115 }
116 }
117 var out []PatchFile
118 for _, f := range files {
119 if f.Path == "" {
120 continue
121 }
122 if f.Status != "renamed" {
123 f.OldPath = ""
124 }
125 out = append(out, f)
126 }
127 return out
128}
129
130func splitDiffPaths(line string) (oldPath, newPath string) {
131 rest := strings.TrimSpace(strings.TrimPrefix(line, "diff --git "))
132 a, b, ok := splitQuotedPair(rest)
133 if !ok {
134 return "", ""
135 }
136 return stripAB(a), stripAB(b)
137}
138
139func splitQuotedPair(s string) (string, string, bool) {
140 s = strings.TrimSpace(s)
141 if s == "" {
142 return "", "", false
143 }
144 if strings.HasPrefix(s, `"`) {
145 a, rest, ok := unquotePrefix(s)
146 if !ok {
147 return "", "", false
148 }
149 rest = strings.TrimSpace(rest)
150 if strings.HasPrefix(rest, `"`) {
151 b, _, ok := unquotePrefix(rest)
152 return a, b, ok
153 }
154 return a, rest, rest != ""
155 }
156 i := strings.Index(s, " b/")
157 if i < 0 {
158 return "", "", false
159 }
160 return s[:i], s[i+1:], true
161}
162
163func unquotePrefix(s string) (string, string, bool) {
164 if len(s) < 2 || s[0] != '"' {
165 return "", "", false
166 }
167 for i := 1; i < len(s); i++ {
168 if s[i] == '\\' {
169 i++
170 continue
171 }
172 if s[i] == '"' {
173 u, err := strconv.Unquote(s[:i+1])
174 if err != nil {
175 return "", "", false
176 }
177 return u, s[i+1:], true
178 }
179 }
180 return "", "", false
181}
182
183func metaPath(line string) string {
184 if i := strings.IndexByte(line, ' '); i >= 0 {
185 line = line[i+1:]
186 }
187 // "rename from pad" heeft twee spaties in het commando.
188 if i := strings.IndexByte(line, ' '); i >= 0 && !strings.HasPrefix(line, `"`) && (strings.HasPrefix(line, "from ") || strings.HasPrefix(line, "to ")) {
189 line = line[i+1:]
190 }
191 line = strings.TrimSpace(line)
192 if strings.HasPrefix(line, `"`) {
193 if u, err := strconv.Unquote(line); err == nil {
194 return u
195 }
196 }
197 return line
198}
internal/gitrepo/patch_test.go added +186 −0
@@ -0,0 +1,186 @@
1 package gitrepo
2
3 import (
4 "context"
5 "os"
6 "os/exec"
7 "path/filepath"
8 "strings"
9 "testing"
10 )
11
12 func TestParsePatchKinds(t *testing.T) {
13 raw := "" +
14 "diff --git a/keep.go b/keep.go\n" +
15 "index 111..222 100644\n" +
16 "--- a/keep.go\n" +
17 "+++ b/keep.go\n" +
18 "@@ -1,2 +1,3 @@\n" +
19 " package p\n" +
20 "-func old() {}\n" +
21 "+func extra() {}\n" +
22 " \n" +
23 "diff --git a/gone.txt b/gone.txt\n" +
24 "deleted file mode 100644\n" +
25 "--- a/gone.txt\n" +
26 "+++ /dev/null\n" +
27 "@@ -1 +0,0 @@\n" +
28 "-weg\n" +
29 "diff --git \"a/oude naam.txt\" \"b/nieuwe naam.txt\"\n" +
30 "similarity index 90%\n" +
31 "rename from oude naam.txt\n" +
32 "rename to nieuwe naam.txt\n" +
33 "--- \"a/oude naam.txt\"\n" +
34 "+++ \"b/nieuwe naam.txt\"\n" +
35 "@@ -1 +1 @@\n" +
36 "-oud\n" +
37 "+nieuw\n" +
38 "diff --git a/plaatje.bin b/plaatje.bin\n" +
39 "new file mode 100644\n" +
40 "index 0000000..abc\n" +
41 "Binary files /dev/null and b/plaatje.bin differ\n"
42 files := ParsePatch(raw)
43 if len(files) != 4 {
44 t.Fatalf("bestanden: %+v", files)
45 }
46 if files[0].Status != "modified" || files[0].Added != 1 || files[0].Deleted != 1 || files[0].Path != "keep.go" {
47 t.Fatalf("wijziging: %+v", files[0])
48 }
49 if files[0].Lines[2].Kind != "del" || files[0].Lines[2].Old != 2 || files[0].Lines[3].Kind != "add" || files[0].Lines[3].New != 2 {
50 t.Fatalf("regelnummers: %+v", files[0].Lines)
51 }
52 if files[1].Status != "deleted" || files[1].Path != "gone.txt" || files[1].Deleted != 1 {
53 t.Fatalf("verwijderd: %+v", files[1])
54 }
55 if files[2].Status != "renamed" || files[2].OldPath != "oude naam.txt" || files[2].Path != "nieuwe naam.txt" {
56 t.Fatalf("hernoemd: %+v", files[2])
57 }
58 if !files[3].Binary || files[3].Status != "added" || len(files[3].Lines) != 0 || files[3].Path != "plaatje.bin" {
59 t.Fatalf("binair: %+v", files[3])
60 }
61 }
62
63 func TestCommitPatchHistory(t *testing.T) {
64 if _, err := exec.LookPath("git"); err != nil {
65 t.Skip("git ontbreekt")
66 }
67 dir := t.TempDir()
68 git := func(args ...string) {
69 t.Helper()
70 cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
71 cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")
72 if out, err := cmd.CombinedOutput(); err != nil {
73 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
74 }
75 }
76 git("init", "-b", "master")
77 git("config", "commit.gpgsign", "false")
78 write := func(name, body string) {
79 t.Helper()
80 path := filepath.Join(dir, filepath.FromSlash(name))
81 if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
82 t.Fatal(err)
83 }
84 if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
85 t.Fatal(err)
86 }
87 }
88 write("a.txt", "alpha\n")
89 write("b.txt", "beta\n")
90 write("keep.go", "package p\n\nfunc keep() {}\n")
91 git("add", ".")
92 git("commit", "-m", "begin")
93 root := rev(t, dir)
94
95 ctx := context.Background()
96 parents, files, err := CommitPatch(ctx, "git", dir, root)
97 if err != nil {
98 t.Fatal(err)
99 }
100 if len(parents) != 0 || len(files) != 3 {
101 t.Fatalf("root parents=%v files=%d", parents, len(files))
102 }
103 for _, f := range files {
104 if f.Status != "added" {
105 t.Fatalf("rootbestand: %+v", f)
106 }
107 }
108
109 write("keep.go", "package p\n\nfunc keep() {}\nfunc extra() {}\n")
110 if err := os.Remove(filepath.Join(dir, "b.txt")); err != nil {
111 t.Fatal(err)
112 }
113 write("c.txt", strings.Repeat("x", 180)+"\n")
114 write("note file.txt", "spatie\n")
115 var huge strings.Builder
116 for i := 0; i < 220; i++ {
117 huge.WriteString("regel\n")
118 }
119 write("huge.txt", huge.String())
120 write("bin.dat", "a\x00b\n")
121 git("add", "-A")
122 git("mv", "a.txt", "a2.txt")
123 git("commit", "-m", "wijzig bestanden", "-m", "tweede alinea")
124 mixed := rev(t, dir)
125
126 parents, files, err = CommitPatch(ctx, "git", dir, mixed)
127 if err != nil {
128 t.Fatal(err)
129 }
130 if len(parents) != 1 || parents[0] != root {
131 t.Fatalf("parents: %v", parents)
132 }
133 byPath := map[string]PatchFile{}
134 for _, f := range files {
135 byPath[f.Path] = f
136 }
137 if byPath["a2.txt"].Status != "renamed" || byPath["a2.txt"].OldPath != "a.txt" {
138 t.Fatalf("rename: %+v", byPath["a2.txt"])
139 }
140 if byPath["b.txt"].Status != "deleted" || byPath["b.txt"].Deleted != 1 {
141 t.Fatalf("delete: %+v", byPath["b.txt"])
142 }
143 if byPath["c.txt"].Status != "added" || byPath["c.txt"].Added != 1 {
144 t.Fatalf("add: %+v", byPath["c.txt"])
145 }
146 if byPath["note file.txt"].Status != "added" {
147 t.Fatalf("spatie: %+v", byPath["note file.txt"])
148 }
149 if !byPath["bin.dat"].Binary || len(byPath["bin.dat"].Lines) != 0 {
150 t.Fatalf("binair: %+v", byPath["bin.dat"])
151 }
152 if byPath["huge.txt"].Added != 220 {
153 t.Fatalf("groot: %+v", byPath["huge.txt"])
154 }
155 if byPath["keep.go"].Status != "modified" || byPath["keep.go"].Added < 1 {
156 t.Fatalf("go: %+v", byPath["keep.go"])
157 }
158
159 git("checkout", "-b", "side")
160 write("side.txt", "zijtak\n")
161 git("add", "side.txt")
162 git("commit", "-m", "zijtak")
163 git("checkout", "master")
164 git("merge", "--no-ff", "side", "-m", "voeg zijtak samen")
165 merge := rev(t, dir)
166 parents, files, err = CommitPatch(ctx, "git", dir, merge)
167 if err != nil {
168 t.Fatal(err)
169 }
170 if len(parents) != 2 || parents[0] != mixed {
171 t.Fatalf("merge-parents: %v mixed=%s", parents, mixed)
172 }
173 if len(files) != 1 || files[0].Path != "side.txt" || files[0].Status != "added" {
174 t.Fatalf("merge-diff: %+v", files)
175 }
176 }
177
178 func rev(t *testing.T, dir string) string {
179 t.Helper()
180 cmd := exec.Command("git", "-C", dir, "rev-parse", "HEAD")
181 out, err := cmd.Output()
182 if err != nil {
183 t.Fatal(err)
184 }
185 return strings.TrimSpace(string(out))
186 }
@@ -0,0 +1,186 @@
1package gitrepo
2
3import (
4 "context"
5 "os"
6 "os/exec"
7 "path/filepath"
8 "strings"
9 "testing"
10)
11
12func TestParsePatchKinds(t *testing.T) {
13 raw := "" +
14 "diff --git a/keep.go b/keep.go\n" +
15 "index 111..222 100644\n" +
16 "--- a/keep.go\n" +
17 "+++ b/keep.go\n" +
18 "@@ -1,2 +1,3 @@\n" +
19 " package p\n" +
20 "-func old() {}\n" +
21 "+func extra() {}\n" +
22 " \n" +
23 "diff --git a/gone.txt b/gone.txt\n" +
24 "deleted file mode 100644\n" +
25 "--- a/gone.txt\n" +
26 "+++ /dev/null\n" +
27 "@@ -1 +0,0 @@\n" +
28 "-weg\n" +
29 "diff --git \"a/oude naam.txt\" \"b/nieuwe naam.txt\"\n" +
30 "similarity index 90%\n" +
31 "rename from oude naam.txt\n" +
32 "rename to nieuwe naam.txt\n" +
33 "--- \"a/oude naam.txt\"\n" +
34 "+++ \"b/nieuwe naam.txt\"\n" +
35 "@@ -1 +1 @@\n" +
36 "-oud\n" +
37 "+nieuw\n" +
38 "diff --git a/plaatje.bin b/plaatje.bin\n" +
39 "new file mode 100644\n" +
40 "index 0000000..abc\n" +
41 "Binary files /dev/null and b/plaatje.bin differ\n"
42 files := ParsePatch(raw)
43 if len(files) != 4 {
44 t.Fatalf("bestanden: %+v", files)
45 }
46 if files[0].Status != "modified" || files[0].Added != 1 || files[0].Deleted != 1 || files[0].Path != "keep.go" {
47 t.Fatalf("wijziging: %+v", files[0])
48 }
49 if files[0].Lines[2].Kind != "del" || files[0].Lines[2].Old != 2 || files[0].Lines[3].Kind != "add" || files[0].Lines[3].New != 2 {
50 t.Fatalf("regelnummers: %+v", files[0].Lines)
51 }
52 if files[1].Status != "deleted" || files[1].Path != "gone.txt" || files[1].Deleted != 1 {
53 t.Fatalf("verwijderd: %+v", files[1])
54 }
55 if files[2].Status != "renamed" || files[2].OldPath != "oude naam.txt" || files[2].Path != "nieuwe naam.txt" {
56 t.Fatalf("hernoemd: %+v", files[2])
57 }
58 if !files[3].Binary || files[3].Status != "added" || len(files[3].Lines) != 0 || files[3].Path != "plaatje.bin" {
59 t.Fatalf("binair: %+v", files[3])
60 }
61}
62
63func TestCommitPatchHistory(t *testing.T) {
64 if _, err := exec.LookPath("git"); err != nil {
65 t.Skip("git ontbreekt")
66 }
67 dir := t.TempDir()
68 git := func(args ...string) {
69 t.Helper()
70 cmd := exec.Command("git", append([]string{"-C", dir}, args...)...)
71 cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=tim", "GIT_AUTHOR_EMAIL=tim@example.com", "GIT_COMMITTER_NAME=tim", "GIT_COMMITTER_EMAIL=tim@example.com")
72 if out, err := cmd.CombinedOutput(); err != nil {
73 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
74 }
75 }
76 git("init", "-b", "master")
77 git("config", "commit.gpgsign", "false")
78 write := func(name, body string) {
79 t.Helper()
80 path := filepath.Join(dir, filepath.FromSlash(name))
81 if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
82 t.Fatal(err)
83 }
84 if err := os.WriteFile(path, []byte(body), 0o644); err != nil {
85 t.Fatal(err)
86 }
87 }
88 write("a.txt", "alpha\n")
89 write("b.txt", "beta\n")
90 write("keep.go", "package p\n\nfunc keep() {}\n")
91 git("add", ".")
92 git("commit", "-m", "begin")
93 root := rev(t, dir)
94
95 ctx := context.Background()
96 parents, files, err := CommitPatch(ctx, "git", dir, root)
97 if err != nil {
98 t.Fatal(err)
99 }
100 if len(parents) != 0 || len(files) != 3 {
101 t.Fatalf("root parents=%v files=%d", parents, len(files))
102 }
103 for _, f := range files {
104 if f.Status != "added" {
105 t.Fatalf("rootbestand: %+v", f)
106 }
107 }
108
109 write("keep.go", "package p\n\nfunc keep() {}\nfunc extra() {}\n")
110 if err := os.Remove(filepath.Join(dir, "b.txt")); err != nil {
111 t.Fatal(err)
112 }
113 write("c.txt", strings.Repeat("x", 180)+"\n")
114 write("note file.txt", "spatie\n")
115 var huge strings.Builder
116 for i := 0; i < 220; i++ {
117 huge.WriteString("regel\n")
118 }
119 write("huge.txt", huge.String())
120 write("bin.dat", "a\x00b\n")
121 git("add", "-A")
122 git("mv", "a.txt", "a2.txt")
123 git("commit", "-m", "wijzig bestanden", "-m", "tweede alinea")
124 mixed := rev(t, dir)
125
126 parents, files, err = CommitPatch(ctx, "git", dir, mixed)
127 if err != nil {
128 t.Fatal(err)
129 }
130 if len(parents) != 1 || parents[0] != root {
131 t.Fatalf("parents: %v", parents)
132 }
133 byPath := map[string]PatchFile{}
134 for _, f := range files {
135 byPath[f.Path] = f
136 }
137 if byPath["a2.txt"].Status != "renamed" || byPath["a2.txt"].OldPath != "a.txt" {
138 t.Fatalf("rename: %+v", byPath["a2.txt"])
139 }
140 if byPath["b.txt"].Status != "deleted" || byPath["b.txt"].Deleted != 1 {
141 t.Fatalf("delete: %+v", byPath["b.txt"])
142 }
143 if byPath["c.txt"].Status != "added" || byPath["c.txt"].Added != 1 {
144 t.Fatalf("add: %+v", byPath["c.txt"])
145 }
146 if byPath["note file.txt"].Status != "added" {
147 t.Fatalf("spatie: %+v", byPath["note file.txt"])
148 }
149 if !byPath["bin.dat"].Binary || len(byPath["bin.dat"].Lines) != 0 {
150 t.Fatalf("binair: %+v", byPath["bin.dat"])
151 }
152 if byPath["huge.txt"].Added != 220 {
153 t.Fatalf("groot: %+v", byPath["huge.txt"])
154 }
155 if byPath["keep.go"].Status != "modified" || byPath["keep.go"].Added < 1 {
156 t.Fatalf("go: %+v", byPath["keep.go"])
157 }
158
159 git("checkout", "-b", "side")
160 write("side.txt", "zijtak\n")
161 git("add", "side.txt")
162 git("commit", "-m", "zijtak")
163 git("checkout", "master")
164 git("merge", "--no-ff", "side", "-m", "voeg zijtak samen")
165 merge := rev(t, dir)
166 parents, files, err = CommitPatch(ctx, "git", dir, merge)
167 if err != nil {
168 t.Fatal(err)
169 }
170 if len(parents) != 2 || parents[0] != mixed {
171 t.Fatalf("merge-parents: %v mixed=%s", parents, mixed)
172 }
173 if len(files) != 1 || files[0].Path != "side.txt" || files[0].Status != "added" {
174 t.Fatalf("merge-diff: %+v", files)
175 }
176}
177
178func rev(t *testing.T, dir string) string {
179 t.Helper()
180 cmd := exec.Command("git", "-C", dir, "rev-parse", "HEAD")
181 out, err := cmd.Output()
182 if err != nil {
183 t.Fatal(err)
184 }
185 return strings.TrimSpace(string(out))
186}
internal/highlight/highlight.go +20 −5
@@ -9,21 +9,36 @@ import (
9 9
10 10 // Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.
11 11 func Lines(filename, src string) []string {
12 lang := langOf(filename)
13 inBlock := false
14 12 raw := strings.Split(src, "\n")
15 13 if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {
16 14 raw = raw[:len(raw)-1]
17 15 }
16 p := NewPainter(filename)
18 17 out := make([]string, 0, len(raw))
19 18 for _, line := range raw {
20 var htmlLine string
21 htmlLine, inBlock = paint(lang, line, inBlock)
22 out = append(out, htmlLine)
19 out = append(out, p.Line(line))
23 20 }
24 21 return out
25 22 }
26 23
24 // Painter kleurt opeenvolgende regels en onthoudt een blokcommentaar.
25 type Painter struct {
26 lang string
27 inBlock bool
28 }
29
30 // NewPainter kiest de taal bij de bestandsnaam.
31 func NewPainter(filename string) *Painter {
32 return &Painter{lang: langOf(filename)}
33 }
34
35 // Line geeft geëscapete HTML voor één regel.
36 func (p *Painter) Line(text string) string {
37 htmlLine, inBlock := paint(p.lang, text, p.inBlock)
38 p.inBlock = inBlock
39 return htmlLine
40 }
41
27 42 func langOf(filename string) string {
28 43 switch strings.ToLower(path.Ext(filename)) {
29 44 case ".go":
@@ -9,21 +9,36 @@ import (
9
9
10// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.
10// Lines geeft per regel HTML. Tekst uit het bestand is geëscaped.
11func Lines(filename, src string) []string {
11func Lines(filename, src string) []string {
12 lang := langOf(filename)
13 inBlock := false
14 raw := strings.Split(src, "\n")
12 raw := strings.Split(src, "\n")
15 if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {
13 if len(raw) > 0 && raw[len(raw)-1] == "" && strings.HasSuffix(src, "\n") {
16 raw = raw[:len(raw)-1]
14 raw = raw[:len(raw)-1]
17 }
15 }
16 p := NewPainter(filename)
18 out := make([]string, 0, len(raw))
17 out := make([]string, 0, len(raw))
19 for _, line := range raw {
18 for _, line := range raw {
20 var htmlLine string
19 out = append(out, p.Line(line))
21 htmlLine, inBlock = paint(lang, line, inBlock)
22 out = append(out, htmlLine)
23 }
20 }
24 return out
21 return out
25}
22}
26
23
24// Painter kleurt opeenvolgende regels en onthoudt een blokcommentaar.
25type Painter struct {
26 lang string
27 inBlock bool
28}
29
30// NewPainter kiest de taal bij de bestandsnaam.
31func NewPainter(filename string) *Painter {
32 return &Painter{lang: langOf(filename)}
33}
34
35// Line geeft geëscapete HTML voor één regel.
36func (p *Painter) Line(text string) string {
37 htmlLine, inBlock := paint(p.lang, text, p.inBlock)
38 p.inBlock = inBlock
39 return htmlLine
40}
41
27func langOf(filename string) string {
42func langOf(filename string) string {
28 switch strings.ToLower(path.Ext(filename)) {
43 switch strings.ToLower(path.Ext(filename)) {
29 case ".go":
44 case ".go":
internal/i18n/catalog_branch.go added +224 −0
@@ -0,0 +1,224 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, branchEN)
5 addCatalog(nl, branchNL)
6 addCatalog(de, branchDE)
7 addCatalog(fr, branchFR)
8 }
9
10 var branchEN = map[string]string{
11 "branch.search": "Search branches",
12 "branch.default": "default",
13 "branch.create": "New branch",
14 "branch.name": "Branch name",
15 "branch.from": "Create from",
16 "branch.delete": "Delete",
17 "branch.rename": "Rename",
18 "branch.deleteAsk": "Delete branch %s?",
19 "branch.renameAsk": "Rename branch %s?",
20 "branch.confirm": "Type the branch name to confirm",
21 "branch.compare": "Compare",
22 "branch.newMR": "Create merge request",
23 "branch.last": "Last commit",
24 "branch.ahead": "%d ahead",
25 "branch.behind": "%d behind",
26 "branch.even": "Up to date",
27 "branch.actions": "Actions",
28 "mr.draft": "Draft",
29 "mr.markDraft": "Mark as draft",
30 "mr.block.draft": "This merge request is a draft.",
31 "mr.preview": "Preview",
32 "mr.write": "Write",
33 "mr.overview": "Overview",
34 "mr.pipelines": "Pipelines",
35 "mr.labels": "Labels",
36 "mr.labelsHint": "Comma-separated labels",
37 "mr.timeline": "Activity",
38 "mr.opened": "opened this merge request",
39 "mr.pushed": "pushed",
40 "mr.retitled": "changed the title",
41 "mr.relabeled": "changed the labels",
42 "mr.mergedEvent": "merged this merge request",
43 "mr.closedEvent": "closed this merge request",
44 "mr.reopenedEvent": "reopened this merge request",
45 "mr.reply": "Reply",
46 "mr.replying": "Reply to %s",
47 "mr.create": "Create merge request",
48 "mr.edit": "Edit",
49 "mr.save": "Save changes",
50 "mr.mergeTitle": "Merge %s into %s",
51 "mr.emptyCompare": "Choose two different branches",
52 "mr.commented": "commented",
53 "mr.pipeEvent": "Pipeline #%d is %s",
54 "err.branchName": "Branch name %s is not allowed",
55 "err.branchLocked": "Branch %s cannot be renamed or deleted",
56 "err.branchConfirm": "Type the branch name to confirm.",
57 "err.noteParent": "That comment does not exist",
58 "flash.branchCreated": "Branch created",
59 "flash.branchDeleted": "Branch deleted",
60 "flash.branchRenamed": "Branch renamed",
61 "flash.mrUpdated": "Merge request updated",
62 }
63
64 var branchNL = map[string]string{
65 "branch.search": "Zoek branches",
66 "branch.default": "standaard",
67 "branch.create": "Nieuwe branch",
68 "branch.name": "Branchnaam",
69 "branch.from": "Aanmaken vanaf",
70 "branch.delete": "Verwijderen",
71 "branch.rename": "Hernoemen",
72 "branch.deleteAsk": "Branch %s verwijderen?",
73 "branch.renameAsk": "Branch %s hernoemen?",
74 "branch.confirm": "Typ de branchnaam ter bevestiging",
75 "branch.compare": "Vergelijken",
76 "branch.newMR": "Merge request maken",
77 "branch.last": "Laatste commit",
78 "branch.ahead": "%d voor",
79 "branch.behind": "%d achter",
80 "branch.even": "Bijgewerkt",
81 "branch.actions": "Acties",
82 "mr.draft": "Concept",
83 "mr.markDraft": "Als concept markeren",
84 "mr.block.draft": "Deze merge request is een concept.",
85 "mr.preview": "Voorbeeld",
86 "mr.write": "Schrijven",
87 "mr.overview": "Overzicht",
88 "mr.pipelines": "Pipelines",
89 "mr.labels": "Labels",
90 "mr.labelsHint": "Labels, gescheiden door komma's",
91 "mr.timeline": "Activiteit",
92 "mr.opened": "heeft deze merge request geopend",
93 "mr.pushed": "heeft gepusht",
94 "mr.retitled": "heeft de titel gewijzigd",
95 "mr.relabeled": "heeft de labels gewijzigd",
96 "mr.mergedEvent": "heeft deze merge request gemerged",
97 "mr.closedEvent": "heeft deze merge request gesloten",
98 "mr.reopenedEvent": "heeft deze merge request heropend",
99 "mr.reply": "Antwoorden",
100 "mr.replying": "Antwoord op %s",
101 "mr.create": "Merge request maken",
102 "mr.edit": "Bewerken",
103 "mr.save": "Wijzigingen opslaan",
104 "mr.mergeTitle": "%s mergen naar %s",
105 "mr.emptyCompare": "Kies twee verschillende branches",
106 "mr.commented": "reageerde",
107 "mr.pipeEvent": "Pipeline #%d is %s",
108 "err.branchName": "Branchnaam %s is niet toegestaan",
109 "err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",
110 "err.branchConfirm": "Typ de branchnaam ter bevestiging.",
111 "err.noteParent": "Die reactie bestaat niet",
112 "flash.branchCreated": "Branch aangemaakt",
113 "flash.branchDeleted": "Branch verwijderd",
114 "flash.branchRenamed": "Branch hernoemd",
115 "flash.mrUpdated": "Merge request bijgewerkt",
116 }
117
118 var branchDE = map[string]string{
119 "branch.search": "Branches suchen",
120 "branch.default": "Standard",
121 "branch.create": "Neuer Branch",
122 "branch.name": "Branchname",
123 "branch.from": "Erstellen von",
124 "branch.delete": "Löschen",
125 "branch.rename": "Umbenennen",
126 "branch.deleteAsk": "Branch %s löschen?",
127 "branch.renameAsk": "Branch %s umbenennen?",
128 "branch.confirm": "Branchname zur Bestätigung eingeben",
129 "branch.compare": "Vergleichen",
130 "branch.newMR": "Merge Request erstellen",
131 "branch.last": "Letzter Commit",
132 "branch.ahead": "%d voraus",
133 "branch.behind": "%d zurück",
134 "branch.even": "Aktuell",
135 "branch.actions": "Aktionen",
136 "mr.draft": "Entwurf",
137 "mr.markDraft": "Als Entwurf markieren",
138 "mr.block.draft": "Dieser Merge Request ist ein Entwurf.",
139 "mr.preview": "Vorschau",
140 "mr.write": "Schreiben",
141 "mr.overview": "Übersicht",
142 "mr.pipelines": "Pipelines",
143 "mr.labels": "Labels",
144 "mr.labelsHint": "Labels, durch Kommas getrennt",
145 "mr.timeline": "Aktivität",
146 "mr.opened": "hat diesen Merge Request geöffnet",
147 "mr.pushed": "hat gepusht",
148 "mr.retitled": "hat den Titel geändert",
149 "mr.relabeled": "hat die Labels geändert",
150 "mr.mergedEvent": "hat diesen Merge Request gemergt",
151 "mr.closedEvent": "hat diesen Merge Request geschlossen",
152 "mr.reopenedEvent": "hat diesen Merge Request wieder geöffnet",
153 "mr.reply": "Antworten",
154 "mr.replying": "Antwort auf %s",
155 "mr.create": "Merge Request erstellen",
156 "mr.edit": "Bearbeiten",
157 "mr.save": "Änderungen speichern",
158 "mr.mergeTitle": "%s nach %s mergen",
159 "mr.emptyCompare": "Zwei verschiedene Branches wählen",
160 "mr.commented": "kommentierte",
161 "mr.pipeEvent": "Pipeline #%d ist %s",
162 "err.branchName": "Branchname %s ist nicht erlaubt",
163 "err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",
164 "err.branchConfirm": "Branchname zur Bestätigung eingeben.",
165 "err.noteParent": "Dieser Kommentar existiert nicht",
166 "flash.branchCreated": "Branch erstellt",
167 "flash.branchDeleted": "Branch gelöscht",
168 "flash.branchRenamed": "Branch umbenannt",
169 "flash.mrUpdated": "Merge Request aktualisiert",
170 }
171
172 var branchFR = map[string]string{
173 "branch.search": "Chercher des branches",
174 "branch.default": "par défaut",
175 "branch.create": "Nouvelle branche",
176 "branch.name": "Nom de la branche",
177 "branch.from": "Créer depuis",
178 "branch.delete": "Supprimer",
179 "branch.rename": "Renommer",
180 "branch.deleteAsk": "Supprimer la branche %s ?",
181 "branch.renameAsk": "Renommer la branche %s ?",
182 "branch.confirm": "Saisir le nom de la branche pour confirmer",
183 "branch.compare": "Comparer",
184 "branch.newMR": "Créer une merge request",
185 "branch.last": "Dernier commit",
186 "branch.ahead": "%d en avance",
187 "branch.behind": "%d en retard",
188 "branch.even": "À jour",
189 "branch.actions": "Actions",
190 "mr.draft": "Brouillon",
191 "mr.markDraft": "Marquer comme brouillon",
192 "mr.block.draft": "Cette merge request est un brouillon.",
193 "mr.preview": "Aperçu",
194 "mr.write": "Écrire",
195 "mr.overview": "Aperçu général",
196 "mr.pipelines": "Pipelines",
197 "mr.labels": "Labels",
198 "mr.labelsHint": "Labels séparés par des virgules",
199 "mr.timeline": "Activité",
200 "mr.opened": "a ouvert cette merge request",
201 "mr.pushed": "a poussé",
202 "mr.retitled": "a changé le titre",
203 "mr.relabeled": "a changé les labels",
204 "mr.mergedEvent": "a fusionné cette merge request",
205 "mr.closedEvent": "a fermé cette merge request",
206 "mr.reopenedEvent": "a rouvert cette merge request",
207 "mr.reply": "Répondre",
208 "mr.replying": "Réponse à %s",
209 "mr.create": "Créer une merge request",
210 "mr.edit": "Modifier",
211 "mr.save": "Enregistrer",
212 "mr.mergeTitle": "Fusionner %s dans %s",
213 "mr.emptyCompare": "Choisissez deux branches différentes",
214 "mr.commented": "a commenté",
215 "mr.pipeEvent": "Le pipeline #%d est %s",
216 "err.branchName": "Le nom de branche %s n'est pas permis",
217 "err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",
218 "err.branchConfirm": "Saisir le nom de la branche pour confirmer.",
219 "err.noteParent": "Ce commentaire n'existe pas",
220 "flash.branchCreated": "Branche créée",
221 "flash.branchDeleted": "Branche supprimée",
222 "flash.branchRenamed": "Branche renommée",
223 "flash.mrUpdated": "Merge request mise à jour",
224 }
@@ -0,0 +1,224 @@
1package i18n
2
3func init() {
4 addCatalog(en, branchEN)
5 addCatalog(nl, branchNL)
6 addCatalog(de, branchDE)
7 addCatalog(fr, branchFR)
8}
9
10var branchEN = map[string]string{
11 "branch.search": "Search branches",
12 "branch.default": "default",
13 "branch.create": "New branch",
14 "branch.name": "Branch name",
15 "branch.from": "Create from",
16 "branch.delete": "Delete",
17 "branch.rename": "Rename",
18 "branch.deleteAsk": "Delete branch %s?",
19 "branch.renameAsk": "Rename branch %s?",
20 "branch.confirm": "Type the branch name to confirm",
21 "branch.compare": "Compare",
22 "branch.newMR": "Create merge request",
23 "branch.last": "Last commit",
24 "branch.ahead": "%d ahead",
25 "branch.behind": "%d behind",
26 "branch.even": "Up to date",
27 "branch.actions": "Actions",
28 "mr.draft": "Draft",
29 "mr.markDraft": "Mark as draft",
30 "mr.block.draft": "This merge request is a draft.",
31 "mr.preview": "Preview",
32 "mr.write": "Write",
33 "mr.overview": "Overview",
34 "mr.pipelines": "Pipelines",
35 "mr.labels": "Labels",
36 "mr.labelsHint": "Comma-separated labels",
37 "mr.timeline": "Activity",
38 "mr.opened": "opened this merge request",
39 "mr.pushed": "pushed",
40 "mr.retitled": "changed the title",
41 "mr.relabeled": "changed the labels",
42 "mr.mergedEvent": "merged this merge request",
43 "mr.closedEvent": "closed this merge request",
44 "mr.reopenedEvent": "reopened this merge request",
45 "mr.reply": "Reply",
46 "mr.replying": "Reply to %s",
47 "mr.create": "Create merge request",
48 "mr.edit": "Edit",
49 "mr.save": "Save changes",
50 "mr.mergeTitle": "Merge %s into %s",
51 "mr.emptyCompare": "Choose two different branches",
52 "mr.commented": "commented",
53 "mr.pipeEvent": "Pipeline #%d is %s",
54 "err.branchName": "Branch name %s is not allowed",
55 "err.branchLocked": "Branch %s cannot be renamed or deleted",
56 "err.branchConfirm": "Type the branch name to confirm.",
57 "err.noteParent": "That comment does not exist",
58 "flash.branchCreated": "Branch created",
59 "flash.branchDeleted": "Branch deleted",
60 "flash.branchRenamed": "Branch renamed",
61 "flash.mrUpdated": "Merge request updated",
62}
63
64var branchNL = map[string]string{
65 "branch.search": "Zoek branches",
66 "branch.default": "standaard",
67 "branch.create": "Nieuwe branch",
68 "branch.name": "Branchnaam",
69 "branch.from": "Aanmaken vanaf",
70 "branch.delete": "Verwijderen",
71 "branch.rename": "Hernoemen",
72 "branch.deleteAsk": "Branch %s verwijderen?",
73 "branch.renameAsk": "Branch %s hernoemen?",
74 "branch.confirm": "Typ de branchnaam ter bevestiging",
75 "branch.compare": "Vergelijken",
76 "branch.newMR": "Merge request maken",
77 "branch.last": "Laatste commit",
78 "branch.ahead": "%d voor",
79 "branch.behind": "%d achter",
80 "branch.even": "Bijgewerkt",
81 "branch.actions": "Acties",
82 "mr.draft": "Concept",
83 "mr.markDraft": "Als concept markeren",
84 "mr.block.draft": "Deze merge request is een concept.",
85 "mr.preview": "Voorbeeld",
86 "mr.write": "Schrijven",
87 "mr.overview": "Overzicht",
88 "mr.pipelines": "Pipelines",
89 "mr.labels": "Labels",
90 "mr.labelsHint": "Labels, gescheiden door komma's",
91 "mr.timeline": "Activiteit",
92 "mr.opened": "heeft deze merge request geopend",
93 "mr.pushed": "heeft gepusht",
94 "mr.retitled": "heeft de titel gewijzigd",
95 "mr.relabeled": "heeft de labels gewijzigd",
96 "mr.mergedEvent": "heeft deze merge request gemerged",
97 "mr.closedEvent": "heeft deze merge request gesloten",
98 "mr.reopenedEvent": "heeft deze merge request heropend",
99 "mr.reply": "Antwoorden",
100 "mr.replying": "Antwoord op %s",
101 "mr.create": "Merge request maken",
102 "mr.edit": "Bewerken",
103 "mr.save": "Wijzigingen opslaan",
104 "mr.mergeTitle": "%s mergen naar %s",
105 "mr.emptyCompare": "Kies twee verschillende branches",
106 "mr.commented": "reageerde",
107 "mr.pipeEvent": "Pipeline #%d is %s",
108 "err.branchName": "Branchnaam %s is niet toegestaan",
109 "err.branchLocked": "Branch %s kan niet hernoemd of verwijderd worden",
110 "err.branchConfirm": "Typ de branchnaam ter bevestiging.",
111 "err.noteParent": "Die reactie bestaat niet",
112 "flash.branchCreated": "Branch aangemaakt",
113 "flash.branchDeleted": "Branch verwijderd",
114 "flash.branchRenamed": "Branch hernoemd",
115 "flash.mrUpdated": "Merge request bijgewerkt",
116}
117
118var branchDE = map[string]string{
119 "branch.search": "Branches suchen",
120 "branch.default": "Standard",
121 "branch.create": "Neuer Branch",
122 "branch.name": "Branchname",
123 "branch.from": "Erstellen von",
124 "branch.delete": "Löschen",
125 "branch.rename": "Umbenennen",
126 "branch.deleteAsk": "Branch %s löschen?",
127 "branch.renameAsk": "Branch %s umbenennen?",
128 "branch.confirm": "Branchname zur Bestätigung eingeben",
129 "branch.compare": "Vergleichen",
130 "branch.newMR": "Merge Request erstellen",
131 "branch.last": "Letzter Commit",
132 "branch.ahead": "%d voraus",
133 "branch.behind": "%d zurück",
134 "branch.even": "Aktuell",
135 "branch.actions": "Aktionen",
136 "mr.draft": "Entwurf",
137 "mr.markDraft": "Als Entwurf markieren",
138 "mr.block.draft": "Dieser Merge Request ist ein Entwurf.",
139 "mr.preview": "Vorschau",
140 "mr.write": "Schreiben",
141 "mr.overview": "Übersicht",
142 "mr.pipelines": "Pipelines",
143 "mr.labels": "Labels",
144 "mr.labelsHint": "Labels, durch Kommas getrennt",
145 "mr.timeline": "Aktivität",
146 "mr.opened": "hat diesen Merge Request geöffnet",
147 "mr.pushed": "hat gepusht",
148 "mr.retitled": "hat den Titel geändert",
149 "mr.relabeled": "hat die Labels geändert",
150 "mr.mergedEvent": "hat diesen Merge Request gemergt",
151 "mr.closedEvent": "hat diesen Merge Request geschlossen",
152 "mr.reopenedEvent": "hat diesen Merge Request wieder geöffnet",
153 "mr.reply": "Antworten",
154 "mr.replying": "Antwort auf %s",
155 "mr.create": "Merge Request erstellen",
156 "mr.edit": "Bearbeiten",
157 "mr.save": "Änderungen speichern",
158 "mr.mergeTitle": "%s nach %s mergen",
159 "mr.emptyCompare": "Zwei verschiedene Branches wählen",
160 "mr.commented": "kommentierte",
161 "mr.pipeEvent": "Pipeline #%d ist %s",
162 "err.branchName": "Branchname %s ist nicht erlaubt",
163 "err.branchLocked": "Branch %s kann nicht umbenannt oder gelöscht werden",
164 "err.branchConfirm": "Branchname zur Bestätigung eingeben.",
165 "err.noteParent": "Dieser Kommentar existiert nicht",
166 "flash.branchCreated": "Branch erstellt",
167 "flash.branchDeleted": "Branch gelöscht",
168 "flash.branchRenamed": "Branch umbenannt",
169 "flash.mrUpdated": "Merge Request aktualisiert",
170}
171
172var branchFR = map[string]string{
173 "branch.search": "Chercher des branches",
174 "branch.default": "par défaut",
175 "branch.create": "Nouvelle branche",
176 "branch.name": "Nom de la branche",
177 "branch.from": "Créer depuis",
178 "branch.delete": "Supprimer",
179 "branch.rename": "Renommer",
180 "branch.deleteAsk": "Supprimer la branche %s ?",
181 "branch.renameAsk": "Renommer la branche %s ?",
182 "branch.confirm": "Saisir le nom de la branche pour confirmer",
183 "branch.compare": "Comparer",
184 "branch.newMR": "Créer une merge request",
185 "branch.last": "Dernier commit",
186 "branch.ahead": "%d en avance",
187 "branch.behind": "%d en retard",
188 "branch.even": "À jour",
189 "branch.actions": "Actions",
190 "mr.draft": "Brouillon",
191 "mr.markDraft": "Marquer comme brouillon",
192 "mr.block.draft": "Cette merge request est un brouillon.",
193 "mr.preview": "Aperçu",
194 "mr.write": "Écrire",
195 "mr.overview": "Aperçu général",
196 "mr.pipelines": "Pipelines",
197 "mr.labels": "Labels",
198 "mr.labelsHint": "Labels séparés par des virgules",
199 "mr.timeline": "Activité",
200 "mr.opened": "a ouvert cette merge request",
201 "mr.pushed": "a poussé",
202 "mr.retitled": "a changé le titre",
203 "mr.relabeled": "a changé les labels",
204 "mr.mergedEvent": "a fusionné cette merge request",
205 "mr.closedEvent": "a fermé cette merge request",
206 "mr.reopenedEvent": "a rouvert cette merge request",
207 "mr.reply": "Répondre",
208 "mr.replying": "Réponse à %s",
209 "mr.create": "Créer une merge request",
210 "mr.edit": "Modifier",
211 "mr.save": "Enregistrer",
212 "mr.mergeTitle": "Fusionner %s dans %s",
213 "mr.emptyCompare": "Choisissez deux branches différentes",
214 "mr.commented": "a commenté",
215 "mr.pipeEvent": "Le pipeline #%d est %s",
216 "err.branchName": "Le nom de branche %s n'est pas permis",
217 "err.branchLocked": "La branche %s ne peut pas être renommée ou supprimée",
218 "err.branchConfirm": "Saisir le nom de la branche pour confirmer.",
219 "err.noteParent": "Ce commentaire n'existe pas",
220 "flash.branchCreated": "Branche créée",
221 "flash.branchDeleted": "Branche supprimée",
222 "flash.branchRenamed": "Branche renommée",
223 "flash.mrUpdated": "Merge request mise à jour",
224}
internal/i18n/catalog_commit.go added +92 −0
@@ -0,0 +1,92 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, commitEN)
5 addCatalog(nl, commitNL)
6 addCatalog(de, commitDE)
7 addCatalog(fr, commitFR)
8 }
9
10 var commitEN = map[string]string{
11 "commit.authored": "Authored",
12 "commit.sha": "Hash",
13 "commit.parent": "Parent",
14 "commit.parents": "Parents",
15 "commit.changed": "Changed files",
16 "commit.file.one": "%d file changed",
17 "commit.file.many": "%d files changed",
18 "commit.added": "added",
19 "commit.deleted": "deleted",
20 "commit.renamed": "renamed",
21 "commit.binary": "Binary file",
22 "commit.binaryHint": "The contents of this binary file are not shown.",
23 "commit.show": "Show diff",
24 "commit.hide": "Hide diff",
25 "commit.inline": "Inline",
26 "commit.side": "Side-by-side",
27 "commit.empty": "This commit does not change any files.",
28 "commit.view": "Diff view",
29 }
30
31 var commitNL = map[string]string{
32 "commit.authored": "Geschreven",
33 "commit.sha": "Hash",
34 "commit.parent": "Bovenliggende commit",
35 "commit.parents": "Bovenliggende commits",
36 "commit.changed": "Gewijzigde bestanden",
37 "commit.file.one": "%d bestand gewijzigd",
38 "commit.file.many": "%d bestanden gewijzigd",
39 "commit.added": "toegevoegd",
40 "commit.deleted": "verwijderd",
41 "commit.renamed": "hernoemd",
42 "commit.binary": "Binair bestand",
43 "commit.binaryHint": "De inhoud van dit binaire bestand wordt niet getoond.",
44 "commit.show": "Toon diff",
45 "commit.hide": "Verberg diff",
46 "commit.inline": "Onder elkaar",
47 "commit.side": "Naast elkaar",
48 "commit.empty": "Deze commit wijzigt geen bestanden.",
49 "commit.view": "Diffweergave",
50 }
51
52 var commitDE = map[string]string{
53 "commit.authored": "Verfasst",
54 "commit.sha": "Hash",
55 "commit.parent": "Übergeordneter Commit",
56 "commit.parents": "Übergeordnete Commits",
57 "commit.changed": "Geänderte Dateien",
58 "commit.file.one": "%d Datei geändert",
59 "commit.file.many": "%d Dateien geändert",
60 "commit.added": "hinzugefügt",
61 "commit.deleted": "gelöscht",
62 "commit.renamed": "umbenannt",
63 "commit.binary": "Binärdatei",
64 "commit.binaryHint": "Der Inhalt dieser Binärdatei wird nicht angezeigt.",
65 "commit.show": "Diff anzeigen",
66 "commit.hide": "Diff verbergen",
67 "commit.inline": "Untereinander",
68 "commit.side": "Nebeneinander",
69 "commit.empty": "Dieser Commit ändert keine Dateien.",
70 "commit.view": "Diff-Ansicht",
71 }
72
73 var commitFR = map[string]string{
74 "commit.authored": "Rédigé",
75 "commit.sha": "Empreinte",
76 "commit.parent": "Parent",
77 "commit.parents": "Parents",
78 "commit.changed": "Fichiers modifiés",
79 "commit.file.one": "%d fichier modifié",
80 "commit.file.many": "%d fichiers modifiés",
81 "commit.added": "ajouté",
82 "commit.deleted": "supprimé",
83 "commit.renamed": "renommé",
84 "commit.binary": "Fichier binaire",
85 "commit.binaryHint": "Le contenu de ce fichier binaire n'est pas affiché.",
86 "commit.show": "Afficher le diff",
87 "commit.hide": "Masquer le diff",
88 "commit.inline": "En ligne",
89 "commit.side": "Côte à côte",
90 "commit.empty": "Ce commit ne modifie aucun fichier.",
91 "commit.view": "Affichage du diff",
92 }
@@ -0,0 +1,92 @@
1package i18n
2
3func init() {
4 addCatalog(en, commitEN)
5 addCatalog(nl, commitNL)
6 addCatalog(de, commitDE)
7 addCatalog(fr, commitFR)
8}
9
10var commitEN = map[string]string{
11 "commit.authored": "Authored",
12 "commit.sha": "Hash",
13 "commit.parent": "Parent",
14 "commit.parents": "Parents",
15 "commit.changed": "Changed files",
16 "commit.file.one": "%d file changed",
17 "commit.file.many": "%d files changed",
18 "commit.added": "added",
19 "commit.deleted": "deleted",
20 "commit.renamed": "renamed",
21 "commit.binary": "Binary file",
22 "commit.binaryHint": "The contents of this binary file are not shown.",
23 "commit.show": "Show diff",
24 "commit.hide": "Hide diff",
25 "commit.inline": "Inline",
26 "commit.side": "Side-by-side",
27 "commit.empty": "This commit does not change any files.",
28 "commit.view": "Diff view",
29}
30
31var commitNL = map[string]string{
32 "commit.authored": "Geschreven",
33 "commit.sha": "Hash",
34 "commit.parent": "Bovenliggende commit",
35 "commit.parents": "Bovenliggende commits",
36 "commit.changed": "Gewijzigde bestanden",
37 "commit.file.one": "%d bestand gewijzigd",
38 "commit.file.many": "%d bestanden gewijzigd",
39 "commit.added": "toegevoegd",
40 "commit.deleted": "verwijderd",
41 "commit.renamed": "hernoemd",
42 "commit.binary": "Binair bestand",
43 "commit.binaryHint": "De inhoud van dit binaire bestand wordt niet getoond.",
44 "commit.show": "Toon diff",
45 "commit.hide": "Verberg diff",
46 "commit.inline": "Onder elkaar",
47 "commit.side": "Naast elkaar",
48 "commit.empty": "Deze commit wijzigt geen bestanden.",
49 "commit.view": "Diffweergave",
50}
51
52var commitDE = map[string]string{
53 "commit.authored": "Verfasst",
54 "commit.sha": "Hash",
55 "commit.parent": "Übergeordneter Commit",
56 "commit.parents": "Übergeordnete Commits",
57 "commit.changed": "Geänderte Dateien",
58 "commit.file.one": "%d Datei geändert",
59 "commit.file.many": "%d Dateien geändert",
60 "commit.added": "hinzugefügt",
61 "commit.deleted": "gelöscht",
62 "commit.renamed": "umbenannt",
63 "commit.binary": "Binärdatei",
64 "commit.binaryHint": "Der Inhalt dieser Binärdatei wird nicht angezeigt.",
65 "commit.show": "Diff anzeigen",
66 "commit.hide": "Diff verbergen",
67 "commit.inline": "Untereinander",
68 "commit.side": "Nebeneinander",
69 "commit.empty": "Dieser Commit ändert keine Dateien.",
70 "commit.view": "Diff-Ansicht",
71}
72
73var commitFR = map[string]string{
74 "commit.authored": "Rédigé",
75 "commit.sha": "Empreinte",
76 "commit.parent": "Parent",
77 "commit.parents": "Parents",
78 "commit.changed": "Fichiers modifiés",
79 "commit.file.one": "%d fichier modifié",
80 "commit.file.many": "%d fichiers modifiés",
81 "commit.added": "ajouté",
82 "commit.deleted": "supprimé",
83 "commit.renamed": "renommé",
84 "commit.binary": "Fichier binaire",
85 "commit.binaryHint": "Le contenu de ce fichier binaire n'est pas affiché.",
86 "commit.show": "Afficher le diff",
87 "commit.hide": "Masquer le diff",
88 "commit.inline": "En ligne",
89 "commit.side": "Côte à côte",
90 "commit.empty": "Ce commit ne modifie aucun fichier.",
91 "commit.view": "Affichage du diff",
92}
internal/names/names.go +19 −0
@@ -102,6 +102,25 @@ func foldLatin(s string) string {
102 102 ).Replace(s)
103 103 }
104 104
105 // ValidBranch laat een branchnaam toe met slashes, zonder ontsnapping.
106 func ValidBranch(s string) error {
107 if s == "" || len(s) > 200 || strings.HasPrefix(s, "/") || strings.HasSuffix(s, "/") || strings.Contains(s, "..") || strings.Contains(s, "//") || strings.Contains(s, "@{") || strings.HasSuffix(s, ".lock") {
108 return i18n.E("err.branchName", s)
109 }
110 for _, part := range strings.Split(s, "/") {
111 if part == "" || part == "." || strings.HasPrefix(part, "-") || strings.HasSuffix(part, ".") {
112 return i18n.E("err.branchName", s)
113 }
114 for _, c := range part {
115 ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'
116 if !ok {
117 return i18n.E("err.branchName", s)
118 }
119 }
120 }
121 return nil
122 }
123
105 124 // ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
106 125 func ValidTag(s string) error {
107 126 if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
@@ -102,6 +102,25 @@ func foldLatin(s string) string {
102 ).Replace(s)
102 ).Replace(s)
103}
103}
104
104
105// ValidBranch laat een branchnaam toe met slashes, zonder ontsnapping.
106func ValidBranch(s string) error {
107 if s == "" || len(s) > 200 || strings.HasPrefix(s, "/") || strings.HasSuffix(s, "/") || strings.Contains(s, "..") || strings.Contains(s, "//") || strings.Contains(s, "@{") || strings.HasSuffix(s, ".lock") {
108 return i18n.E("err.branchName", s)
109 }
110 for _, part := range strings.Split(s, "/") {
111 if part == "" || part == "." || strings.HasPrefix(part, "-") || strings.HasSuffix(part, ".") {
112 return i18n.E("err.branchName", s)
113 }
114 for _, c := range part {
115 ok := (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '.' || c == '_' || c == '-'
116 if !ok {
117 return i18n.E("err.branchName", s)
118 }
119 }
120 }
121 return nil
122}
123
105// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
124// ValidTag beperkt release-tags tot een git-ref die niet ontsnapt.
106func ValidTag(s string) error {
125func ValidTag(s string) error {
107 if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
126 if s == "" || len(s) > 80 || strings.HasPrefix(s, "-") || strings.Contains(s, "..") {
internal/server/branch_mr_test.go added +189 −0
@@ -0,0 +1,189 @@
1 package server
2
3 import (
4 "net/http"
5 "net/http/cookiejar"
6 "net/http/httptest"
7 "net/url"
8 "os/exec"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 func TestBranchesAndMergeRequest(t *testing.T) {
19 if _, err := exec.LookPath("git"); err != nil {
20 t.Skip("git ontbreekt")
21 }
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 cfg := config.Config{
29 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
31 Git: config.Git{Binary: "git", DefaultBranch: "master"},
32 }
33 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
34 ts := httptest.NewServer(srv.Handler())
35 t.Cleanup(ts.Close)
36 jar, _ := cookiejar.New(nil)
37 tim := &http.Client{Jar: jar}
38 page := read(t, mustGet(t, tim, ts.URL+"/login"))
39 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
40 "csrf": {csrfOf(t, page)}, "name": {"takken"}, "visibility": {"public"},
41 }))
42 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{
43 "csrf": {csrfOf(t, page)}, "name": {"laptop"},
44 }))
45 token := between(page, `<p class="code">`, "</p>")
46 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/takken.git"
47 work := t.TempDir()
48 git(t, work, "init", "-b", "master")
49 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
50 git(t, work, "config", "user.name", "tim")
51 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\n")
52 git(t, work, "add", "hello.txt")
53 git(t, work, "commit", "-m", "start")
54 git(t, work, "remote", "add", "origin", remote)
55 git(t, work, "push", "-u", "origin", "master")
56 git(t, work, "checkout", "-b", "topic")
57 writeFile(t, filepath.Join(work, "hello.txt"), "beta\n")
58 git(t, work, "add", "hello.txt")
59 git(t, work, "commit", "-m", "onderwerp-xyz")
60 git(t, work, "push", "-u", "origin", "topic")
61
62 page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))
63 for _, want := range []string{"data-branch-filter", "topic", "default", "1 ahead", "master"} {
64 if !strings.Contains(page, want) {
65 t.Fatalf("branchpagina mist %q", want)
66 }
67 }
68 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
69 "csrf": {csrfOf(t, page)}, "name": {"master"}, "confirm": {"master"},
70 }))
71 if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, ">master<") && !strings.Contains(page, ">master</a>") {
72 if !strings.Contains(page, "master") {
73 t.Fatalf("standaardbranch weg:\n%s", page)
74 }
75 }
76 if !strings.Contains(page, "cannot be renamed or deleted") {
77 t.Fatalf("geen blokkade voor master:\n%s", page)
78 }
79
80 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/protected", url.Values{
81 "csrf": {csrfOf(t, page)}, "pattern": {"locked"},
82 }))
83 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{
84 "csrf": {csrfOf(t, page)}, "name": {"locked"}, "from": {"master"},
85 }))
86 if !strings.Contains(page, "locked") {
87 t.Fatalf("branch locked ontbreekt:\n%s", page)
88 }
89 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
90 "csrf": {csrfOf(t, page)}, "name": {"locked"}, "confirm": {"locked"},
91 }))
92 if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, "locked") {
93 t.Fatalf("beschermde branch verwijderd:\n%s", page)
94 }
95
96 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{
97 "csrf": {csrfOf(t, page)}, "name": {"wip"}, "from": {"topic"},
98 }))
99 if !strings.Contains(page, "wip") {
100 t.Fatalf("wip ontbreekt:\n%s", page)
101 }
102 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/rename", url.Values{
103 "csrf": {csrfOf(t, page)}, "name": {"wip"}, "new_name": {"wip2"}, "confirm": {"wip"},
104 }))
105 if !strings.Contains(page, "wip2") || strings.Contains(page, ">wip<") {
106 t.Fatalf("hernoemen:\n%s", page)
107 }
108 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
109 "csrf": {csrfOf(t, page)}, "name": {"wip2"}, "confirm": {"wip2"},
110 }))
111 if strings.Contains(page, "wip2") {
112 t.Fatalf("wip2 bleef staan:\n%s", page)
113 }
114
115 preview := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/new?source=topic&target=master"))
116 if !strings.Contains(preview, "onderwerp-xyz") || !strings.Contains(preview, "hello.txt") || !strings.Contains(preview, "data-md-box") {
117 t.Fatalf("voorvertoning:\n%s", preview)
118 }
119 md := read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/markdown", url.Values{
120 "csrf": {csrfOf(t, preview)}, "body": {"**vet** <script>alert(1)</script>"},
121 }))
122 if !strings.Contains(md, "<strong>vet</strong>") || !strings.Contains(md, "&lt;script&gt;") || strings.Contains(md, "<script>") {
123 t.Fatalf("markdown:\n%s", md)
124 }
125
126 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests", url.Values{
127 "csrf": {csrfOf(t, preview)}, "title": {"Onderwerp"}, "description": {"**vet** <script>alert(1)</script>"},
128 "source": {"topic"}, "target": {"master"}, "draft": {"1"},
129 }))
130 if !strings.Contains(page, "Draft") || !strings.Contains(page, "This merge request is a draft.") || !strings.Contains(page, "<strong>vet</strong>") || strings.Contains(page, "<script>") {
131 t.Fatalf("concept:\n%s", page)
132 }
133 if !strings.Contains(page, "disabled") {
134 t.Fatalf("concept hoort mergen te blokkeren:\n%s", page)
135 }
136 if !strings.Contains(page, "mr.overview") && !strings.Contains(page, "Overview") {
137 t.Fatalf("tabs:\n%s", page)
138 }
139 if !strings.Contains(page, "opened this merge request") {
140 t.Fatalf("tijdlijn:\n%s", page)
141 }
142
143 branches := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))
144 if !strings.Contains(branches, "/-/merge-requests/1") {
145 t.Fatalf("mr-link:\n%s", branches)
146 }
147
148 writeFile(t, filepath.Join(work, "hello.txt"), "gamma\n")
149 git(t, work, "add", "hello.txt")
150 git(t, work, "commit", "-m", "tweede-stap")
151 git(t, work, "push", "origin", "topic")
152 page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1"))
153 if !strings.Contains(page, "tweede-stap") || !strings.Contains(page, "pushed") {
154 t.Fatalf("push ververst de tijdlijn niet:\n%s", page)
155 }
156 changes := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1?tab=changes"))
157 if !strings.Contains(changes, "hello.txt") || !strings.Contains(changes, `class="gutter"`) {
158 t.Fatalf("wijzigingen:\n%s", changes)
159 }
160
161 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{
162 "csrf": {csrfOf(t, page)}, "body": {"eerste reactie"},
163 }))
164 noteID := between(page, `data-reply="`, `"`)
165 if noteID == "" || !strings.Contains(page, "eerste reactie") {
166 t.Fatalf("reactie:\n%s", page)
167 }
168 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{
169 "csrf": {csrfOf(t, page)}, "parent": {noteID}, "body": {"**antwoord**"},
170 }))
171 if !strings.Contains(page, "<strong>antwoord</strong>") {
172 t.Fatalf("antwoord:\n%s", page)
173 }
174 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1", url.Values{
175 "csrf": {csrfOf(t, page)}, "title": {"Nieuwe titel"}, "description": {"**vet**"}, "labels": {"bug, docs"},
176 }))
177 if !strings.Contains(page, "Nieuwe titel") || !strings.Contains(page, "changed the title") || !strings.Contains(page, "bug") {
178 t.Fatalf("bewerken:\n%s", page)
179 }
180 }
181
182 func mustPost(t *testing.T, c *http.Client, raw string, form url.Values) *http.Response {
183 t.Helper()
184 res, err := c.PostForm(raw, form)
185 if err != nil {
186 t.Fatal(err)
187 }
188 return res
189 }
@@ -0,0 +1,189 @@
1package server
2
3import (
4 "net/http"
5 "net/http/cookiejar"
6 "net/http/httptest"
7 "net/url"
8 "os/exec"
9 "path/filepath"
10 "strings"
11 "testing"
12
13 "gitlab.com/Timfa/bluegit/internal/auth"
14 "gitlab.com/Timfa/bluegit/internal/config"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func TestBranchesAndMergeRequest(t *testing.T) {
19 if _, err := exec.LookPath("git"); err != nil {
20 t.Skip("git ontbreekt")
21 }
22 storage := t.TempDir()
23 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
24 if err != nil {
25 t.Fatal(err)
26 }
27 t.Cleanup(func() { _ = st.Close() })
28 cfg := config.Config{
29 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
30 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
31 Git: config.Git{Binary: "git", DefaultBranch: "master"},
32 }
33 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
34 ts := httptest.NewServer(srv.Handler())
35 t.Cleanup(ts.Close)
36 jar, _ := cookiejar.New(nil)
37 tim := &http.Client{Jar: jar}
38 page := read(t, mustGet(t, tim, ts.URL+"/login"))
39 page = read(t, mustPost(t, tim, ts.URL+"/new/repo", url.Values{
40 "csrf": {csrfOf(t, page)}, "name": {"takken"}, "visibility": {"public"},
41 }))
42 page = read(t, mustPost(t, tim, ts.URL+"/settings/tokens", url.Values{
43 "csrf": {csrfOf(t, page)}, "name": {"laptop"},
44 }))
45 token := between(page, `<p class="code">`, "</p>")
46 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/takken.git"
47 work := t.TempDir()
48 git(t, work, "init", "-b", "master")
49 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
50 git(t, work, "config", "user.name", "tim")
51 writeFile(t, filepath.Join(work, "hello.txt"), "alpha\n")
52 git(t, work, "add", "hello.txt")
53 git(t, work, "commit", "-m", "start")
54 git(t, work, "remote", "add", "origin", remote)
55 git(t, work, "push", "-u", "origin", "master")
56 git(t, work, "checkout", "-b", "topic")
57 writeFile(t, filepath.Join(work, "hello.txt"), "beta\n")
58 git(t, work, "add", "hello.txt")
59 git(t, work, "commit", "-m", "onderwerp-xyz")
60 git(t, work, "push", "-u", "origin", "topic")
61
62 page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))
63 for _, want := range []string{"data-branch-filter", "topic", "default", "1 ahead", "master"} {
64 if !strings.Contains(page, want) {
65 t.Fatalf("branchpagina mist %q", want)
66 }
67 }
68 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
69 "csrf": {csrfOf(t, page)}, "name": {"master"}, "confirm": {"master"},
70 }))
71 if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, ">master<") && !strings.Contains(page, ">master</a>") {
72 if !strings.Contains(page, "master") {
73 t.Fatalf("standaardbranch weg:\n%s", page)
74 }
75 }
76 if !strings.Contains(page, "cannot be renamed or deleted") {
77 t.Fatalf("geen blokkade voor master:\n%s", page)
78 }
79
80 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/protected", url.Values{
81 "csrf": {csrfOf(t, page)}, "pattern": {"locked"},
82 }))
83 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{
84 "csrf": {csrfOf(t, page)}, "name": {"locked"}, "from": {"master"},
85 }))
86 if !strings.Contains(page, "locked") {
87 t.Fatalf("branch locked ontbreekt:\n%s", page)
88 }
89 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
90 "csrf": {csrfOf(t, page)}, "name": {"locked"}, "confirm": {"locked"},
91 }))
92 if !strings.Contains(page, "cannot be renamed or deleted") || !strings.Contains(page, "locked") {
93 t.Fatalf("beschermde branch verwijderd:\n%s", page)
94 }
95
96 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches", url.Values{
97 "csrf": {csrfOf(t, page)}, "name": {"wip"}, "from": {"topic"},
98 }))
99 if !strings.Contains(page, "wip") {
100 t.Fatalf("wip ontbreekt:\n%s", page)
101 }
102 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/rename", url.Values{
103 "csrf": {csrfOf(t, page)}, "name": {"wip"}, "new_name": {"wip2"}, "confirm": {"wip"},
104 }))
105 if !strings.Contains(page, "wip2") || strings.Contains(page, ">wip<") {
106 t.Fatalf("hernoemen:\n%s", page)
107 }
108 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/branches/delete", url.Values{
109 "csrf": {csrfOf(t, page)}, "name": {"wip2"}, "confirm": {"wip2"},
110 }))
111 if strings.Contains(page, "wip2") {
112 t.Fatalf("wip2 bleef staan:\n%s", page)
113 }
114
115 preview := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/new?source=topic&target=master"))
116 if !strings.Contains(preview, "onderwerp-xyz") || !strings.Contains(preview, "hello.txt") || !strings.Contains(preview, "data-md-box") {
117 t.Fatalf("voorvertoning:\n%s", preview)
118 }
119 md := read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/markdown", url.Values{
120 "csrf": {csrfOf(t, preview)}, "body": {"**vet** <script>alert(1)</script>"},
121 }))
122 if !strings.Contains(md, "<strong>vet</strong>") || !strings.Contains(md, "&lt;script&gt;") || strings.Contains(md, "<script>") {
123 t.Fatalf("markdown:\n%s", md)
124 }
125
126 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests", url.Values{
127 "csrf": {csrfOf(t, preview)}, "title": {"Onderwerp"}, "description": {"**vet** <script>alert(1)</script>"},
128 "source": {"topic"}, "target": {"master"}, "draft": {"1"},
129 }))
130 if !strings.Contains(page, "Draft") || !strings.Contains(page, "This merge request is a draft.") || !strings.Contains(page, "<strong>vet</strong>") || strings.Contains(page, "<script>") {
131 t.Fatalf("concept:\n%s", page)
132 }
133 if !strings.Contains(page, "disabled") {
134 t.Fatalf("concept hoort mergen te blokkeren:\n%s", page)
135 }
136 if !strings.Contains(page, "mr.overview") && !strings.Contains(page, "Overview") {
137 t.Fatalf("tabs:\n%s", page)
138 }
139 if !strings.Contains(page, "opened this merge request") {
140 t.Fatalf("tijdlijn:\n%s", page)
141 }
142
143 branches := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/branches"))
144 if !strings.Contains(branches, "/-/merge-requests/1") {
145 t.Fatalf("mr-link:\n%s", branches)
146 }
147
148 writeFile(t, filepath.Join(work, "hello.txt"), "gamma\n")
149 git(t, work, "add", "hello.txt")
150 git(t, work, "commit", "-m", "tweede-stap")
151 git(t, work, "push", "origin", "topic")
152 page = read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1"))
153 if !strings.Contains(page, "tweede-stap") || !strings.Contains(page, "pushed") {
154 t.Fatalf("push ververst de tijdlijn niet:\n%s", page)
155 }
156 changes := read(t, mustGet(t, tim, ts.URL+"/tim/takken/-/merge-requests/1?tab=changes"))
157 if !strings.Contains(changes, "hello.txt") || !strings.Contains(changes, `class="gutter"`) {
158 t.Fatalf("wijzigingen:\n%s", changes)
159 }
160
161 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{
162 "csrf": {csrfOf(t, page)}, "body": {"eerste reactie"},
163 }))
164 noteID := between(page, `data-reply="`, `"`)
165 if noteID == "" || !strings.Contains(page, "eerste reactie") {
166 t.Fatalf("reactie:\n%s", page)
167 }
168 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1/notes", url.Values{
169 "csrf": {csrfOf(t, page)}, "parent": {noteID}, "body": {"**antwoord**"},
170 }))
171 if !strings.Contains(page, "<strong>antwoord</strong>") {
172 t.Fatalf("antwoord:\n%s", page)
173 }
174 page = read(t, mustPost(t, tim, ts.URL+"/tim/takken/-/merge-requests/1", url.Values{
175 "csrf": {csrfOf(t, page)}, "title": {"Nieuwe titel"}, "description": {"**vet**"}, "labels": {"bug, docs"},
176 }))
177 if !strings.Contains(page, "Nieuwe titel") || !strings.Contains(page, "changed the title") || !strings.Contains(page, "bug") {
178 t.Fatalf("bewerken:\n%s", page)
179 }
180}
181
182func mustPost(t *testing.T, c *http.Client, raw string, form url.Values) *http.Response {
183 t.Helper()
184 res, err := c.PostForm(raw, form)
185 if err != nil {
186 t.Fatal(err)
187 }
188 return res
189}
internal/server/branches.go added +175 −0
@@ -0,0 +1,175 @@
1 package server
2
3 import (
4 "net/http"
5 "sort"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/store"
12 )
13
14 func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
15 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
16 if !ok {
17 return
18 }
19 v := s.repoView(w, r, repo, role, "title.branches")
20 v.Page = "branches"
21 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
22 tips, _ := gitrepo.BranchTips(r.Context(), s.Git, dir)
23 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
24 for _, tip := range tips {
25 row := BranchRow{
26 Name: tip.Name, SHA: tip.SHA, Short: shortSHA(tip.SHA),
27 Subject: tip.Subject, When: tip.Date,
28 Protected: access.BranchProtected(patterns, tip.Name),
29 Default: tip.Name == repo.DefaultBranch,
30 }
31 if !row.Default && repo.DefaultBranch != "" {
32 ahead, behind, err := gitrepo.AheadBehind(r.Context(), s.Git, dir, repo.DefaultBranch, tip.Name)
33 if err == nil {
34 row.Ahead, row.Behind = ahead, behind
35 }
36 }
37 if p, err := s.Store.LatestPipelineByCommit(r.Context(), repo.ID, tip.SHA); err == nil {
38 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
39 row.PipeID = p.ID
40 row.PipeStatus = displayStatus(p.Status, jobs)
41 row.PipeLabel = s.tr(r, "pipe."+row.PipeStatus)
42 }
43 if mrs, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, tip.Name); err == nil && len(mrs) > 0 {
44 row.MRNumber = mrs[0].Number
45 }
46 v.Branches = append(v.Branches, row)
47 }
48 sort.Slice(v.Branches, func(i, j int) bool {
49 if v.Branches[i].Default != v.Branches[j].Default {
50 return v.Branches[i].Default
51 }
52 return v.Branches[i].Name < v.Branches[j].Name
53 })
54 tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
55 for _, name := range tags {
56 v.Tags = append(v.Tags, TagRow{Name: name})
57 }
58 s.render(w, "branches", v)
59 }
60
61 func (s *Server) createBranch(w http.ResponseWriter, r *http.Request) {
62 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
63 if !ok || !s.csrfOK(w, r) {
64 return
65 }
66 back := repoURL(repo) + "/-/branches"
67 if !role.CanWriteCode() {
68 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
69 return
70 }
71 name := strings.TrimSpace(r.FormValue("name"))
72 if err := names.ValidBranch(name); err != nil {
73 s.redirect(w, r, back, "", s.trErr(r, err))
74 return
75 }
76 from := safeRev(r.FormValue("from"), repo.DefaultBranch)
77 if from == "" {
78 s.redirect(w, r, back, "", s.tr(r, "err.branches"))
79 return
80 }
81 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
82 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) != "" {
83 s.redirect(w, r, back, "", s.tr(r, "err.branchName", name))
84 return
85 }
86 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
87 return gitrepo.CreateBranch(r.Context(), s.Git, dir, name, from)
88 }); err != nil {
89 s.redirect(w, r, back, "", s.commitProblem(r, err))
90 return
91 }
92 s.redirect(w, r, back, s.tr(r, "flash.branchCreated"), "")
93 }
94
95 func (s *Server) deleteBranch(w http.ResponseWriter, r *http.Request) {
96 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
97 if !ok || !s.csrfOK(w, r) {
98 return
99 }
100 back := repoURL(repo) + "/-/branches"
101 if !role.CanWriteCode() {
102 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
103 return
104 }
105 name := strings.TrimSpace(r.FormValue("name"))
106 if r.FormValue("confirm") != name || name == "" {
107 s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))
108 return
109 }
110 if locked, text := s.branchLocked(r, repo, name); locked {
111 s.redirect(w, r, back, "", text)
112 return
113 }
114 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
115 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
116 return gitrepo.DeleteBranch(r.Context(), s.Git, dir, name)
117 }); err != nil {
118 s.redirect(w, r, back, "", s.commitProblem(r, err))
119 return
120 }
121 s.redirect(w, r, back, s.tr(r, "flash.branchDeleted"), "")
122 }
123
124 func (s *Server) renameBranch(w http.ResponseWriter, r *http.Request) {
125 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
126 if !ok || !s.csrfOK(w, r) {
127 return
128 }
129 back := repoURL(repo) + "/-/branches"
130 if !role.CanWriteCode() {
131 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
132 return
133 }
134 name := strings.TrimSpace(r.FormValue("name"))
135 newName := strings.TrimSpace(r.FormValue("new_name"))
136 if r.FormValue("confirm") != name || name == "" {
137 s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))
138 return
139 }
140 if err := names.ValidBranch(newName); err != nil {
141 s.redirect(w, r, back, "", s.trErr(r, err))
142 return
143 }
144 if locked, text := s.branchLocked(r, repo, name); locked {
145 s.redirect(w, r, back, "", text)
146 return
147 }
148 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+newName) != "" {
150 s.redirect(w, r, back, "", s.tr(r, "err.branchName", newName))
151 return
152 }
153 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
154 if err := gitrepo.RenameBranch(r.Context(), s.Git, dir, name, newName); err != nil {
155 return err
156 }
157 return s.Store.RenameOpenMRBranches(r.Context(), repo.ID, name, newName)
158 }); err != nil {
159 s.redirect(w, r, back, "", s.commitProblem(r, err))
160 return
161 }
162 s.redirect(w, r, back, s.tr(r, "flash.branchRenamed"), "")
163 }
164
165 // branchLocked weigert de standaardbranch en elke beschermde branch, ook voor een beheerder.
166 func (s *Server) branchLocked(r *http.Request, repo store.Repo, name string) (bool, string) {
167 if name == repo.DefaultBranch {
168 return true, s.tr(r, "err.branchLocked", name)
169 }
170 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
171 if access.BranchProtected(patterns, name) {
172 return true, s.tr(r, "err.branchLocked", name)
173 }
174 return false, ""
175 }
@@ -0,0 +1,175 @@
1package server
2
3import (
4 "net/http"
5 "sort"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/access"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/names"
11 "gitlab.com/Timfa/bluegit/internal/store"
12)
13
14func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
15 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
16 if !ok {
17 return
18 }
19 v := s.repoView(w, r, repo, role, "title.branches")
20 v.Page = "branches"
21 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
22 tips, _ := gitrepo.BranchTips(r.Context(), s.Git, dir)
23 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
24 for _, tip := range tips {
25 row := BranchRow{
26 Name: tip.Name, SHA: tip.SHA, Short: shortSHA(tip.SHA),
27 Subject: tip.Subject, When: tip.Date,
28 Protected: access.BranchProtected(patterns, tip.Name),
29 Default: tip.Name == repo.DefaultBranch,
30 }
31 if !row.Default && repo.DefaultBranch != "" {
32 ahead, behind, err := gitrepo.AheadBehind(r.Context(), s.Git, dir, repo.DefaultBranch, tip.Name)
33 if err == nil {
34 row.Ahead, row.Behind = ahead, behind
35 }
36 }
37 if p, err := s.Store.LatestPipelineByCommit(r.Context(), repo.ID, tip.SHA); err == nil {
38 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
39 row.PipeID = p.ID
40 row.PipeStatus = displayStatus(p.Status, jobs)
41 row.PipeLabel = s.tr(r, "pipe."+row.PipeStatus)
42 }
43 if mrs, err := s.Store.OpenMergeRequestsBySource(r.Context(), repo.ID, tip.Name); err == nil && len(mrs) > 0 {
44 row.MRNumber = mrs[0].Number
45 }
46 v.Branches = append(v.Branches, row)
47 }
48 sort.Slice(v.Branches, func(i, j int) bool {
49 if v.Branches[i].Default != v.Branches[j].Default {
50 return v.Branches[i].Default
51 }
52 return v.Branches[i].Name < v.Branches[j].Name
53 })
54 tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
55 for _, name := range tags {
56 v.Tags = append(v.Tags, TagRow{Name: name})
57 }
58 s.render(w, "branches", v)
59}
60
61func (s *Server) createBranch(w http.ResponseWriter, r *http.Request) {
62 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
63 if !ok || !s.csrfOK(w, r) {
64 return
65 }
66 back := repoURL(repo) + "/-/branches"
67 if !role.CanWriteCode() {
68 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
69 return
70 }
71 name := strings.TrimSpace(r.FormValue("name"))
72 if err := names.ValidBranch(name); err != nil {
73 s.redirect(w, r, back, "", s.trErr(r, err))
74 return
75 }
76 from := safeRev(r.FormValue("from"), repo.DefaultBranch)
77 if from == "" {
78 s.redirect(w, r, back, "", s.tr(r, "err.branches"))
79 return
80 }
81 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
82 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+name) != "" {
83 s.redirect(w, r, back, "", s.tr(r, "err.branchName", name))
84 return
85 }
86 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
87 return gitrepo.CreateBranch(r.Context(), s.Git, dir, name, from)
88 }); err != nil {
89 s.redirect(w, r, back, "", s.commitProblem(r, err))
90 return
91 }
92 s.redirect(w, r, back, s.tr(r, "flash.branchCreated"), "")
93}
94
95func (s *Server) deleteBranch(w http.ResponseWriter, r *http.Request) {
96 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
97 if !ok || !s.csrfOK(w, r) {
98 return
99 }
100 back := repoURL(repo) + "/-/branches"
101 if !role.CanWriteCode() {
102 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
103 return
104 }
105 name := strings.TrimSpace(r.FormValue("name"))
106 if r.FormValue("confirm") != name || name == "" {
107 s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))
108 return
109 }
110 if locked, text := s.branchLocked(r, repo, name); locked {
111 s.redirect(w, r, back, "", text)
112 return
113 }
114 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
115 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
116 return gitrepo.DeleteBranch(r.Context(), s.Git, dir, name)
117 }); err != nil {
118 s.redirect(w, r, back, "", s.commitProblem(r, err))
119 return
120 }
121 s.redirect(w, r, back, s.tr(r, "flash.branchDeleted"), "")
122}
123
124func (s *Server) renameBranch(w http.ResponseWriter, r *http.Request) {
125 u, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
126 if !ok || !s.csrfOK(w, r) {
127 return
128 }
129 back := repoURL(repo) + "/-/branches"
130 if !role.CanWriteCode() {
131 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
132 return
133 }
134 name := strings.TrimSpace(r.FormValue("name"))
135 newName := strings.TrimSpace(r.FormValue("new_name"))
136 if r.FormValue("confirm") != name || name == "" {
137 s.redirect(w, r, back, "", s.tr(r, "err.branchConfirm"))
138 return
139 }
140 if err := names.ValidBranch(newName); err != nil {
141 s.redirect(w, r, back, "", s.trErr(r, err))
142 return
143 }
144 if locked, text := s.branchLocked(r, repo, name); locked {
145 s.redirect(w, r, back, "", text)
146 return
147 }
148 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149 if gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "--quiet", "refs/heads/"+newName) != "" {
150 s.redirect(w, r, back, "", s.tr(r, "err.branchName", newName))
151 return
152 }
153 if err := s.postReceive(r.Context(), repo, u, dir, func() error {
154 if err := gitrepo.RenameBranch(r.Context(), s.Git, dir, name, newName); err != nil {
155 return err
156 }
157 return s.Store.RenameOpenMRBranches(r.Context(), repo.ID, name, newName)
158 }); err != nil {
159 s.redirect(w, r, back, "", s.commitProblem(r, err))
160 return
161 }
162 s.redirect(w, r, back, s.tr(r, "flash.branchRenamed"), "")
163}
164
165// branchLocked weigert de standaardbranch en elke beschermde branch, ook voor een beheerder.
166func (s *Server) branchLocked(r *http.Request, repo store.Repo, name string) (bool, string) {
167 if name == repo.DefaultBranch {
168 return true, s.tr(r, "err.branchLocked", name)
169 }
170 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
171 if access.BranchProtected(patterns, name) {
172 return true, s.tr(r, "err.branchLocked", name)
173 }
174 return false, ""
175}
internal/server/commit_page.go added +270 −0
@@ -0,0 +1,270 @@
1 package server
2
3 import (
4 "html"
5 "html/template"
6 "net/url"
7 "sort"
8 "strconv"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/highlight"
13 )
14
15 // largeChange is het aantal toegevoegde en verwijderde regels waarna een diff dicht blijft.
16 const largeChange = 200
17
18 // CommitDiff is de diff van één commit.
19 type CommitDiff struct {
20 Parents []ParentSHA
21 Files []CommitFile
22 Tree []CommitTreeRow
23 Added, Deleted, FilesN int
24 }
25
26 // ParentSHA is een parent van de commit.
27 type ParentSHA struct {
28 SHA, Short string
29 }
30
31 // CommitFile is één gewijzigd bestand, in unified en side-by-side vorm.
32 type CommitFile struct {
33 Path, OldPath, Status, Anchor, FileURL string
34 Added, Deleted int
35 Binary, Collapsed, HasBody bool
36 Lines []CommitLine
37 Pairs []CommitPair
38 }
39
40 // CommitLine is één unified diffregel. HTML is al geëscaped.
41 type CommitLine struct {
42 Kind string
43 Old int
44 New int
45 HTML template.HTML
46 Notes []NoteRow
47 }
48
49 // CommitPair is één rij in de naast-elkaar-weergave.
50 type CommitPair struct {
51 Hunk string
52 LKind, RKind string
53 LNo, RNo int
54 LHTML, RHTML template.HTML
55 }
56
57 // CommitTreeRow is een map of bestand in de boom.
58 type CommitTreeRow struct {
59 Name, Path, Anchor, Status, Icon string
60 Dir bool
61 Depth, Added, Deleted int
62 }
63
64 func presentCommitDiff(repoPath, sha string, parents []string, files []gitrepo.PatchFile) *CommitDiff {
65 d := &CommitDiff{}
66 for _, p := range parents {
67 if !safeSHA(p) {
68 continue
69 }
70 d.Parents = append(d.Parents, ParentSHA{SHA: p, Short: shortSHA(p)})
71 }
72 parent := ""
73 if len(d.Parents) > 0 {
74 parent = d.Parents[0].SHA
75 }
76 seen := map[string]int{}
77 for _, f := range files {
78 if f.Path == "" {
79 continue
80 }
81 cf := CommitFile{
82 Path: f.Path, OldPath: f.OldPath, Status: f.Status,
83 Added: f.Added, Deleted: f.Deleted, Binary: f.Binary,
84 Anchor: diffAnchor(f.Path, seen),
85 Collapsed: !f.Binary && f.Added+f.Deleted > largeChange,
86 }
87 linkPath := f.Path
88 linkRev := sha
89 if f.Status == "deleted" {
90 linkPath = f.Path
91 linkRev = parent
92 }
93 if linkRev != "" {
94 cf.FileURL = blobLink(repoPath, linkRev, linkPath)
95 }
96 if f.Binary || len(f.Lines) > 0 {
97 cf.HasBody = true
98 }
99 if !f.Binary && len(f.Lines) > 0 {
100 name := f.Path
101 if f.Status == "deleted" {
102 name = f.Path
103 }
104 painter := highlight.NewPainter(name)
105 for _, ln := range f.Lines {
106 row := CommitLine{Kind: ln.Kind, Old: ln.Old, New: ln.New}
107 if ln.Kind == "hunk" {
108 row.HTML = template.HTML(html.EscapeString(ln.Text))
109 } else {
110 row.HTML = template.HTML(painter.Line(ln.Text))
111 }
112 cf.Lines = append(cf.Lines, row)
113 }
114 cf.Pairs = pairDiff(cf.Lines)
115 }
116 d.Added += cf.Added
117 d.Deleted += cf.Deleted
118 d.Files = append(d.Files, cf)
119 }
120 d.FilesN = len(d.Files)
121 d.Tree = commitTree(d.Files)
122 return d
123 }
124
125 func pairDiff(lines []CommitLine) []CommitPair {
126 var out []CommitPair
127 for i := 0; i < len(lines); {
128 ln := lines[i]
129 if ln.Kind == "hunk" {
130 out = append(out, CommitPair{Hunk: html.UnescapeString(string(ln.HTML))})
131 i++
132 continue
133 }
134 if ln.Kind == "ctx" {
135 out = append(out, CommitPair{
136 LKind: "ctx", RKind: "ctx", LNo: ln.Old, RNo: ln.New, LHTML: ln.HTML, RHTML: ln.HTML,
137 })
138 i++
139 continue
140 }
141 var dels, adds []CommitLine
142 for i < len(lines) && lines[i].Kind == "del" {
143 dels = append(dels, lines[i])
144 i++
145 }
146 for i < len(lines) && lines[i].Kind == "add" {
147 adds = append(adds, lines[i])
148 i++
149 }
150 n := len(dels)
151 if len(adds) > n {
152 n = len(adds)
153 }
154 for k := 0; k < n; k++ {
155 p := CommitPair{}
156 if k < len(dels) {
157 p.LKind = "del"
158 p.LNo = dels[k].Old
159 p.LHTML = dels[k].HTML
160 }
161 if k < len(adds) {
162 p.RKind = "add"
163 p.RNo = adds[k].New
164 p.RHTML = adds[k].HTML
165 }
166 out = append(out, p)
167 }
168 }
169 return out
170 }
171
172 func diffAnchor(path string, seen map[string]int) string {
173 var b strings.Builder
174 b.WriteString("diff-")
175 for _, r := range path {
176 switch {
177 case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9', r == '-', r == '_':
178 b.WriteRune(r)
179 default:
180 b.WriteByte('-')
181 }
182 }
183 base := b.String()
184 n := seen[base]
185 seen[base]++
186 if n == 0 {
187 return base
188 }
189 return base + "-" + strconv.Itoa(n)
190 }
191
192 func blobLink(repoPath, rev, path string) string {
193 parts := strings.Split(path, "/")
194 for i, p := range parts {
195 parts[i] = url.PathEscape(p)
196 }
197 return "/" + repoPath + "/-/blob/" + strings.Join(parts, "/") + "?rev=" + url.QueryEscape(rev)
198 }
199
200 func commitTree(files []CommitFile) []CommitTreeRow {
201 root := &treeNode{kids: map[string]*treeNode{}}
202 for i := range files {
203 f := &files[i]
204 parts := strings.Split(f.Path, "/")
205 cur := root
206 acc := ""
207 for j, part := range parts {
208 if acc == "" {
209 acc = part
210 } else {
211 acc += "/" + part
212 }
213 n := cur.kids[part]
214 if n == nil {
215 n = &treeNode{name: part, path: acc, kids: map[string]*treeNode{}}
216 cur.kids[part] = n
217 cur.order = append(cur.order, part)
218 }
219 if j == len(parts)-1 {
220 n.file = f
221 } else {
222 n.dir = true
223 }
224 cur = n
225 }
226 }
227 var rows []CommitTreeRow
228 var walk func(n *treeNode, depth int)
229 walk = func(n *treeNode, depth int) {
230 names := append([]string(nil), n.order...)
231 sort.Slice(names, func(i, j int) bool {
232 a, b := n.kids[names[i]], n.kids[names[j]]
233 aDir := a.dir && a.file == nil
234 bDir := b.dir && b.file == nil
235 if aDir != bDir {
236 return aDir
237 }
238 return strings.ToLower(a.name) < strings.ToLower(b.name)
239 })
240 for _, name := range names {
241 child := n.kids[name]
242 shown := depth
243 if shown > 8 {
244 shown = 8
245 }
246 if child.dir && child.file == nil {
247 rows = append(rows, CommitTreeRow{
248 Name: child.name, Path: child.path, Dir: true, Depth: shown, Icon: "dir",
249 })
250 walk(child, depth+1)
251 continue
252 }
253 f := child.file
254 rows = append(rows, CommitTreeRow{
255 Name: child.name, Path: f.Path, Anchor: f.Anchor, Status: f.Status,
256 Depth: shown, Added: f.Added, Deleted: f.Deleted, Icon: fileIcon(child.name, "blob"),
257 })
258 }
259 }
260 walk(root, 0)
261 return rows
262 }
263
264 type treeNode struct {
265 name, path string
266 dir bool
267 file *CommitFile
268 kids map[string]*treeNode
269 order []string
270 }
@@ -0,0 +1,270 @@
1package server
2
3import (
4 "html"
5 "html/template"
6 "net/url"
7 "sort"
8 "strconv"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
12 "gitlab.com/Timfa/bluegit/internal/highlight"
13)
14
15// largeChange is het aantal toegevoegde en verwijderde regels waarna een diff dicht blijft.
16const largeChange = 200
17
18// CommitDiff is de diff van één commit.
19type CommitDiff struct {
20 Parents []ParentSHA
21 Files []CommitFile
22 Tree []CommitTreeRow
23 Added, Deleted, FilesN int
24}
25
26// ParentSHA is een parent van de commit.
27type ParentSHA struct {
28 SHA, Short string
29}
30
31// CommitFile is één gewijzigd bestand, in unified en side-by-side vorm.
32type CommitFile struct {
33 Path, OldPath, Status, Anchor, FileURL string
34 Added, Deleted int
35 Binary, Collapsed, HasBody bool
36 Lines []CommitLine
37 Pairs []CommitPair
38}
39
40// CommitLine is één unified diffregel. HTML is al geëscaped.
41type CommitLine struct {
42 Kind string
43 Old int
44 New int
45 HTML template.HTML
46 Notes []NoteRow
47}
48
49// CommitPair is één rij in de naast-elkaar-weergave.
50type CommitPair struct {
51 Hunk string
52 LKind, RKind string
53 LNo, RNo int
54 LHTML, RHTML template.HTML
55}
56
57// CommitTreeRow is een map of bestand in de boom.
58type CommitTreeRow struct {
59 Name, Path, Anchor, Status, Icon string
60 Dir bool
61 Depth, Added, Deleted int
62}
63
64func presentCommitDiff(repoPath, sha string, parents []string, files []gitrepo.PatchFile) *CommitDiff {
65 d := &CommitDiff{}
66 for _, p := range parents {
67 if !safeSHA(p) {
68 continue
69 }
70 d.Parents = append(d.Parents, ParentSHA{SHA: p, Short: shortSHA(p)})
71 }
72 parent := ""
73 if len(d.Parents) > 0 {
74 parent = d.Parents[0].SHA
75 }
76 seen := map[string]int{}
77 for _, f := range files {
78 if f.Path == "" {
79 continue
80 }
81 cf := CommitFile{
82 Path: f.Path, OldPath: f.OldPath, Status: f.Status,
83 Added: f.Added, Deleted: f.Deleted, Binary: f.Binary,
84 Anchor: diffAnchor(f.Path, seen),
85 Collapsed: !f.Binary && f.Added+f.Deleted > largeChange,
86 }
87 linkPath := f.Path
88 linkRev := sha
89 if f.Status == "deleted" {
90 linkPath = f.Path
91 linkRev = parent
92 }
93 if linkRev != "" {
94 cf.FileURL = blobLink(repoPath, linkRev, linkPath)
95 }
96 if f.Binary || len(f.Lines) > 0 {
97 cf.HasBody = true
98 }
99 if !f.Binary && len(f.Lines) > 0 {
100 name := f.Path
101 if f.Status == "deleted" {
102 name = f.Path
103 }
104 painter := highlight.NewPainter(name)
105 for _, ln := range f.Lines {
106 row := CommitLine{Kind: ln.Kind, Old: ln.Old, New: ln.New}
107 if ln.Kind == "hunk" {
108 row.HTML = template.HTML(html.EscapeString(ln.Text))
109 } else {
110 row.HTML = template.HTML(painter.Line(ln.Text))
111 }
112 cf.Lines = append(cf.Lines, row)
113 }
114 cf.Pairs = pairDiff(cf.Lines)
115 }
116 d.Added += cf.Added
117 d.Deleted += cf.Deleted
118 d.Files = append(d.Files, cf)
119 }
120 d.FilesN = len(d.Files)
121 d.Tree = commitTree(d.Files)
122 return d
123}
124
125func pairDiff(lines []CommitLine) []CommitPair {
126 var out []CommitPair
127 for i := 0; i < len(lines); {
128 ln := lines[i]
129 if ln.Kind == "hunk" {
130 out = append(out, CommitPair{Hunk: html.UnescapeString(string(ln.HTML))})
131 i++
132 continue
133 }
134 if ln.Kind == "ctx" {
135 out = append(out, CommitPair{
136 LKind: "ctx", RKind: "ctx", LNo: ln.Old, RNo: ln.New, LHTML: ln.HTML, RHTML: ln.HTML,
137 })
138 i++
139 continue
140 }
141 var dels, adds []CommitLine
142 for i < len(lines) && lines[i].Kind == "del" {
143 dels = append(dels, lines[i])
144 i++
145 }
146 for i < len(lines) && lines[i].Kind == "add" {
147 adds = append(adds, lines[i])
148 i++
149 }
150 n := len(dels)
151 if len(adds) > n {
152 n = len(adds)
153 }
154 for k := 0; k < n; k++ {
155 p := CommitPair{}
156 if k < len(dels) {
157 p.LKind = "del"
158 p.LNo = dels[k].Old
159 p.LHTML = dels[k].HTML
160 }
161 if k < len(adds) {
162 p.RKind = "add"
163 p.RNo = adds[k].New
164 p.RHTML = adds[k].HTML
165 }
166 out = append(out, p)
167 }
168 }
169 return out
170}
171
172func diffAnchor(path string, seen map[string]int) string {
173 var b strings.Builder
174 b.WriteString("diff-")
175 for _, r := range path {
176 switch {
177 case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9', r == '-', r == '_':
178 b.WriteRune(r)
179 default:
180 b.WriteByte('-')
181 }
182 }
183 base := b.String()
184 n := seen[base]
185 seen[base]++
186 if n == 0 {
187 return base
188 }
189 return base + "-" + strconv.Itoa(n)
190}
191
192func blobLink(repoPath, rev, path string) string {
193 parts := strings.Split(path, "/")
194 for i, p := range parts {
195 parts[i] = url.PathEscape(p)
196 }
197 return "/" + repoPath + "/-/blob/" + strings.Join(parts, "/") + "?rev=" + url.QueryEscape(rev)
198}
199
200func commitTree(files []CommitFile) []CommitTreeRow {
201 root := &treeNode{kids: map[string]*treeNode{}}
202 for i := range files {
203 f := &files[i]
204 parts := strings.Split(f.Path, "/")
205 cur := root
206 acc := ""
207 for j, part := range parts {
208 if acc == "" {
209 acc = part
210 } else {
211 acc += "/" + part
212 }
213 n := cur.kids[part]
214 if n == nil {
215 n = &treeNode{name: part, path: acc, kids: map[string]*treeNode{}}
216 cur.kids[part] = n
217 cur.order = append(cur.order, part)
218 }
219 if j == len(parts)-1 {
220 n.file = f
221 } else {
222 n.dir = true
223 }
224 cur = n
225 }
226 }
227 var rows []CommitTreeRow
228 var walk func(n *treeNode, depth int)
229 walk = func(n *treeNode, depth int) {
230 names := append([]string(nil), n.order...)
231 sort.Slice(names, func(i, j int) bool {
232 a, b := n.kids[names[i]], n.kids[names[j]]
233 aDir := a.dir && a.file == nil
234 bDir := b.dir && b.file == nil
235 if aDir != bDir {
236 return aDir
237 }
238 return strings.ToLower(a.name) < strings.ToLower(b.name)
239 })
240 for _, name := range names {
241 child := n.kids[name]
242 shown := depth
243 if shown > 8 {
244 shown = 8
245 }
246 if child.dir && child.file == nil {
247 rows = append(rows, CommitTreeRow{
248 Name: child.name, Path: child.path, Dir: true, Depth: shown, Icon: "dir",
249 })
250 walk(child, depth+1)
251 continue
252 }
253 f := child.file
254 rows = append(rows, CommitTreeRow{
255 Name: child.name, Path: f.Path, Anchor: f.Anchor, Status: f.Status,
256 Depth: shown, Added: f.Added, Deleted: f.Deleted, Icon: fileIcon(child.name, "blob"),
257 })
258 }
259 }
260 walk(root, 0)
261 return rows
262}
263
264type treeNode struct {
265 name, path string
266 dir bool
267 file *CommitFile
268 kids map[string]*treeNode
269 order []string
270}
internal/server/commit_page_test.go added +284 −0
@@ -0,0 +1,284 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os"
10 "os/exec"
11 "path/filepath"
12 "strings"
13 "testing"
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 TestPresentCommitTree(t *testing.T) {
22 files := []gitrepo.PatchFile{
23 {Status: "added", Path: "src/util.go", Added: 2, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "func util() {}"}}},
24 {Status: "renamed", Path: "a2.txt", OldPath: "a.txt"},
25 {Status: "added", Path: "huge.txt", Added: largeChange + 1, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "x"}}},
26 }
27 d := presentCommitDiff("tim/demo", "abcdef1234567890", []string{"1234abcd1234abcd1234abcd1234abcd1234abcd"}, files)
28 if d.FilesN != 3 || len(d.Parents) != 1 || d.Parents[0].Short != "1234abcd" {
29 t.Fatalf("kop: %+v", d)
30 }
31 if !d.Files[2].Collapsed || d.Files[0].Collapsed {
32 t.Fatalf("inklappen: util %v huge %v", d.Files[0].Collapsed, d.Files[2].Collapsed)
33 }
34 if !strings.Contains(string(d.Files[0].Lines[0].HTML), "hl-k") {
35 t.Fatalf("geen highlight: %s", d.Files[0].Lines[0].HTML)
36 }
37 if d.Files[0].Pairs[0].RKind != "add" || d.Files[0].Pairs[0].RNo != 1 || d.Files[0].Pairs[0].LKind != "" {
38 t.Fatalf("paar: %+v", d.Files[0].Pairs)
39 }
40 var dirs, nested bool
41 for _, row := range d.Tree {
42 if row.Dir && row.Name == "src" && row.Depth == 0 {
43 dirs = true
44 }
45 if row.Name == "util.go" && row.Depth == 1 && row.Anchor != "" {
46 nested = true
47 }
48 }
49 if !dirs || !nested {
50 t.Fatalf("boom: %+v", d.Tree)
51 }
52 if !strings.Contains(d.Files[0].FileURL, "/tim/demo/-/blob/src/util.go?rev=abcdef1234567890") {
53 t.Fatal(d.Files[0].FileURL)
54 }
55 }
56
57 func TestCommitDetailPage(t *testing.T) {
58 if _, err := exec.LookPath("git"); err != nil {
59 t.Skip("git ontbreekt")
60 }
61 storage := t.TempDir()
62 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
63 if err != nil {
64 t.Fatal(err)
65 }
66 t.Cleanup(func() { _ = st.Close() })
67 cfg := config.Config{
68 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
69 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
70 Git: config.Git{Binary: "git", DefaultBranch: "master"},
71 }
72 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
73 ts := httptest.NewServer(srv.Handler())
74 t.Cleanup(ts.Close)
75 jar, _ := cookiejar.New(nil)
76 client := &http.Client{Jar: jar}
77 res, err := client.Get(ts.URL + "/login")
78 if err != nil {
79 t.Fatal(err)
80 }
81 page := read(t, res)
82 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
83 "csrf": {csrfOf(t, page)}, "name": {"diffdemo"}, "visibility": {"public"},
84 })
85 if err != nil {
86 t.Fatal(err)
87 }
88 page = read(t, res)
89 res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
90 if err != nil {
91 t.Fatal(err)
92 }
93 token := between(read(t, res), `<p class="code">`, "</p>")
94 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/diffdemo.git"
95 work := t.TempDir()
96 git(t, work, "init", "-b", "master")
97 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
98 git(t, work, "config", "user.name", "tim")
99 git(t, work, "config", "commit.gpgsign", "false")
100 writeFile(t, filepath.Join(work, "a.txt"), "alpha\n")
101 writeFile(t, filepath.Join(work, "b.txt"), "beta\n")
102 writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\n")
103 git(t, work, "add", ".")
104 git(t, work, "commit", "-m", "begin")
105 root := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
106 writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\nfunc extra() {}\n")
107 if err := os.Remove(filepath.Join(work, "b.txt")); err != nil {
108 t.Fatal(err)
109 }
110 writeFile(t, filepath.Join(work, "c.txt"), strings.Repeat("x", 180)+"\n")
111 writeFile(t, filepath.Join(work, "note file.txt"), "spatie\n")
112 writeFile(t, filepath.Join(work, "src", "util.go"), "package src\n\nfunc util() {}\n")
113 var huge strings.Builder
114 for i := 0; i < 220; i++ {
115 huge.WriteString("regel\n")
116 }
117 writeFile(t, filepath.Join(work, "huge.txt"), huge.String())
118 writeFile(t, filepath.Join(work, "bin.dat"), "a\x00b\n")
119 git(t, work, "add", "-A")
120 git(t, work, "mv", "a.txt", "a2.txt")
121 git(t, work, "commit", "-m", "wijzig bestanden", "-m", "tweede alinea")
122 mixed := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
123 git(t, work, "remote", "add", "origin", remote)
124 git(t, work, "push", "-u", "origin", "master")
125 git(t, work, "checkout", "-b", "side")
126 writeFile(t, filepath.Join(work, "side.txt"), "zijtak\n")
127 git(t, work, "add", "side.txt")
128 git(t, work, "commit", "-m", "zijtak")
129 git(t, work, "checkout", "master")
130 git(t, work, "merge", "--no-ff", "side", "-m", "voeg zijtak samen")
131 merge := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
132 git(t, work, "push", "origin", "master")
133
134 ctx := context.Background()
135 repo, err := st.RepoByPath(ctx, "tim", "diffdemo")
136 if err != nil {
137 t.Fatal(err)
138 }
139 pipeID, err := st.CreatePipeline(ctx, repo.ID, mixed, "refs/heads/master", "push", "tim", "wijzig bestanden", []store.NewJob{
140 {Name: "lint", Stage: "test", Script: "exit 0"},
141 })
142 if err != nil {
143 t.Fatal(err)
144 }
145 jobs, _ := st.JobsByPipeline(ctx, pipeID)
146 for _, j := range jobs {
147 if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
148 t.Fatal(err)
149 }
150 }
151 if status, err := st.RefreshPipelineStatus(ctx, pipeID); err != nil || status != "success" {
152 t.Fatalf("pipeline: %s %v", status, err)
153 }
154
155 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
156 if err != nil {
157 t.Fatal(err)
158 }
159 body := read(t, res)
160 for _, want := range []string{
161 "wijzig bestanden", "tweede alinea", "Authored",
162 `data-copy="` + mixed + `"`,
163 "/tim/diffdemo/-/commit/" + root,
164 "Parent",
165 `class="status passed"`, "Passed",
166 "a.txt", "a2.txt", "renamed",
167 "b.txt", "deleted",
168 "note file.txt", "added",
169 "Binary file", "The contents of this binary file are not shown.",
170 `data-path="huge.txt"`, `data-collapsed="1"`, "Show diff",
171 `data-path="keep.go"`, `data-collapsed="0"`, "Hide diff",
172 "hl-k", "func", "src", "util.go",
173 `data-diff-mode="side"`, "Side-by-side",
174 "/assets/commit-mode.js", `class="d1"`,
175 strings.Repeat("x", 180),
176 "Changed files",
177 } {
178 if !strings.Contains(body, want) {
179 t.Errorf("pagina mist %q", want)
180 }
181 }
182 if strings.Contains(body, "commit.show") {
183 t.Fatal("vertaling ontbreekt")
184 }
185 keep := section(body, `data-path="keep.go"`)
186 if !strings.Contains(keep, `class="ln">1</span>`) || !strings.Contains(keep, "kind-add") || !strings.Contains(keep, "extra") || !strings.Contains(keep, "hl-k") {
187 i := strings.Index(body, `data-path="keep.go"`)
188 j := strings.Index(body[i:], "</section>")
189 k := strings.Index(body[i:], "kind-add")
190 t.Fatalf("keep.go mist delen ln=%v add=%v extra=%v hl=%v section-op=%d add-op=%d keep-len=%d",
191 strings.Contains(keep, `class="ln">1</span>`), strings.Contains(keep, "kind-add"),
192 strings.Contains(keep, "extra"), strings.Contains(keep, "hl-k"), j, k, len(keep))
193 }
194 gone := section(body, `data-path="b.txt"`)
195 if !strings.Contains(gone, "kind-del") || !strings.Contains(gone, `class="ln">1</span>`) {
196 t.Fatal("b.txt mist het verwijderde regelnummer")
197 }
198
199 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + merge)
200 if err != nil {
201 t.Fatal(err)
202 }
203 mergePage := read(t, res)
204 if !strings.Contains(mergePage, "Parents") || !strings.Contains(mergePage, "/tim/diffdemo/-/commit/"+mixed) || !strings.Contains(mergePage, `data-path="side.txt"`) {
205 t.Fatal("mergepagina mist parents of side.txt")
206 }
207 if strings.Contains(mergePage, `data-path="huge.txt"`) || strings.Contains(mergePage, `data-path="keep.go"`) {
208 t.Fatal("merge-diff toont meer dan de eerste parent")
209 }
210
211 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + root)
212 if err != nil {
213 t.Fatal(err)
214 }
215 rootPage := read(t, res)
216 if strings.Contains(rootPage, "Parent") || !strings.Contains(rootPage, `data-path="a.txt"`) || !strings.Contains(rootPage, "added") {
217 t.Fatal("rootcommit klopt niet")
218 }
219
220 res, err = client.Get(ts.URL + "/settings")
221 if err != nil {
222 t.Fatal(err)
223 }
224 settings := read(t, res)
225 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"nl"}})
226 if err != nil {
227 t.Fatal(err)
228 }
229 _ = read(t, res)
230 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
231 if err != nil {
232 t.Fatal(err)
233 }
234 nl := read(t, res)
235 for _, want := range []string{"Toon diff", "hernoemd", "Bovenliggende commit", "Naast elkaar", "Gewijzigde bestanden", "Binair bestand"} {
236 if !strings.Contains(nl, want) {
237 t.Errorf("Nederlands mist %q", want)
238 }
239 }
240 if strings.Contains(nl, "Show diff") {
241 t.Fatal("Engelse diffknop bleef staan")
242 }
243
244 res, err = client.Get(ts.URL + "/settings")
245 if err != nil {
246 t.Fatal(err)
247 }
248 settings = read(t, res)
249 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"cuneiform"}})
250 if err != nil {
251 t.Fatal(err)
252 }
253 _ = read(t, res)
254 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
255 if err != nil {
256 t.Fatal(err)
257 }
258 signs := read(t, res)
259 if strings.Contains(signs, "Show diff") || strings.Contains(signs, "Toon diff") || !strings.Contains(signs, mixed) || !strings.Contains(signs, "𒀀") {
260 t.Fatal("spijkerschrift of hash klopt niet")
261 }
262 }
263
264 func gitOutOK(t *testing.T, dir string, args ...string) string {
265 t.Helper()
266 out, err := gitOut(dir, args...)
267 if err != nil {
268 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
269 }
270 return out
271 }
272
273 func section(body, marker string) string {
274 i := strings.Index(body, marker)
275 if i < 0 {
276 return ""
277 }
278 rest := body[i:]
279 j := strings.Index(rest, "</section>")
280 if j < 0 {
281 return rest
282 }
283 return rest[:j]
284 }
@@ -0,0 +1,284 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os"
10 "os/exec"
11 "path/filepath"
12 "strings"
13 "testing"
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 TestPresentCommitTree(t *testing.T) {
22 files := []gitrepo.PatchFile{
23 {Status: "added", Path: "src/util.go", Added: 2, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "func util() {}"}}},
24 {Status: "renamed", Path: "a2.txt", OldPath: "a.txt"},
25 {Status: "added", Path: "huge.txt", Added: largeChange + 1, Lines: []gitrepo.DiffLine{{Kind: "add", New: 1, Text: "x"}}},
26 }
27 d := presentCommitDiff("tim/demo", "abcdef1234567890", []string{"1234abcd1234abcd1234abcd1234abcd1234abcd"}, files)
28 if d.FilesN != 3 || len(d.Parents) != 1 || d.Parents[0].Short != "1234abcd" {
29 t.Fatalf("kop: %+v", d)
30 }
31 if !d.Files[2].Collapsed || d.Files[0].Collapsed {
32 t.Fatalf("inklappen: util %v huge %v", d.Files[0].Collapsed, d.Files[2].Collapsed)
33 }
34 if !strings.Contains(string(d.Files[0].Lines[0].HTML), "hl-k") {
35 t.Fatalf("geen highlight: %s", d.Files[0].Lines[0].HTML)
36 }
37 if d.Files[0].Pairs[0].RKind != "add" || d.Files[0].Pairs[0].RNo != 1 || d.Files[0].Pairs[0].LKind != "" {
38 t.Fatalf("paar: %+v", d.Files[0].Pairs)
39 }
40 var dirs, nested bool
41 for _, row := range d.Tree {
42 if row.Dir && row.Name == "src" && row.Depth == 0 {
43 dirs = true
44 }
45 if row.Name == "util.go" && row.Depth == 1 && row.Anchor != "" {
46 nested = true
47 }
48 }
49 if !dirs || !nested {
50 t.Fatalf("boom: %+v", d.Tree)
51 }
52 if !strings.Contains(d.Files[0].FileURL, "/tim/demo/-/blob/src/util.go?rev=abcdef1234567890") {
53 t.Fatal(d.Files[0].FileURL)
54 }
55}
56
57func TestCommitDetailPage(t *testing.T) {
58 if _, err := exec.LookPath("git"); err != nil {
59 t.Skip("git ontbreekt")
60 }
61 storage := t.TempDir()
62 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
63 if err != nil {
64 t.Fatal(err)
65 }
66 t.Cleanup(func() { _ = st.Close() })
67 cfg := config.Config{
68 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
69 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
70 Git: config.Git{Binary: "git", DefaultBranch: "master"},
71 }
72 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
73 ts := httptest.NewServer(srv.Handler())
74 t.Cleanup(ts.Close)
75 jar, _ := cookiejar.New(nil)
76 client := &http.Client{Jar: jar}
77 res, err := client.Get(ts.URL + "/login")
78 if err != nil {
79 t.Fatal(err)
80 }
81 page := read(t, res)
82 res, err = client.PostForm(ts.URL+"/new/repo", url.Values{
83 "csrf": {csrfOf(t, page)}, "name": {"diffdemo"}, "visibility": {"public"},
84 })
85 if err != nil {
86 t.Fatal(err)
87 }
88 page = read(t, res)
89 res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
90 if err != nil {
91 t.Fatal(err)
92 }
93 token := between(read(t, res), `<p class="code">`, "</p>")
94 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/diffdemo.git"
95 work := t.TempDir()
96 git(t, work, "init", "-b", "master")
97 git(t, work, "config", "user.email", "tim@users.git.timfalken.com")
98 git(t, work, "config", "user.name", "tim")
99 git(t, work, "config", "commit.gpgsign", "false")
100 writeFile(t, filepath.Join(work, "a.txt"), "alpha\n")
101 writeFile(t, filepath.Join(work, "b.txt"), "beta\n")
102 writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\n")
103 git(t, work, "add", ".")
104 git(t, work, "commit", "-m", "begin")
105 root := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
106 writeFile(t, filepath.Join(work, "keep.go"), "package p\n\nfunc keep() {}\nfunc extra() {}\n")
107 if err := os.Remove(filepath.Join(work, "b.txt")); err != nil {
108 t.Fatal(err)
109 }
110 writeFile(t, filepath.Join(work, "c.txt"), strings.Repeat("x", 180)+"\n")
111 writeFile(t, filepath.Join(work, "note file.txt"), "spatie\n")
112 writeFile(t, filepath.Join(work, "src", "util.go"), "package src\n\nfunc util() {}\n")
113 var huge strings.Builder
114 for i := 0; i < 220; i++ {
115 huge.WriteString("regel\n")
116 }
117 writeFile(t, filepath.Join(work, "huge.txt"), huge.String())
118 writeFile(t, filepath.Join(work, "bin.dat"), "a\x00b\n")
119 git(t, work, "add", "-A")
120 git(t, work, "mv", "a.txt", "a2.txt")
121 git(t, work, "commit", "-m", "wijzig bestanden", "-m", "tweede alinea")
122 mixed := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
123 git(t, work, "remote", "add", "origin", remote)
124 git(t, work, "push", "-u", "origin", "master")
125 git(t, work, "checkout", "-b", "side")
126 writeFile(t, filepath.Join(work, "side.txt"), "zijtak\n")
127 git(t, work, "add", "side.txt")
128 git(t, work, "commit", "-m", "zijtak")
129 git(t, work, "checkout", "master")
130 git(t, work, "merge", "--no-ff", "side", "-m", "voeg zijtak samen")
131 merge := strings.TrimSpace(gitOutOK(t, work, "rev-parse", "HEAD"))
132 git(t, work, "push", "origin", "master")
133
134 ctx := context.Background()
135 repo, err := st.RepoByPath(ctx, "tim", "diffdemo")
136 if err != nil {
137 t.Fatal(err)
138 }
139 pipeID, err := st.CreatePipeline(ctx, repo.ID, mixed, "refs/heads/master", "push", "tim", "wijzig bestanden", []store.NewJob{
140 {Name: "lint", Stage: "test", Script: "exit 0"},
141 })
142 if err != nil {
143 t.Fatal(err)
144 }
145 jobs, _ := st.JobsByPipeline(ctx, pipeID)
146 for _, j := range jobs {
147 if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
148 t.Fatal(err)
149 }
150 }
151 if status, err := st.RefreshPipelineStatus(ctx, pipeID); err != nil || status != "success" {
152 t.Fatalf("pipeline: %s %v", status, err)
153 }
154
155 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
156 if err != nil {
157 t.Fatal(err)
158 }
159 body := read(t, res)
160 for _, want := range []string{
161 "wijzig bestanden", "tweede alinea", "Authored",
162 `data-copy="` + mixed + `"`,
163 "/tim/diffdemo/-/commit/" + root,
164 "Parent",
165 `class="status passed"`, "Passed",
166 "a.txt", "a2.txt", "renamed",
167 "b.txt", "deleted",
168 "note file.txt", "added",
169 "Binary file", "The contents of this binary file are not shown.",
170 `data-path="huge.txt"`, `data-collapsed="1"`, "Show diff",
171 `data-path="keep.go"`, `data-collapsed="0"`, "Hide diff",
172 "hl-k", "func", "src", "util.go",
173 `data-diff-mode="side"`, "Side-by-side",
174 "/assets/commit-mode.js", `class="d1"`,
175 strings.Repeat("x", 180),
176 "Changed files",
177 } {
178 if !strings.Contains(body, want) {
179 t.Errorf("pagina mist %q", want)
180 }
181 }
182 if strings.Contains(body, "commit.show") {
183 t.Fatal("vertaling ontbreekt")
184 }
185 keep := section(body, `data-path="keep.go"`)
186 if !strings.Contains(keep, `class="ln">1</span>`) || !strings.Contains(keep, "kind-add") || !strings.Contains(keep, "extra") || !strings.Contains(keep, "hl-k") {
187 i := strings.Index(body, `data-path="keep.go"`)
188 j := strings.Index(body[i:], "</section>")
189 k := strings.Index(body[i:], "kind-add")
190 t.Fatalf("keep.go mist delen ln=%v add=%v extra=%v hl=%v section-op=%d add-op=%d keep-len=%d",
191 strings.Contains(keep, `class="ln">1</span>`), strings.Contains(keep, "kind-add"),
192 strings.Contains(keep, "extra"), strings.Contains(keep, "hl-k"), j, k, len(keep))
193 }
194 gone := section(body, `data-path="b.txt"`)
195 if !strings.Contains(gone, "kind-del") || !strings.Contains(gone, `class="ln">1</span>`) {
196 t.Fatal("b.txt mist het verwijderde regelnummer")
197 }
198
199 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + merge)
200 if err != nil {
201 t.Fatal(err)
202 }
203 mergePage := read(t, res)
204 if !strings.Contains(mergePage, "Parents") || !strings.Contains(mergePage, "/tim/diffdemo/-/commit/"+mixed) || !strings.Contains(mergePage, `data-path="side.txt"`) {
205 t.Fatal("mergepagina mist parents of side.txt")
206 }
207 if strings.Contains(mergePage, `data-path="huge.txt"`) || strings.Contains(mergePage, `data-path="keep.go"`) {
208 t.Fatal("merge-diff toont meer dan de eerste parent")
209 }
210
211 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + root)
212 if err != nil {
213 t.Fatal(err)
214 }
215 rootPage := read(t, res)
216 if strings.Contains(rootPage, "Parent") || !strings.Contains(rootPage, `data-path="a.txt"`) || !strings.Contains(rootPage, "added") {
217 t.Fatal("rootcommit klopt niet")
218 }
219
220 res, err = client.Get(ts.URL + "/settings")
221 if err != nil {
222 t.Fatal(err)
223 }
224 settings := read(t, res)
225 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"nl"}})
226 if err != nil {
227 t.Fatal(err)
228 }
229 _ = read(t, res)
230 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
231 if err != nil {
232 t.Fatal(err)
233 }
234 nl := read(t, res)
235 for _, want := range []string{"Toon diff", "hernoemd", "Bovenliggende commit", "Naast elkaar", "Gewijzigde bestanden", "Binair bestand"} {
236 if !strings.Contains(nl, want) {
237 t.Errorf("Nederlands mist %q", want)
238 }
239 }
240 if strings.Contains(nl, "Show diff") {
241 t.Fatal("Engelse diffknop bleef staan")
242 }
243
244 res, err = client.Get(ts.URL + "/settings")
245 if err != nil {
246 t.Fatal(err)
247 }
248 settings = read(t, res)
249 res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"cuneiform"}})
250 if err != nil {
251 t.Fatal(err)
252 }
253 _ = read(t, res)
254 res, err = client.Get(ts.URL + "/tim/diffdemo/-/commit/" + mixed)
255 if err != nil {
256 t.Fatal(err)
257 }
258 signs := read(t, res)
259 if strings.Contains(signs, "Show diff") || strings.Contains(signs, "Toon diff") || !strings.Contains(signs, mixed) || !strings.Contains(signs, "𒀀") {
260 t.Fatal("spijkerschrift of hash klopt niet")
261 }
262}
263
264func gitOutOK(t *testing.T, dir string, args ...string) string {
265 t.Helper()
266 out, err := gitOut(dir, args...)
267 if err != nil {
268 t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
269 }
270 return out
271}
272
273func section(body, marker string) string {
274 i := strings.Index(body, marker)
275 if i < 0 {
276 return ""
277 }
278 rest := body[i:]
279 j := strings.Index(rest, "</section>")
280 if j < 0 {
281 return rest
282 }
283 return rest[:j]
284}
internal/server/events.go +1 −0
@@ -67,6 +67,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
67 67 s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
68 68 s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
69 69 s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])
70 s.recordMRPushes(repo, user, branch, before[ref], sha)
70 71 s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
71 72 s.pushHook(repo, actor, branch, commit)
72 73 }
@@ -67,6 +67,7 @@ func (s *Server) AfterPush(repo store.Repo, user store.User, before, after map[s
67 s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
67 s.recordPushContributions(repo, user, map[string]string{ref: before[ref]}, map[string]string{ref: sha})
68 s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
68 s.startPipeline(context.Background(), repo, commit, ref, actor, "push", before[ref], nil)
69 s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])
69 s.startMergeRequestPipelines(context.Background(), repo, commit, branch, actor, before[ref])
70 s.recordMRPushes(repo, user, branch, before[ref], sha)
70 s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
71 s.rerunMergeRequestsOnTarget(context.Background(), repo, branch, actor)
71 s.pushHook(repo, actor, branch, commit)
72 s.pushHook(repo, actor, branch, commit)
72 }
73 }
internal/server/mr_page.go added +318 −0
@@ -0,0 +1,318 @@
1 package server
2
3 import (
4 "context"
5 "html/template"
6 "net/http"
7 "sort"
8 "strconv"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/markdown"
15 "gitlab.com/Timfa/bluegit/internal/store"
16 )
17
18 func (s *Server) compare(w http.ResponseWriter, r *http.Request) {
19 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
20 if !ok {
21 return
22 }
23 v := s.repoView(w, r, repo, role, "branch.compare")
24 v.Title = s.tr(r, "branch.compare")
25 v.Page = "compare"
26 v.Wide = true
27 s.fillBranchChoices(r, &v, repo)
28 from := safeRev(r.URL.Query().Get("from"), repo.DefaultBranch)
29 to := safeRev(r.URL.Query().Get("to"), "")
30 s.fillCompare(r, &v, repo, from, to)
31 s.render(w, "compare", v)
32 }
33
34 func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
35 _, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
36 if !ok {
37 return
38 }
39 if !role.CanWriteCode() {
40 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
41 return
42 }
43 v := s.repoView(w, r, repo, role, "mr.create")
44 v.Title = s.tr(r, "mr.create")
45 v.Page = "newmr"
46 v.Wide = true
47 s.fillBranchChoices(r, &v, repo)
48 source := safeRev(r.URL.Query().Get("source"), "")
49 target := safeRev(r.URL.Query().Get("target"), repo.DefaultBranch)
50 if source == "" {
51 for _, b := range v.Branches {
52 if b.Name != target {
53 source = b.Name
54 break
55 }
56 }
57 }
58 s.fillCompare(r, &v, repo, target, source)
59 v.CompareFrom = source
60 v.CompareTo = target
61 s.render(w, "newmr", v)
62 }
63
64 func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
65 u, _, _, ok := s.guard(w, r, access.RoleReadonly)
66 if !ok || !s.csrfOK(w, r) {
67 return
68 }
69 if u.ID == 0 {
70 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
71 return
72 }
73 body := r.FormValue("body")
74 if len(body) > 20000 {
75 body = body[:20000]
76 }
77 w.Header().Set("Content-Type", "text/html; charset=utf-8")
78 _, _ = w.Write([]byte(markdown.Render(body, "", "")))
79 }
80
81 func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
82 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
83 if !ok || !s.csrfOK(w, r) {
84 return
85 }
86 mr, err := s.mrFromRequest(r, repo.ID)
87 if err != nil {
88 http.NotFound(w, r)
89 return
90 }
91 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
92 if mr.Status != "open" || u.ID == 0 || (u.ID != mr.AuthorID && !role.CanWriteCode()) {
93 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
94 return
95 }
96 title := strings.TrimSpace(r.FormValue("title"))
97 description := r.FormValue("description")
98 labels := normalizeLabels(r.FormValue("labels"))
99 if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, title, description, labels); err != nil {
100 s.redirect(w, r, back, "", s.trErr(r, err))
101 return
102 }
103 if title != mr.Title {
104 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "retitled", title)
105 }
106 if labels != normalizeLabels(mr.Labels) {
107 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "relabeled", labels)
108 }
109 s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "")
110 }
111
112 func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
113 v.DescHTML = template.HTML(markdown.Render(mr.Description, "", ""))
114 v.Labels = splitLabels(mr.Labels)
115 v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
116 switch r.URL.Query().Get("tab") {
117 case "commits", "pipelines", "changes":
118 v.Tab = r.URL.Query().Get("tab")
119 default:
120 v.Tab = "overview"
121 }
122 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
123 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
124 rows := buildNoteRows(raw, s.langOf(r))
125 v.Notes = stampNotes(v.CommitDiff, rows)
126 s.fillTimeline(r, v, repo, mr, rows)
127 }
128
129 func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
130 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
131 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
132 for _, name := range names {
133 v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})
134 }
135 tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
136 for _, name := range tags {
137 v.Tags = append(v.Tags, TagRow{Name: name})
138 }
139 }
140
141 // fillCompare vult commits (from..to) en de three-dot diff (from...to).
142 func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) {
143 v.CompareFrom = from
144 v.CompareTo = to
145 if from == "" || to == "" || from == to {
146 return
147 }
148 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149 commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50)
150 if err == nil && len(commits) > 0 {
151 v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
152 if len(commits) == 1 {
153 v.FormTitle = commits[0].Subject
154 }
155 }
156 if v.FormTitle == "" {
157 v.FormTitle = s.tr(r, "mr.mergeTitle", to, from)
158 }
159 files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to)
160 if err == nil {
161 v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files)
162 }
163 if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil {
164 v.Diff = stat
165 }
166 }
167
168 func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
169 lang := s.langOf(r)
170 items := []TimelineItem{{
171 Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
172 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
173 }}
174 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
175 for _, e := range events {
176 key := mrEventKey(e.Kind)
177 if key == "" {
178 continue
179 }
180 items = append(items, TimelineItem{
181 Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
182 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
183 })
184 }
185 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
186 for _, rev := range revs {
187 items = append(items, TimelineItem{
188 Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
189 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
190 })
191 }
192 pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID)
193 for _, p := range pipes {
194 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
195 status := displayStatus(p.Status, jobs)
196 label := s.tr(r, "pipe."+status)
197 v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
198 items = append(items, TimelineItem{
199 Kind: "pipeline", Actor: p.Actor,
200 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
201 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
202 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
203 })
204 }
205 for _, n := range rows {
206 if n.ParentID != 0 {
207 continue
208 }
209 item := TimelineItem{
210 ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
211 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
212 }
213 for _, rp := range n.Replies {
214 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
215 }
216 items = append(items, item)
217 }
218 sort.SliceStable(items, func(i, j int) bool {
219 if items[i].At.Equal(items[j].At) {
220 return items[i].Rank < items[j].Rank
221 }
222 return items[i].At.Before(items[j].At)
223 })
224 v.Timeline = items
225 }
226
227 func mrEventKey(kind string) string {
228 switch kind {
229 case "pushed":
230 return "mr.pushed"
231 case "retitled":
232 return "mr.retitled"
233 case "relabeled":
234 return "mr.relabeled"
235 case "merged":
236 return "mr.mergedEvent"
237 case "closed":
238 return "mr.closedEvent"
239 case "reopened":
240 return "mr.reopenedEvent"
241 default:
242 return ""
243 }
244 }
245
246 func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow {
247 placed := map[int64]bool{}
248 if diff != nil {
249 for i := range diff.Files {
250 for j := range diff.Files[i].Lines {
251 ln := &diff.Files[i].Lines[j]
252 if ln.New == 0 {
253 continue
254 }
255 for _, note := range rows {
256 if note.ParentID != 0 {
257 continue
258 }
259 if note.Path == diff.Files[i].Path && note.End == ln.New {
260 ln.Notes = append(ln.Notes, note)
261 placed[note.ID] = true
262 }
263 }
264 }
265 }
266 }
267 var general []NoteRow
268 for _, note := range rows {
269 if note.ParentID != 0 {
270 continue
271 }
272 if note.Path == "" || !placed[note.ID] {
273 general = append(general, note)
274 }
275 }
276 return general
277 }
278
279 func splitLabels(raw string) []string {
280 var out []string
281 for _, part := range strings.Split(raw, ",") {
282 part = strings.TrimSpace(part)
283 if part != "" {
284 out = append(out, part)
285 }
286 }
287 return out
288 }
289
290 func normalizeLabels(raw string) string {
291 return strings.Join(splitLabels(raw), ", ")
292 }
293
294 func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) {
295 if s.StoragePath() == "" || branch == "" || after == "" {
296 return
297 }
298 ctx := context.Background()
299 mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch)
300 if err != nil || len(mrs) == 0 {
301 return
302 }
303 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
304 rev := after
305 limit := 1
306 if before != "" && strings.Trim(before, "0") != "" {
307 rev = before + ".." + after
308 limit = 20
309 }
310 subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit)
311 if err != nil || len(subjects) == 0 {
312 return
313 }
314 body := strings.Join(subjects, "\n")
315 for _, mr := range mrs {
316 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
317 }
318 }
@@ -0,0 +1,318 @@
1package server
2
3import (
4 "context"
5 "html/template"
6 "net/http"
7 "sort"
8 "strconv"
9 "strings"
10
11 "gitlab.com/Timfa/bluegit/internal/access"
12 "gitlab.com/Timfa/bluegit/internal/gitrepo"
13 "gitlab.com/Timfa/bluegit/internal/i18n"
14 "gitlab.com/Timfa/bluegit/internal/markdown"
15 "gitlab.com/Timfa/bluegit/internal/store"
16)
17
18func (s *Server) compare(w http.ResponseWriter, r *http.Request) {
19 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
20 if !ok {
21 return
22 }
23 v := s.repoView(w, r, repo, role, "branch.compare")
24 v.Title = s.tr(r, "branch.compare")
25 v.Page = "compare"
26 v.Wide = true
27 s.fillBranchChoices(r, &v, repo)
28 from := safeRev(r.URL.Query().Get("from"), repo.DefaultBranch)
29 to := safeRev(r.URL.Query().Get("to"), "")
30 s.fillCompare(r, &v, repo, from, to)
31 s.render(w, "compare", v)
32}
33
34func (s *Server) newMR(w http.ResponseWriter, r *http.Request) {
35 _, repo, role, ok := s.guard(w, r, access.RoleDeveloper)
36 if !ok {
37 return
38 }
39 if !role.CanWriteCode() {
40 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
41 return
42 }
43 v := s.repoView(w, r, repo, role, "mr.create")
44 v.Title = s.tr(r, "mr.create")
45 v.Page = "newmr"
46 v.Wide = true
47 s.fillBranchChoices(r, &v, repo)
48 source := safeRev(r.URL.Query().Get("source"), "")
49 target := safeRev(r.URL.Query().Get("target"), repo.DefaultBranch)
50 if source == "" {
51 for _, b := range v.Branches {
52 if b.Name != target {
53 source = b.Name
54 break
55 }
56 }
57 }
58 s.fillCompare(r, &v, repo, target, source)
59 v.CompareFrom = source
60 v.CompareTo = target
61 s.render(w, "newmr", v)
62}
63
64func (s *Server) previewMarkdown(w http.ResponseWriter, r *http.Request) {
65 u, _, _, ok := s.guard(w, r, access.RoleReadonly)
66 if !ok || !s.csrfOK(w, r) {
67 return
68 }
69 if u.ID == 0 {
70 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
71 return
72 }
73 body := r.FormValue("body")
74 if len(body) > 20000 {
75 body = body[:20000]
76 }
77 w.Header().Set("Content-Type", "text/html; charset=utf-8")
78 _, _ = w.Write([]byte(markdown.Render(body, "", "")))
79}
80
81func (s *Server) updateMR(w http.ResponseWriter, r *http.Request) {
82 u, repo, role, ok := s.guard(w, r, access.RoleReadonly)
83 if !ok || !s.csrfOK(w, r) {
84 return
85 }
86 mr, err := s.mrFromRequest(r, repo.ID)
87 if err != nil {
88 http.NotFound(w, r)
89 return
90 }
91 back := repoURL(repo) + "/-/merge-requests/" + strconv.FormatInt(mr.Number, 10)
92 if mr.Status != "open" || u.ID == 0 || (u.ID != mr.AuthorID && !role.CanWriteCode()) {
93 http.Error(w, s.tr(r, "err.forbidden"), http.StatusForbidden)
94 return
95 }
96 title := strings.TrimSpace(r.FormValue("title"))
97 description := r.FormValue("description")
98 labels := normalizeLabels(r.FormValue("labels"))
99 if err := s.Store.UpdateMergeRequest(r.Context(), mr.ID, title, description, labels); err != nil {
100 s.redirect(w, r, back, "", s.trErr(r, err))
101 return
102 }
103 if title != mr.Title {
104 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "retitled", title)
105 }
106 if labels != normalizeLabels(mr.Labels) {
107 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "relabeled", labels)
108 }
109 s.redirect(w, r, back, s.tr(r, "flash.mrUpdated"), "")
110}
111
112func (s *Server) finishMR(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, u store.User) {
113 v.DescHTML = template.HTML(markdown.Render(mr.Description, "", ""))
114 v.Labels = splitLabels(mr.Labels)
115 v.CanEditMR = mr.Status == "open" && u.ID != 0 && (u.ID == mr.AuthorID || v.CanWrite)
116 switch r.URL.Query().Get("tab") {
117 case "commits", "pipelines", "changes":
118 v.Tab = r.URL.Query().Get("tab")
119 default:
120 v.Tab = "overview"
121 }
122 s.fillCompare(r, v, repo, mr.TargetBranch, mr.SourceBranch)
123 raw, _ := s.Store.ListNotes(r.Context(), mr.ID)
124 rows := buildNoteRows(raw, s.langOf(r))
125 v.Notes = stampNotes(v.CommitDiff, rows)
126 s.fillTimeline(r, v, repo, mr, rows)
127}
128
129func (s *Server) fillBranchChoices(r *http.Request, v *View, repo store.Repo) {
130 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
131 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
132 for _, name := range names {
133 v.Branches = append(v.Branches, BranchRow{Name: name, Default: name == repo.DefaultBranch})
134 }
135 tags, _ := gitrepo.Tags(r.Context(), s.Git, dir)
136 for _, name := range tags {
137 v.Tags = append(v.Tags, TagRow{Name: name})
138 }
139}
140
141// fillCompare vult commits (from..to) en de three-dot diff (from...to).
142func (s *Server) fillCompare(r *http.Request, v *View, repo store.Repo, from, to string) {
143 v.CompareFrom = from
144 v.CompareTo = to
145 if from == "" || to == "" || from == to {
146 return
147 }
148 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
149 commits, err := gitrepo.Log(r.Context(), s.Git, dir, from+".."+to, 50)
150 if err == nil && len(commits) > 0 {
151 v.Commits = s.presentCommits(r.Context(), repo.ID, commits, s.langOf(r))
152 if len(commits) == 1 {
153 v.FormTitle = commits[0].Subject
154 }
155 }
156 if v.FormTitle == "" {
157 v.FormTitle = s.tr(r, "mr.mergeTitle", to, from)
158 }
159 files, err := gitrepo.ComparePatch(r.Context(), s.Git, dir, from, to)
160 if err == nil {
161 v.CommitDiff = presentCommitDiff(repo.FullPath(), to, nil, files)
162 }
163 if stat, err := gitrepo.DiffStat(r.Context(), s.Git, dir, from, to); err == nil {
164 v.Diff = stat
165 }
166}
167
168func (s *Server) fillTimeline(r *http.Request, v *View, repo store.Repo, mr store.MergeRequest, rows []NoteRow) {
169 lang := s.langOf(r)
170 items := []TimelineItem{{
171 Kind: "opened", Actor: mr.Author, Text: s.tr(r, "mr.opened"),
172 When: i18n.FormatDate(lang, mr.CreatedAt), At: mr.CreatedAt, Rank: 0,
173 }}
174 events, _ := s.Store.ListMREvents(r.Context(), mr.ID)
175 for _, e := range events {
176 key := mrEventKey(e.Kind)
177 if key == "" {
178 continue
179 }
180 items = append(items, TimelineItem{
181 Kind: e.Kind, Actor: e.Actor, Text: s.tr(r, key), Body: e.Body,
182 When: i18n.FormatDate(lang, e.CreatedAt), At: e.CreatedAt, Rank: 2,
183 })
184 }
185 revs, _ := s.Store.ListReviews(r.Context(), mr.ID)
186 for _, rev := range revs {
187 items = append(items, TimelineItem{
188 Kind: "review", Actor: rev.Username, Text: s.tr(r, "rev."+rev.Status),
189 When: i18n.FormatDate(lang, rev.UpdatedAt), At: rev.UpdatedAt, Rank: 3,
190 })
191 }
192 pipes, _ := s.Store.PipelinesForMR(r.Context(), repo.ID, mr.ID)
193 for _, p := range pipes {
194 jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
195 status := displayStatus(p.Status, jobs)
196 label := s.tr(r, "pipe."+status)
197 v.PipeRows = append(v.PipeRows, s.pipeRow(r, lang, repo, p, map[string]store.User{}, s.queueRanks(r.Context())))
198 items = append(items, TimelineItem{
199 Kind: "pipeline", Actor: p.Actor,
200 Text: s.tr(r, "mr.pipeEvent", p.ID, label),
201 URL: repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10),
202 When: i18n.FormatDate(lang, p.CreatedAt), At: p.CreatedAt, Rank: 1,
203 })
204 }
205 for _, n := range rows {
206 if n.ParentID != 0 {
207 continue
208 }
209 item := TimelineItem{
210 ID: n.ID, Kind: "comment", Actor: n.Author, Text: s.tr(r, "mr.commented"),
211 HTML: n.HTML, When: n.When, At: n.At, Rank: 4,
212 }
213 for _, rp := range n.Replies {
214 item.Replies = append(item.Replies, TimelineItem{Actor: rp.Author, HTML: rp.HTML, When: rp.When})
215 }
216 items = append(items, item)
217 }
218 sort.SliceStable(items, func(i, j int) bool {
219 if items[i].At.Equal(items[j].At) {
220 return items[i].Rank < items[j].Rank
221 }
222 return items[i].At.Before(items[j].At)
223 })
224 v.Timeline = items
225}
226
227func mrEventKey(kind string) string {
228 switch kind {
229 case "pushed":
230 return "mr.pushed"
231 case "retitled":
232 return "mr.retitled"
233 case "relabeled":
234 return "mr.relabeled"
235 case "merged":
236 return "mr.mergedEvent"
237 case "closed":
238 return "mr.closedEvent"
239 case "reopened":
240 return "mr.reopenedEvent"
241 default:
242 return ""
243 }
244}
245
246func stampNotes(diff *CommitDiff, rows []NoteRow) []NoteRow {
247 placed := map[int64]bool{}
248 if diff != nil {
249 for i := range diff.Files {
250 for j := range diff.Files[i].Lines {
251 ln := &diff.Files[i].Lines[j]
252 if ln.New == 0 {
253 continue
254 }
255 for _, note := range rows {
256 if note.ParentID != 0 {
257 continue
258 }
259 if note.Path == diff.Files[i].Path && note.End == ln.New {
260 ln.Notes = append(ln.Notes, note)
261 placed[note.ID] = true
262 }
263 }
264 }
265 }
266 }
267 var general []NoteRow
268 for _, note := range rows {
269 if note.ParentID != 0 {
270 continue
271 }
272 if note.Path == "" || !placed[note.ID] {
273 general = append(general, note)
274 }
275 }
276 return general
277}
278
279func splitLabels(raw string) []string {
280 var out []string
281 for _, part := range strings.Split(raw, ",") {
282 part = strings.TrimSpace(part)
283 if part != "" {
284 out = append(out, part)
285 }
286 }
287 return out
288}
289
290func normalizeLabels(raw string) string {
291 return strings.Join(splitLabels(raw), ", ")
292}
293
294func (s *Server) recordMRPushes(repo store.Repo, user store.User, branch, before, after string) {
295 if s.StoragePath() == "" || branch == "" || after == "" {
296 return
297 }
298 ctx := context.Background()
299 mrs, err := s.Store.OpenMergeRequestsBySource(ctx, repo.ID, branch)
300 if err != nil || len(mrs) == 0 {
301 return
302 }
303 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
304 rev := after
305 limit := 1
306 if before != "" && strings.Trim(before, "0") != "" {
307 rev = before + ".." + after
308 limit = 20
309 }
310 subjects, err := gitrepo.Subjects(ctx, s.Git, dir, rev, limit)
311 if err != nil || len(subjects) == 0 {
312 return
313 }
314 body := strings.Join(subjects, "\n")
315 for _, mr := range mrs {
316 _ = s.Store.AddMREvent(ctx, repo.ID, mr.ID, user.ID, "pushed", body)
317 }
318}
internal/server/mr_pipeline.go +3 −0
@@ -140,6 +140,9 @@ func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeReq
140 140 return nil
141 141 }
142 142 var blocks []string
143 if mr.Draft {
144 blocks = append(blocks, s.tr(r, "mr.block.draft"))
145 }
143 146 if s.Cfg.CI.Enabled && s.StoragePath() != "" {
144 147 blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)
145 148 }
@@ -140,6 +140,9 @@ func (s *Server) mergeBlocks(r *http.Request, repo store.Repo, mr store.MergeReq
140 return nil
140 return nil
141 }
141 }
142 var blocks []string
142 var blocks []string
143 if mr.Draft {
144 blocks = append(blocks, s.tr(r, "mr.block.draft"))
145 }
143 if s.Cfg.CI.Enabled && s.StoragePath() != "" {
146 if s.Cfg.CI.Enabled && s.StoragePath() != "" {
144 blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)
147 blocks = append(blocks, s.pipelineBlocks(r, repo, mr)...)
145 }
148 }
internal/server/repo_handlers.go +24 −27
@@ -148,25 +148,17 @@ func (s *Server) commit(w http.ResponseWriter, r *http.Request) {
148 148 }
149 149 v := s.repoView(w, r, repo, role, c.Subject)
150 150 v.Page = "commit"
151 rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, i18n.Parse(v.Lang))
151 v.Wide = true
152 lang := i18n.Parse(v.Lang)
153 rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang)
154 s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
152 155 v.Commit = &rows[0]
153 s.render(w, "commit", v)
154 }
155
156 func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
157 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
158 if !ok {
159 return
160 }
161 v := s.repoView(w, r, repo, role, "title.branches")
162 v.Page = "branches"
163 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
164 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
165 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
166 for _, name := range names {
167 v.Branches = append(v.Branches, BranchRow{Name: name, Protected: access.BranchProtected(patterns, name)})
156 parents, files, err := gitrepo.CommitPatch(r.Context(), s.Git, dir, c.SHA)
157 if err != nil && s.Log != nil {
158 s.Log.Warn("commitdiff", "sha", c.SHA, "err", err)
168 159 }
169 s.render(w, "branches", v)
160 v.CommitDiff = presentCommitDiff(repo.FullPath(), c.SHA, parents, files)
161 s.render(w, "commit", v)
170 162 }
171 163
172 164 func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
@@ -207,6 +199,9 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
207 199 }
208 200 num := strconv.FormatInt(mr.Number, 10)
209 201 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
202 if r.FormValue("draft") == "1" {
203 _ = s.Store.SetDraft(r.Context(), mr.ID, true)
204 }
210 205 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+source); sha != "" {
211 206 s.startOneMergePipeline(r.Context(), repo, sha, u.Username, "", mr)
212 207 }
@@ -246,14 +241,7 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
246 241 v.CanClose = mr.Status == "open" && mine
247 242 v.CanReopen = mr.Status == "closed" && mine
248 243 }
249 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
250 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
251 if err == nil {
252 v.Diff = diff
253 }
254 files, _ := gitrepo.DiffFiles(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
255 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
256 v.Notes, v.DiffFiles = arrangeNotes(notes, files, s.langOf(r))
244 s.finishMR(r, &v, repo, mr, u)
257 245 s.render(w, "mr", v)
258 246 }
259 247
@@ -278,8 +266,15 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
278 266 return
279 267 }
280 268 if path == "" {
281 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
282 s.redirect(w, r, back, "", s.trErr(r, err))
269 parent, _ := strconv.ParseInt(r.FormValue("parent"), 10, 64)
270 var noteErr error
271 if parent > 0 {
272 _, noteErr = s.Store.AddReply(r.Context(), repo.ID, mr.ID, u.ID, parent, r.FormValue("body"))
273 } else {
274 _, noteErr = s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body"))
275 }
276 if noteErr != nil {
277 s.redirect(w, r, back, "", s.trErr(r, noteErr))
283 278 return
284 279 }
285 280 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
@@ -343,6 +338,7 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
343 338 return
344 339 }
345 340 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
341 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "merged", "")
346 342 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
347 343 }
348 344
@@ -361,6 +357,7 @@ func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
361 357 return
362 358 }
363 359 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
360 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "closed", "")
364 361 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")
365 362 }
366 363
@@ -148,25 +148,17 @@ func (s *Server) commit(w http.ResponseWriter, r *http.Request) {
148 }
148 }
149 v := s.repoView(w, r, repo, role, c.Subject)
149 v := s.repoView(w, r, repo, role, c.Subject)
150 v.Page = "commit"
150 v.Page = "commit"
151 rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, i18n.Parse(v.Lang))
151 v.Wide = true
152 lang := i18n.Parse(v.Lang)
153 rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang)
154 s.attachHeadPipeline(r.Context(), repo, &rows[0], lang)
152 v.Commit = &rows[0]
155 v.Commit = &rows[0]
153 s.render(w, "commit", v)
156 parents, files, err := gitrepo.CommitPatch(r.Context(), s.Git, dir, c.SHA)
154}
157 if err != nil && s.Log != nil {
155
158 s.Log.Warn("commitdiff", "sha", c.SHA, "err", err)
156func (s *Server) branches(w http.ResponseWriter, r *http.Request) {
157 _, repo, role, ok := s.guard(w, r, access.RoleReadonly)
158 if !ok {
159 return
160 }
161 v := s.repoView(w, r, repo, role, "title.branches")
162 v.Page = "branches"
163 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
164 names, _ := gitrepo.Branches(r.Context(), s.Git, dir)
165 patterns, _ := s.Store.ProtectedPatterns(r.Context(), repo.ID)
166 for _, name := range names {
167 v.Branches = append(v.Branches, BranchRow{Name: name, Protected: access.BranchProtected(patterns, name)})
168 }
159 }
169 s.render(w, "branches", v)
160 v.CommitDiff = presentCommitDiff(repo.FullPath(), c.SHA, parents, files)
161 s.render(w, "commit", v)
170}
162}
171
163
172func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
164func (s *Server) mergeRequests(w http.ResponseWriter, r *http.Request) {
@@ -207,6 +199,9 @@ func (s *Server) createMR(w http.ResponseWriter, r *http.Request) {
207 }
199 }
208 num := strconv.FormatInt(mr.Number, 10)
200 num := strconv.FormatInt(mr.Number, 10)
209 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
201 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
202 if r.FormValue("draft") == "1" {
203 _ = s.Store.SetDraft(r.Context(), mr.ID, true)
204 }
210 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+source); sha != "" {
205 if sha := gitOne(r.Context(), s.Git, dir, "rev-parse", "--verify", "refs/heads/"+source); sha != "" {
211 s.startOneMergePipeline(r.Context(), repo, sha, u.Username, "", mr)
206 s.startOneMergePipeline(r.Context(), repo, sha, u.Username, "", mr)
212 }
207 }
@@ -246,14 +241,7 @@ func (s *Server) showMR(w http.ResponseWriter, r *http.Request) {
246 v.CanClose = mr.Status == "open" && mine
241 v.CanClose = mr.Status == "open" && mine
247 v.CanReopen = mr.Status == "closed" && mine
242 v.CanReopen = mr.Status == "closed" && mine
248 }
243 }
249 dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
244 s.finishMR(r, &v, repo, mr, u)
250 diff, err := gitrepo.DiffStat(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
251 if err == nil {
252 v.Diff = diff
253 }
254 files, _ := gitrepo.DiffFiles(r.Context(), s.Git, dir, mr.TargetBranch, mr.SourceBranch)
255 notes, _ := s.Store.ListNotes(r.Context(), mr.ID)
256 v.Notes, v.DiffFiles = arrangeNotes(notes, files, s.langOf(r))
257 s.render(w, "mr", v)
245 s.render(w, "mr", v)
258}
246}
259
247
@@ -278,8 +266,15 @@ func (s *Server) createNote(w http.ResponseWriter, r *http.Request) {
278 return
266 return
279 }
267 }
280 if path == "" {
268 if path == "" {
281 if _, err := s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body")); err != nil {
269 parent, _ := strconv.ParseInt(r.FormValue("parent"), 10, 64)
282 s.redirect(w, r, back, "", s.trErr(r, err))
270 var noteErr error
271 if parent > 0 {
272 _, noteErr = s.Store.AddReply(r.Context(), repo.ID, mr.ID, u.ID, parent, r.FormValue("body"))
273 } else {
274 _, noteErr = s.Store.AddNote(r.Context(), repo.ID, mr.ID, u.ID, r.FormValue("body"))
275 }
276 if noteErr != nil {
277 s.redirect(w, r, back, "", s.trErr(r, noteErr))
283 return
278 return
284 }
279 }
285 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
280 s.redirect(w, r, back, s.tr(r, "flash.note"), "")
@@ -343,6 +338,7 @@ func (s *Server) mergeMR(w http.ResponseWriter, r *http.Request) {
343 return
338 return
344 }
339 }
345 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
340 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "merged")
341 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "merged", "")
346 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
342 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.merged"), "")
347}
343}
348
344
@@ -361,6 +357,7 @@ func (s *Server) closeMR(w http.ResponseWriter, r *http.Request) {
361 return
357 return
362 }
358 }
363 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
359 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "closed")
360 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "closed", "")
364 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")
361 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.closed"), "")
365}
362}
366
363
internal/server/reviews.go +1 −0
@@ -285,6 +285,7 @@ func (s *Server) reopenMR(w http.ResponseWriter, r *http.Request) {
285 285 return
286 286 }
287 287 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")
288 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "reopened", "")
288 289 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")
289 290 }
290 291
@@ -285,6 +285,7 @@ func (s *Server) reopenMR(w http.ResponseWriter, r *http.Request) {
285 return
285 return
286 }
286 }
287 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")
287 _ = s.Store.SetMergeRequestStatus(r.Context(), mr.ID, "open")
288 _ = s.Store.AddMREvent(r.Context(), repo.ID, mr.ID, u.ID, "reopened", "")
288 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")
289 s.redirect(w, r, repoURL(repo)+"/-/merge-requests/"+strconv.FormatInt(mr.Number, 10), s.tr(r, "flash.reopened"), "")
289}
290}
290
291
internal/server/server.go +39 −2
@@ -119,9 +119,16 @@ func (s *Server) Handler() http.Handler {
119 119 mux.HandleFunc("GET /{owner}/{repo}/-/tags/archive", s.tagArchive)
120 120 mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)
121 121 mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)
122 mux.HandleFunc("POST /{owner}/{repo}/-/branches", s.createBranch)
123 mux.HandleFunc("POST /{owner}/{repo}/-/branches/delete", s.deleteBranch)
124 mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)
125 mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)
126 mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)
122 127 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)
128 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)
123 129 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)
124 130 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
131 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}", s.updateMR)
125 132 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
126 133 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
127 134 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)
@@ -449,6 +456,7 @@ type View struct {
449 456 CanApply bool
450 457 Commits []CommitRow
451 458 Commit *CommitRow
459 CommitDiff *CommitDiff
452 460 Entries []EntryRow
453 461 TreePath string
454 462 Blob string
@@ -532,6 +540,13 @@ type View struct {
532 540 Heat *activity.Calendar
533 541 Notes []NoteRow
534 542 Profile *store.User
543 DescHTML template.HTML
544 Timeline []TimelineItem
545 CompareFrom string
546 CompareTo string
547 FormTitle string
548 Labels []string
549 CanEditMR bool
535 550 }
536 551
537 552 // LangChoice is één taal in de instellingen.
@@ -553,6 +568,10 @@ type NoteRow struct {
553 568 Author, Body, When, Path string
554 569 Start, End int
555 570 HasSuggestion bool
571 ParentID int64
572 HTML template.HTML
573 Replies []NoteRow
574 At time.Time
556 575 }
557 576
558 577 // DiffFileView is één bestand in de merge-request-diff.
@@ -608,8 +627,26 @@ type EntryRow struct {
608 627
609 628 // BranchRow is een branch, met of zonder bescherming.
610 629 type BranchRow struct {
611 Name string
612 Protected bool
630 Name, SHA, Short, Subject, When string
631 Protected, Default bool
632 Ahead, Behind int
633 PipeID int64
634 PipeStatus, PipeLabel string
635 MRNumber int64
636 }
637
638 // TimelineItem is één gebeurtenis of reactie op een merge request.
639 type TimelineItem struct {
640 ID int64
641 Kind string
642 Actor, Text string
643 When string
644 Body string
645 HTML template.HTML
646 URL string
647 Replies []TimelineItem
648 At time.Time
649 Rank int
613 650 }
614 651
615 652 // HookView is een webhook plus de laatste pogingen.
@@ -119,9 +119,16 @@ func (s *Server) Handler() http.Handler {
119 mux.HandleFunc("GET /{owner}/{repo}/-/tags/archive", s.tagArchive)
119 mux.HandleFunc("GET /{owner}/{repo}/-/tags/archive", s.tagArchive)
120 mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)
120 mux.HandleFunc("GET /{owner}/{repo}/-/commit/{sha}", s.commit)
121 mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)
121 mux.HandleFunc("GET /{owner}/{repo}/-/branches", s.branches)
122 mux.HandleFunc("POST /{owner}/{repo}/-/branches", s.createBranch)
123 mux.HandleFunc("POST /{owner}/{repo}/-/branches/delete", s.deleteBranch)
124 mux.HandleFunc("POST /{owner}/{repo}/-/branches/rename", s.renameBranch)
125 mux.HandleFunc("GET /{owner}/{repo}/-/compare", s.compare)
126 mux.HandleFunc("POST /{owner}/{repo}/-/markdown", s.previewMarkdown)
122 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)
127 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests", s.mergeRequests)
128 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/new", s.newMR)
123 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)
129 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests", s.createMR)
124 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
130 mux.HandleFunc("GET /{owner}/{repo}/-/merge-requests/{number}", s.showMR)
131 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}", s.updateMR)
125 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
132 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/merge", s.mergeMR)
126 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
133 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/close", s.closeMR)
127 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)
134 mux.HandleFunc("POST /{owner}/{repo}/-/merge-requests/{number}/reopen", s.reopenMR)
@@ -449,6 +456,7 @@ type View struct {
449 CanApply bool
456 CanApply bool
450 Commits []CommitRow
457 Commits []CommitRow
451 Commit *CommitRow
458 Commit *CommitRow
459 CommitDiff *CommitDiff
452 Entries []EntryRow
460 Entries []EntryRow
453 TreePath string
461 TreePath string
454 Blob string
462 Blob string
@@ -532,6 +540,13 @@ type View struct {
532 Heat *activity.Calendar
540 Heat *activity.Calendar
533 Notes []NoteRow
541 Notes []NoteRow
534 Profile *store.User
542 Profile *store.User
543 DescHTML template.HTML
544 Timeline []TimelineItem
545 CompareFrom string
546 CompareTo string
547 FormTitle string
548 Labels []string
549 CanEditMR bool
535}
550}
536
551
537// LangChoice is één taal in de instellingen.
552// LangChoice is één taal in de instellingen.
@@ -553,6 +568,10 @@ type NoteRow struct {
553 Author, Body, When, Path string
568 Author, Body, When, Path string
554 Start, End int
569 Start, End int
555 HasSuggestion bool
570 HasSuggestion bool
571 ParentID int64
572 HTML template.HTML
573 Replies []NoteRow
574 At time.Time
556}
575}
557
576
558// DiffFileView is één bestand in de merge-request-diff.
577// DiffFileView is één bestand in de merge-request-diff.
@@ -608,8 +627,26 @@ type EntryRow struct {
608
627
609// BranchRow is een branch, met of zonder bescherming.
628// BranchRow is een branch, met of zonder bescherming.
610type BranchRow struct {
629type BranchRow struct {
611 Name string
630 Name, SHA, Short, Subject, When string
612 Protected bool
631 Protected, Default bool
632 Ahead, Behind int
633 PipeID int64
634 PipeStatus, PipeLabel string
635 MRNumber int64
636}
637
638// TimelineItem is één gebeurtenis of reactie op een merge request.
639type TimelineItem struct {
640 ID int64
641 Kind string
642 Actor, Text string
643 When string
644 Body string
645 HTML template.HTML
646 URL string
647 Replies []TimelineItem
648 At time.Time
649 Rank int
613}
650}
614
651
615// HookView is een webhook plus de laatste pogingen.
652// HookView is een webhook plus de laatste pogingen.
internal/server/static/branch.js added +58 −0
@@ -0,0 +1,58 @@
1 (function () {
2 function dialog(name) {
3 return document.querySelector('[data-branch-dialog="' + name + '"]');
4 }
5 function fill(el, pattern, name) {
6 if (!el) return;
7 var text = el.getAttribute("data-pattern") || pattern || "";
8 el.textContent = text.replace("%s", name);
9 }
10 document.querySelectorAll("[data-branch-open]").forEach(function (btn) {
11 btn.addEventListener("click", function () {
12 var box = dialog(btn.getAttribute("data-branch-open"));
13 if (box && box.showModal) box.showModal();
14 });
15 });
16 document.querySelectorAll("[data-dialog-close]").forEach(function (btn) {
17 btn.addEventListener("click", function () {
18 var box = btn.closest("dialog");
19 if (box) box.close();
20 });
21 });
22 document.querySelectorAll("[data-delete]").forEach(function (btn) {
23 btn.addEventListener("click", function () {
24 var name = btn.getAttribute("data-delete");
25 var box = dialog("delete");
26 if (!box) return;
27 box.querySelector("[data-delete-name]").value = name;
28 fill(box.querySelector("[data-delete-ask]"), "", name);
29 var confirm = box.querySelector('[name="confirm"]');
30 if (confirm) confirm.value = "";
31 box.showModal();
32 });
33 });
34 document.querySelectorAll("[data-rename]").forEach(function (btn) {
35 btn.addEventListener("click", function () {
36 var name = btn.getAttribute("data-rename");
37 var box = dialog("rename");
38 if (!box) return;
39 box.querySelector("[data-rename-name]").value = name;
40 fill(box.querySelector("[data-rename-ask]"), "", name);
41 var next = box.querySelector('[name="new_name"]');
42 var confirm = box.querySelector('[name="confirm"]');
43 if (next) next.value = name;
44 if (confirm) confirm.value = "";
45 box.showModal();
46 });
47 });
48 var filter = document.querySelector("[data-branch-filter]");
49 if (filter) {
50 filter.addEventListener("input", function () {
51 var q = filter.value.trim().toLowerCase();
52 document.querySelectorAll("[data-branch-row]").forEach(function (row) {
53 var name = (row.getAttribute("data-name") || "").toLowerCase();
54 row.hidden = q !== "" && name.indexOf(q) < 0;
55 });
56 });
57 }
58 })();
@@ -0,0 +1,58 @@
1(function () {
2 function dialog(name) {
3 return document.querySelector('[data-branch-dialog="' + name + '"]');
4 }
5 function fill(el, pattern, name) {
6 if (!el) return;
7 var text = el.getAttribute("data-pattern") || pattern || "";
8 el.textContent = text.replace("%s", name);
9 }
10 document.querySelectorAll("[data-branch-open]").forEach(function (btn) {
11 btn.addEventListener("click", function () {
12 var box = dialog(btn.getAttribute("data-branch-open"));
13 if (box && box.showModal) box.showModal();
14 });
15 });
16 document.querySelectorAll("[data-dialog-close]").forEach(function (btn) {
17 btn.addEventListener("click", function () {
18 var box = btn.closest("dialog");
19 if (box) box.close();
20 });
21 });
22 document.querySelectorAll("[data-delete]").forEach(function (btn) {
23 btn.addEventListener("click", function () {
24 var name = btn.getAttribute("data-delete");
25 var box = dialog("delete");
26 if (!box) return;
27 box.querySelector("[data-delete-name]").value = name;
28 fill(box.querySelector("[data-delete-ask]"), "", name);
29 var confirm = box.querySelector('[name="confirm"]');
30 if (confirm) confirm.value = "";
31 box.showModal();
32 });
33 });
34 document.querySelectorAll("[data-rename]").forEach(function (btn) {
35 btn.addEventListener("click", function () {
36 var name = btn.getAttribute("data-rename");
37 var box = dialog("rename");
38 if (!box) return;
39 box.querySelector("[data-rename-name]").value = name;
40 fill(box.querySelector("[data-rename-ask]"), "", name);
41 var next = box.querySelector('[name="new_name"]');
42 var confirm = box.querySelector('[name="confirm"]');
43 if (next) next.value = name;
44 if (confirm) confirm.value = "";
45 box.showModal();
46 });
47 });
48 var filter = document.querySelector("[data-branch-filter]");
49 if (filter) {
50 filter.addEventListener("input", function () {
51 var q = filter.value.trim().toLowerCase();
52 document.querySelectorAll("[data-branch-row]").forEach(function (row) {
53 var name = (row.getAttribute("data-name") || "").toLowerCase();
54 row.hidden = q !== "" && name.indexOf(q) < 0;
55 });
56 });
57 }
58})();
internal/server/static/commit-mode.js added +13 −0
@@ -0,0 +1,13 @@
1 (function () {
2 var box = document.getElementById("commitdiff");
3 if (!box) {
4 return;
5 }
6 var mode = "inline";
7 try {
8 if (localStorage.getItem("bluegit-diff") === "side") {
9 mode = "side";
10 }
11 } catch (e) {}
12 box.setAttribute("data-mode", mode);
13 })();
@@ -0,0 +1,13 @@
1(function () {
2 var box = document.getElementById("commitdiff");
3 if (!box) {
4 return;
5 }
6 var mode = "inline";
7 try {
8 if (localStorage.getItem("bluegit-diff") === "side") {
9 mode = "side";
10 }
11 } catch (e) {}
12 box.setAttribute("data-mode", mode);
13})();
internal/server/static/commit.js added +39 −0
@@ -0,0 +1,39 @@
1 (function () {
2 var root = document.querySelector("[data-commit-diff]");
3 if (!root) {
4 return;
5 }
6 function mark() {
7 var mode = root.getAttribute("data-mode") === "side" ? "side" : "inline";
8 root.querySelectorAll("[data-diff-mode]").forEach(function (btn) {
9 var on = btn.getAttribute("data-diff-mode") === mode;
10 btn.classList.toggle("on", on);
11 btn.setAttribute("aria-pressed", on ? "true" : "false");
12 });
13 }
14 mark();
15 root.addEventListener("click", function (ev) {
16 var modeBtn = ev.target.closest("[data-diff-mode]");
17 if (modeBtn && root.contains(modeBtn)) {
18 var next = modeBtn.getAttribute("data-diff-mode") === "side" ? "side" : "inline";
19 root.setAttribute("data-mode", next);
20 try {
21 localStorage.setItem("bluegit-diff", next);
22 } catch (e) {}
23 mark();
24 return;
25 }
26 var tog = ev.target.closest("[data-toggle-diff]");
27 if (!tog || !root.contains(tog)) {
28 return;
29 }
30 var file = tog.closest(".commitfile");
31 if (!file) {
32 return;
33 }
34 var open = file.getAttribute("data-collapsed") === "1";
35 file.setAttribute("data-collapsed", open ? "0" : "1");
36 tog.setAttribute("aria-expanded", open ? "true" : "false");
37 tog.textContent = open ? tog.getAttribute("data-hide") : tog.getAttribute("data-show");
38 });
39 })();
@@ -0,0 +1,39 @@
1(function () {
2 var root = document.querySelector("[data-commit-diff]");
3 if (!root) {
4 return;
5 }
6 function mark() {
7 var mode = root.getAttribute("data-mode") === "side" ? "side" : "inline";
8 root.querySelectorAll("[data-diff-mode]").forEach(function (btn) {
9 var on = btn.getAttribute("data-diff-mode") === mode;
10 btn.classList.toggle("on", on);
11 btn.setAttribute("aria-pressed", on ? "true" : "false");
12 });
13 }
14 mark();
15 root.addEventListener("click", function (ev) {
16 var modeBtn = ev.target.closest("[data-diff-mode]");
17 if (modeBtn && root.contains(modeBtn)) {
18 var next = modeBtn.getAttribute("data-diff-mode") === "side" ? "side" : "inline";
19 root.setAttribute("data-mode", next);
20 try {
21 localStorage.setItem("bluegit-diff", next);
22 } catch (e) {}
23 mark();
24 return;
25 }
26 var tog = ev.target.closest("[data-toggle-diff]");
27 if (!tog || !root.contains(tog)) {
28 return;
29 }
30 var file = tog.closest(".commitfile");
31 if (!file) {
32 return;
33 }
34 var open = file.getAttribute("data-collapsed") === "1";
35 file.setAttribute("data-collapsed", open ? "0" : "1");
36 tog.setAttribute("aria-expanded", open ? "true" : "false");
37 tog.textContent = open ? tog.getAttribute("data-hide") : tog.getAttribute("data-show");
38 });
39})();
internal/server/static/mr.js added +70 −0
@@ -0,0 +1,70 @@
1 (function () {
2 var pick = document.querySelector("[data-mr-pick]");
3 if (pick) {
4 pick.addEventListener("change", function (ev) {
5 if (!ev.target || !ev.target.matches || !ev.target.matches("select")) return;
6 pick.requestSubmit ? pick.requestSubmit() : pick.submit();
7 });
8 }
9 document.querySelectorAll("[data-md-box]").forEach(function (box) {
10 var write = box.querySelector("[data-md-write]");
11 var area = box.querySelector("textarea");
12 var preview = box.querySelector("[data-md-preview]");
13 var url = box.getAttribute("data-md-url");
14 if (!write || !area || !preview) return;
15 function show(which) {
16 var editing = which === "write";
17 write.hidden = !editing;
18 preview.hidden = editing;
19 box.querySelectorAll("[data-md-tab]").forEach(function (btn) {
20 var on = btn.getAttribute("data-md-tab") === which;
21 btn.setAttribute("aria-selected", on ? "true" : "false");
22 });
23 }
24 box.querySelectorAll("[data-md-tab]").forEach(function (btn) {
25 btn.addEventListener("click", function () {
26 var which = btn.getAttribute("data-md-tab");
27 if (which === "preview") {
28 var csrf = "";
29 var form = box.closest("form");
30 var token = form && form.querySelector('[name="csrf"]');
31 if (token) csrf = token.value;
32 var body = new URLSearchParams();
33 body.set("csrf", csrf);
34 body.set("body", area.value);
35 preview.textContent = "";
36 fetch(url, {
37 method: "POST",
38 headers: { "Content-Type": "application/x-www-form-urlencoded" },
39 body: body.toString(),
40 credentials: "same-origin"
41 }).then(function (res) {
42 return res.text();
43 }).then(function (html) {
44 preview.innerHTML = html;
45 show("preview");
46 }).catch(function () {
47 show("preview");
48 });
49 return;
50 }
51 show("write");
52 });
53 });
54 });
55 document.querySelectorAll("[data-reply]").forEach(function (btn) {
56 btn.addEventListener("click", function () {
57 var form = document.getElementById("comment-form");
58 if (!form) return;
59 var parent = form.querySelector("[data-reply-parent]");
60 var label = form.querySelector("[data-reply-label]");
61 if (parent) parent.value = btn.getAttribute("data-reply") || "";
62 if (label) {
63 label.hidden = false;
64 label.textContent = btn.getAttribute("data-reply-name") || "";
65 }
66 var area = form.querySelector("textarea");
67 if (area) area.focus();
68 });
69 });
70 })();
@@ -0,0 +1,70 @@
1(function () {
2 var pick = document.querySelector("[data-mr-pick]");
3 if (pick) {
4 pick.addEventListener("change", function (ev) {
5 if (!ev.target || !ev.target.matches || !ev.target.matches("select")) return;
6 pick.requestSubmit ? pick.requestSubmit() : pick.submit();
7 });
8 }
9 document.querySelectorAll("[data-md-box]").forEach(function (box) {
10 var write = box.querySelector("[data-md-write]");
11 var area = box.querySelector("textarea");
12 var preview = box.querySelector("[data-md-preview]");
13 var url = box.getAttribute("data-md-url");
14 if (!write || !area || !preview) return;
15 function show(which) {
16 var editing = which === "write";
17 write.hidden = !editing;
18 preview.hidden = editing;
19 box.querySelectorAll("[data-md-tab]").forEach(function (btn) {
20 var on = btn.getAttribute("data-md-tab") === which;
21 btn.setAttribute("aria-selected", on ? "true" : "false");
22 });
23 }
24 box.querySelectorAll("[data-md-tab]").forEach(function (btn) {
25 btn.addEventListener("click", function () {
26 var which = btn.getAttribute("data-md-tab");
27 if (which === "preview") {
28 var csrf = "";
29 var form = box.closest("form");
30 var token = form && form.querySelector('[name="csrf"]');
31 if (token) csrf = token.value;
32 var body = new URLSearchParams();
33 body.set("csrf", csrf);
34 body.set("body", area.value);
35 preview.textContent = "";
36 fetch(url, {
37 method: "POST",
38 headers: { "Content-Type": "application/x-www-form-urlencoded" },
39 body: body.toString(),
40 credentials: "same-origin"
41 }).then(function (res) {
42 return res.text();
43 }).then(function (html) {
44 preview.innerHTML = html;
45 show("preview");
46 }).catch(function () {
47 show("preview");
48 });
49 return;
50 }
51 show("write");
52 });
53 });
54 });
55 document.querySelectorAll("[data-reply]").forEach(function (btn) {
56 btn.addEventListener("click", function () {
57 var form = document.getElementById("comment-form");
58 if (!form) return;
59 var parent = form.querySelector("[data-reply-parent]");
60 var label = form.querySelector("[data-reply-label]");
61 if (parent) parent.value = btn.getAttribute("data-reply") || "";
62 if (label) {
63 label.hidden = false;
64 label.textContent = btn.getAttribute("data-reply-name") || "";
65 }
66 var area = form.querySelector("textarea");
67 if (area) area.focus();
68 });
69 });
70})();
internal/server/static/style.css +125 −0
@@ -678,6 +678,131 @@ button.section-toggle {
678 678 .spec-table code { font-family: var(--mono); font-size: 0.92em; }
679 679 .spec-list { margin: 0.2rem 0 0; padding-left: 1.2rem; }
680 680 .spec-list li { margin: 0.35rem 0; }
681 main.wide:has(.commitpage) { width: min(100%, 1440px); max-width: 1440px; }
682 .commithead h1 { white-space: normal; overflow-wrap: anywhere; }
683 pre.commitmsg {
684 background: var(--card); color: var(--ink); border: 1px solid var(--line);
685 white-space: pre-wrap; overflow-wrap: anywhere; margin: 0 0 var(--sp-3);
686 }
687 .commitmeta { margin-top: 0; }
688 .commitfacts { display: grid; gap: 0.55rem; margin: 0.9rem 0 0; }
689 .commitfacts div { display: grid; grid-template-columns: 11rem minmax(0, 1fr); gap: 0.7rem; align-items: center; }
690 .commitfacts dt, .commitfacts dd { margin: 0; }
691 .commitfacts dt { color: var(--muted); }
692 .commitfacts code.sha { word-break: break-all; }
693 .commitfacts .parents { display: flex; flex-wrap: wrap; gap: 0.45rem; }
694 .commitfacts a.status { text-decoration: none; width: fit-content; }
695 .diffbar { margin-top: 0; }
696 .diffswitch { display: inline-flex; border: 1px solid var(--line); border-radius: var(--radius); overflow: hidden; flex: none; }
697 .diffswitch button { background: white; color: var(--ink); border: 0; border-radius: 0; min-width: 7.5rem; }
698 .diffswitch button + button { border-left: 1px solid var(--line); }
699 .commitdiff[data-mode="inline"] [data-diff-mode="inline"],
700 .commitdiff[data-mode="side"] [data-diff-mode="side"] { background: var(--blue-soft); color: var(--blue-deep); }
701 .commitlayout { display: grid; grid-template-columns: minmax(16rem, 22rem) minmax(0, 1fr); gap: 1rem; align-items: start; }
702 .commitfiles {
703 position: sticky; top: calc(var(--top-h) + 8px); max-height: calc(100vh - var(--top-h) - 16px);
704 overflow: auto; background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
705 padding: 0.7rem 0.75rem;
706 }
707 .commitfiles h2 { margin: 0 0 0.4rem; font-size: var(--fs-sm); color: var(--muted); }
708 .commitfiles ul { list-style: none; margin: 0; padding: 0; }
709 .commitfiles li {
710 display: flex; align-items: center; gap: 0.35rem; min-height: 1.7rem;
711 font-variant-numeric: tabular-nums;
712 }
713 .commitfiles li.d1 { padding-left: 0.9rem; }
714 .commitfiles li.d2 { padding-left: 1.8rem; }
715 .commitfiles li.d3 { padding-left: 2.7rem; }
716 .commitfiles li.d4 { padding-left: 3.6rem; }
717 .commitfiles li.d5 { padding-left: 4.5rem; }
718 .commitfiles li.d6 { padding-left: 5.4rem; }
719 .commitfiles li.d7 { padding-left: 6.3rem; }
720 .commitfiles li.d8 { padding-left: 7.2rem; }
721 .commitfiles a { display: inline-flex; align-items: center; min-width: 0; color: inherit; text-decoration: none; }
722 .commitfiles .name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
723 .addstat { color: var(--ok); font-variant-numeric: tabular-nums; }
724 .delstat { color: var(--bad); font-variant-numeric: tabular-nums; }
725 .commitdiffs { min-width: 0; }
726 .commitfile {
727 background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
728 margin: 0 0 0.8rem; scroll-margin-top: calc(var(--top-h) + 12px); min-width: 0;
729 }
730 .commitfile > header {
731 display: flex; align-items: center; gap: 0.5rem; min-height: 44px;
732 padding: 0.35rem 0.7rem; background: #f6f8fa; border-bottom: 1px solid var(--line);
733 border-radius: var(--radius-lg) var(--radius-lg) 0 0; position: sticky; top: var(--top-h); z-index: 2;
734 }
735 .commitfile > header .path { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
736 .commitfile > header .oldpath { color: var(--muted); text-decoration: line-through; }
737 .commitfile > header .counts { flex: none; }
738 .commitfile > header button[data-toggle-diff] { flex: none; min-width: 7.5rem; }
739 .commitfile[data-collapsed="1"] > header { border-bottom: 0; border-radius: var(--radius-lg); }
740 .commitfile[data-collapsed="1"] .diffbody { display: none; }
741 .commitdiff[data-mode="inline"] .split { display: none; }
742 .commitdiff[data-mode="side"] .unified { display: none; }
743 .commitline, .half {
744 display: grid; grid-template-columns: 3.2rem 3.2rem minmax(0, 1fr);
745 font-family: var(--mono); font-size: 0.84rem; line-height: 1.45; min-width: 0;
746 }
747 .half { grid-template-columns: 3.2rem minmax(0, 1fr); }
748 .commitline code, .half code {
749 display: block; white-space: pre; overflow-x: auto; min-width: 0;
750 padding: 0 0.7rem; font-family: inherit;
751 }
752 .commitline .ln, .half .ln { color: #8c959f; text-align: right; padding: 0 0.45rem; user-select: none; }
753 .commitline.kind-add, .half.kind-add { background: #e6ffec; }
754 .commitline.kind-del, .half.kind-del { background: #ffebe9; }
755 .commitline.kind-hunk { grid-template-columns: minmax(0, 1fr); color: #8c959f; background: #f6f8fa; }
756 .half.kind-empty { background: #f6f8fa; }
757 .pair { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }
758 .pair .half + .half { border-left: 1px solid var(--line); }
759 .binaryhint { margin: 0; padding: 0.8rem 0.9rem; }
760 a.btn { text-decoration: none; }
761 .branchsearch { display: block; margin: 0 0 0.8rem; }
762 .branchsearch input { width: min(100%, 24rem); }
763 .branchtable { width: 100%; border-collapse: collapse; background: var(--card); }
764 .branchtable th, .branchtable td {
765 border-bottom: 1px solid var(--line); text-align: left; vertical-align: middle;
766 padding: 0.45rem 0.7rem; height: 3rem;
767 }
768 .branchtable th { font-size: var(--fs-sm); color: var(--muted); font-weight: 650; }
769 .branchtable .nums, .branchtable .addstat, .branchtable .delstat { font-variant-numeric: tabular-nums; white-space: nowrap; }
770 .branchacts { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; min-height: 2.4rem; }
771 .branchacts a { white-space: nowrap; }
772 .branch-dialog {
773 border: 0; border-radius: var(--radius-lg); padding: 1.2rem 1.3rem;
774 max-width: 32rem; width: calc(100% - 2rem);
775 }
776 .branch-dialog::backdrop { background: rgba(8, 16, 32, 0.45); }
777 .branch-dialog p { min-height: 1.5rem; }
778 .mdbox { margin: 0 0 0.8rem; }
779 .mdtabs { display: flex; min-height: 2.4rem; }
780 .mdtabs button { background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 0; }
781 .mdtabs button + button { border-left: 0; }
782 .mdtabs button[aria-selected="true"] { background: var(--blue-soft); color: var(--blue-deep); }
783 .mdbox [data-md-write] textarea,
784 .mdbox [data-md-preview] {
785 display: block; width: 100%; height: 9rem; min-height: 9rem; max-height: 9rem;
786 overflow: auto; box-sizing: border-box; margin: 0;
787 }
788 .fieldlabel { margin: 0.6rem 0 0.3rem; }
789 .timeline { list-style: none; margin: 0; padding: 0; }
790 .timeline > li {
791 border-left: 2px solid var(--line); margin: 0 0 0 0.4rem; padding: 0.35rem 0 0.8rem 0.9rem;
792 min-height: 2.4rem;
793 }
794 .timeline .pushlist, .reply {
795 background: var(--card); border: 1px solid var(--line); border-radius: var(--radius);
796 padding: 0.45rem 0.7rem; margin: 0.35rem 0;
797 }
798 .commitline.with-gutter { grid-template-columns: 16px 3.2rem 3.2rem minmax(0, 1fr); }
799 .commitline.with-gutter.kind-hunk { grid-template-columns: minmax(0, 1fr); }
800 .commitline.picked { box-shadow: inset 3px 0 0 var(--blue); }
801 tr[hidden] { display: none; }
802 @media (max-width: 900px) {
803 .commitlayout { grid-template-columns: minmax(0, 1fr); }
804 .commitfiles { position: static; max-height: 16rem; }
805 }
681 806 @media (max-width: 800px) {
682 807 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
683 808 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
@@ -678,6 +678,131 @@ button.section-toggle {
678.spec-table code { font-family: var(--mono); font-size: 0.92em; }
678.spec-table code { font-family: var(--mono); font-size: 0.92em; }
679.spec-list { margin: 0.2rem 0 0; padding-left: 1.2rem; }
679.spec-list { margin: 0.2rem 0 0; padding-left: 1.2rem; }
680.spec-list li { margin: 0.35rem 0; }
680.spec-list li { margin: 0.35rem 0; }
681main.wide:has(.commitpage) { width: min(100%, 1440px); max-width: 1440px; }
682.commithead h1 { white-space: normal; overflow-wrap: anywhere; }
683pre.commitmsg {
684 background: var(--card); color: var(--ink); border: 1px solid var(--line);
685 white-space: pre-wrap; overflow-wrap: anywhere; margin: 0 0 var(--sp-3);
686}
687.commitmeta { margin-top: 0; }
688.commitfacts { display: grid; gap: 0.55rem; margin: 0.9rem 0 0; }
689.commitfacts div { display: grid; grid-template-columns: 11rem minmax(0, 1fr); gap: 0.7rem; align-items: center; }
690.commitfacts dt, .commitfacts dd { margin: 0; }
691.commitfacts dt { color: var(--muted); }
692.commitfacts code.sha { word-break: break-all; }
693.commitfacts .parents { display: flex; flex-wrap: wrap; gap: 0.45rem; }
694.commitfacts a.status { text-decoration: none; width: fit-content; }
695.diffbar { margin-top: 0; }
696.diffswitch { display: inline-flex; border: 1px solid var(--line); border-radius: var(--radius); overflow: hidden; flex: none; }
697.diffswitch button { background: white; color: var(--ink); border: 0; border-radius: 0; min-width: 7.5rem; }
698.diffswitch button + button { border-left: 1px solid var(--line); }
699.commitdiff[data-mode="inline"] [data-diff-mode="inline"],
700.commitdiff[data-mode="side"] [data-diff-mode="side"] { background: var(--blue-soft); color: var(--blue-deep); }
701.commitlayout { display: grid; grid-template-columns: minmax(16rem, 22rem) minmax(0, 1fr); gap: 1rem; align-items: start; }
702.commitfiles {
703 position: sticky; top: calc(var(--top-h) + 8px); max-height: calc(100vh - var(--top-h) - 16px);
704 overflow: auto; background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
705 padding: 0.7rem 0.75rem;
706}
707.commitfiles h2 { margin: 0 0 0.4rem; font-size: var(--fs-sm); color: var(--muted); }
708.commitfiles ul { list-style: none; margin: 0; padding: 0; }
709.commitfiles li {
710 display: flex; align-items: center; gap: 0.35rem; min-height: 1.7rem;
711 font-variant-numeric: tabular-nums;
712}
713.commitfiles li.d1 { padding-left: 0.9rem; }
714.commitfiles li.d2 { padding-left: 1.8rem; }
715.commitfiles li.d3 { padding-left: 2.7rem; }
716.commitfiles li.d4 { padding-left: 3.6rem; }
717.commitfiles li.d5 { padding-left: 4.5rem; }
718.commitfiles li.d6 { padding-left: 5.4rem; }
719.commitfiles li.d7 { padding-left: 6.3rem; }
720.commitfiles li.d8 { padding-left: 7.2rem; }
721.commitfiles a { display: inline-flex; align-items: center; min-width: 0; color: inherit; text-decoration: none; }
722.commitfiles .name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
723.addstat { color: var(--ok); font-variant-numeric: tabular-nums; }
724.delstat { color: var(--bad); font-variant-numeric: tabular-nums; }
725.commitdiffs { min-width: 0; }
726.commitfile {
727 background: var(--card); border: 1px solid var(--line); border-radius: var(--radius-lg);
728 margin: 0 0 0.8rem; scroll-margin-top: calc(var(--top-h) + 12px); min-width: 0;
729}
730.commitfile > header {
731 display: flex; align-items: center; gap: 0.5rem; min-height: 44px;
732 padding: 0.35rem 0.7rem; background: #f6f8fa; border-bottom: 1px solid var(--line);
733 border-radius: var(--radius-lg) var(--radius-lg) 0 0; position: sticky; top: var(--top-h); z-index: 2;
734}
735.commitfile > header .path { flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
736.commitfile > header .oldpath { color: var(--muted); text-decoration: line-through; }
737.commitfile > header .counts { flex: none; }
738.commitfile > header button[data-toggle-diff] { flex: none; min-width: 7.5rem; }
739.commitfile[data-collapsed="1"] > header { border-bottom: 0; border-radius: var(--radius-lg); }
740.commitfile[data-collapsed="1"] .diffbody { display: none; }
741.commitdiff[data-mode="inline"] .split { display: none; }
742.commitdiff[data-mode="side"] .unified { display: none; }
743.commitline, .half {
744 display: grid; grid-template-columns: 3.2rem 3.2rem minmax(0, 1fr);
745 font-family: var(--mono); font-size: 0.84rem; line-height: 1.45; min-width: 0;
746}
747.half { grid-template-columns: 3.2rem minmax(0, 1fr); }
748.commitline code, .half code {
749 display: block; white-space: pre; overflow-x: auto; min-width: 0;
750 padding: 0 0.7rem; font-family: inherit;
751}
752.commitline .ln, .half .ln { color: #8c959f; text-align: right; padding: 0 0.45rem; user-select: none; }
753.commitline.kind-add, .half.kind-add { background: #e6ffec; }
754.commitline.kind-del, .half.kind-del { background: #ffebe9; }
755.commitline.kind-hunk { grid-template-columns: minmax(0, 1fr); color: #8c959f; background: #f6f8fa; }
756.half.kind-empty { background: #f6f8fa; }
757.pair { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }
758.pair .half + .half { border-left: 1px solid var(--line); }
759.binaryhint { margin: 0; padding: 0.8rem 0.9rem; }
760a.btn { text-decoration: none; }
761.branchsearch { display: block; margin: 0 0 0.8rem; }
762.branchsearch input { width: min(100%, 24rem); }
763.branchtable { width: 100%; border-collapse: collapse; background: var(--card); }
764.branchtable th, .branchtable td {
765 border-bottom: 1px solid var(--line); text-align: left; vertical-align: middle;
766 padding: 0.45rem 0.7rem; height: 3rem;
767}
768.branchtable th { font-size: var(--fs-sm); color: var(--muted); font-weight: 650; }
769.branchtable .nums, .branchtable .addstat, .branchtable .delstat { font-variant-numeric: tabular-nums; white-space: nowrap; }
770.branchacts { display: flex; flex-wrap: wrap; gap: 0.35rem; align-items: center; min-height: 2.4rem; }
771.branchacts a { white-space: nowrap; }
772.branch-dialog {
773 border: 0; border-radius: var(--radius-lg); padding: 1.2rem 1.3rem;
774 max-width: 32rem; width: calc(100% - 2rem);
775}
776.branch-dialog::backdrop { background: rgba(8, 16, 32, 0.45); }
777.branch-dialog p { min-height: 1.5rem; }
778.mdbox { margin: 0 0 0.8rem; }
779.mdtabs { display: flex; min-height: 2.4rem; }
780.mdtabs button { background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 0; }
781.mdtabs button + button { border-left: 0; }
782.mdtabs button[aria-selected="true"] { background: var(--blue-soft); color: var(--blue-deep); }
783.mdbox [data-md-write] textarea,
784.mdbox [data-md-preview] {
785 display: block; width: 100%; height: 9rem; min-height: 9rem; max-height: 9rem;
786 overflow: auto; box-sizing: border-box; margin: 0;
787}
788.fieldlabel { margin: 0.6rem 0 0.3rem; }
789.timeline { list-style: none; margin: 0; padding: 0; }
790.timeline > li {
791 border-left: 2px solid var(--line); margin: 0 0 0 0.4rem; padding: 0.35rem 0 0.8rem 0.9rem;
792 min-height: 2.4rem;
793}
794.timeline .pushlist, .reply {
795 background: var(--card); border: 1px solid var(--line); border-radius: var(--radius);
796 padding: 0.45rem 0.7rem; margin: 0.35rem 0;
797}
798.commitline.with-gutter { grid-template-columns: 16px 3.2rem 3.2rem minmax(0, 1fr); }
799.commitline.with-gutter.kind-hunk { grid-template-columns: minmax(0, 1fr); }
800.commitline.picked { box-shadow: inset 3px 0 0 var(--blue); }
801tr[hidden] { display: none; }
802@media (max-width: 900px) {
803 .commitlayout { grid-template-columns: minmax(0, 1fr); }
804 .commitfiles { position: static; max-height: 16rem; }
805}
681@media (max-width: 800px) {
806@media (max-width: 800px) {
682 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
807 .proj, .fileview, .joblayout { grid-template-columns: minmax(0, 1fr); }
683 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
808 .proj > *, .fileview > *, .toolbar, .commitbar, .hscroll { min-width: 0; max-width: 100%; }
internal/server/static/suggest.js +5 −5
@@ -8,7 +8,7 @@
8 8 var file = null;
9 9
10 10 function rowsOf(section) {
11 return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line]"));
11 return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line], .commitline[data-line]"));
12 12 }
13 13 function clearSel() {
14 14 root.querySelectorAll(".picked").forEach(function (el) {
@@ -65,8 +65,8 @@
65 65 if (ev.target.closest("form, button, input, textarea, a, label")) return;
66 66 var gutter = ev.target.closest(".gutter");
67 67 if (!gutter || gutter.classList.contains("off")) return;
68 var row = gutter.closest(".diffline");
69 file = gutter.closest(".difffile");
68 var row = gutter.closest(".diffline, .commitline");
69 file = gutter.closest(".difffile, .commitfile");
70 70 anchor = Number(row.getAttribute("data-line"));
71 71 dragging = true;
72 72 form.hidden = true;
@@ -78,8 +78,8 @@
78 78 if (!dragging || !file) return;
79 79 var el = document.elementFromPoint(ev.clientX, ev.clientY);
80 80 if (!el) return;
81 var row = el.closest(".diffline[data-line]");
82 if (!row || row.closest(".difffile") !== file) return;
81 var row = el.closest(".diffline[data-line], .commitline[data-line]");
82 if (!row || row.closest(".difffile, .commitfile") !== file) return;
83 83 selectFrom(file, anchor, Number(row.getAttribute("data-line")));
84 84 });
85 85 window.addEventListener("mouseup", function () {
@@ -8,7 +8,7 @@
8 var file = null;
8 var file = null;
9
9
10 function rowsOf(section) {
10 function rowsOf(section) {
11 return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line]"));
11 return Array.prototype.slice.call(section.querySelectorAll(".diffline[data-line], .commitline[data-line]"));
12 }
12 }
13 function clearSel() {
13 function clearSel() {
14 root.querySelectorAll(".picked").forEach(function (el) {
14 root.querySelectorAll(".picked").forEach(function (el) {
@@ -65,8 +65,8 @@
65 if (ev.target.closest("form, button, input, textarea, a, label")) return;
65 if (ev.target.closest("form, button, input, textarea, a, label")) return;
66 var gutter = ev.target.closest(".gutter");
66 var gutter = ev.target.closest(".gutter");
67 if (!gutter || gutter.classList.contains("off")) return;
67 if (!gutter || gutter.classList.contains("off")) return;
68 var row = gutter.closest(".diffline");
68 var row = gutter.closest(".diffline, .commitline");
69 file = gutter.closest(".difffile");
69 file = gutter.closest(".difffile, .commitfile");
70 anchor = Number(row.getAttribute("data-line"));
70 anchor = Number(row.getAttribute("data-line"));
71 dragging = true;
71 dragging = true;
72 form.hidden = true;
72 form.hidden = true;
@@ -78,8 +78,8 @@
78 if (!dragging || !file) return;
78 if (!dragging || !file) return;
79 var el = document.elementFromPoint(ev.clientX, ev.clientY);
79 var el = document.elementFromPoint(ev.clientX, ev.clientY);
80 if (!el) return;
80 if (!el) return;
81 var row = el.closest(".diffline[data-line]");
81 var row = el.closest(".diffline[data-line], .commitline[data-line]");
82 if (!row || row.closest(".difffile") !== file) return;
82 if (!row || row.closest(".difffile, .commitfile") !== file) return;
83 selectFrom(file, anchor, Number(row.getAttribute("data-line")));
83 selectFrom(file, anchor, Number(row.getAttribute("data-line")));
84 });
84 });
85 window.addEventListener("mouseup", function () {
85 window.addEventListener("mouseup", function () {
internal/server/suggest.go +30 −2
@@ -1,6 +1,7 @@
1 1 package server
2 2
3 3 import (
4 "html/template"
4 5 "net/http"
5 6 "os"
6 7 "strconv"
@@ -9,18 +10,39 @@ import (
9 10 "gitlab.com/Timfa/bluegit/internal/access"
10 11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
11 12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 "gitlab.com/Timfa/bluegit/internal/markdown"
12 14 "gitlab.com/Timfa/bluegit/internal/store"
13 15 )
14 16
15 func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
17 func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
16 18 rows := make([]NoteRow, len(notes))
19 index := map[int64]int{}
17 20 for i, n := range notes {
18 21 rows[i] = NoteRow{
19 22 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
20 23 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
21 When: i18n.FormatDate(lang, n.CreatedAt),
24 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
25 HTML: template.HTML(markdown.Render(n.Body, "", "")),
26 }
27 index[n.ID] = i
28 }
29 for i := range rows {
30 parent := rows[i].ParentID
31 if parent == 0 {
32 continue
33 }
34 pi, ok := index[parent]
35 if !ok || rows[pi].ParentID != 0 {
36 rows[i].ParentID = 0
37 continue
22 38 }
39 rows[pi].Replies = append(rows[pi].Replies, rows[i])
23 40 }
41 return rows
42 }
43
44 func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
45 rows := buildNoteRows(notes, lang)
24 46 placed := map[int64]bool{}
25 47 var views []DiffFileView
26 48 for _, f := range files {
@@ -29,6 +51,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)
29 51 row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
30 52 if ln.New > 0 {
31 53 for _, note := range rows {
54 if note.ParentID != 0 {
55 continue
56 }
32 57 if note.Path == f.Path && note.End == ln.New {
33 58 row.Notes = append(row.Notes, note)
34 59 placed[note.ID] = true
@@ -41,6 +66,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)
41 66 }
42 67 var general []NoteRow
43 68 for _, note := range rows {
69 if note.ParentID != 0 {
70 continue
71 }
44 72 if note.Path == "" || !placed[note.ID] {
45 73 general = append(general, note)
46 74 }
@@ -1,6 +1,7 @@
1package server
1package server
2
2
3import (
3import (
4 "html/template"
4 "net/http"
5 "net/http"
5 "os"
6 "os"
6 "strconv"
7 "strconv"
@@ -9,18 +10,39 @@ import (
9 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/access"
10 "gitlab.com/Timfa/bluegit/internal/gitrepo"
11 "gitlab.com/Timfa/bluegit/internal/gitrepo"
11 "gitlab.com/Timfa/bluegit/internal/i18n"
12 "gitlab.com/Timfa/bluegit/internal/i18n"
13 "gitlab.com/Timfa/bluegit/internal/markdown"
12 "gitlab.com/Timfa/bluegit/internal/store"
14 "gitlab.com/Timfa/bluegit/internal/store"
13)
15)
14
16
15func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
17func buildNoteRows(notes []store.Note, lang i18n.Lang) []NoteRow {
16 rows := make([]NoteRow, len(notes))
18 rows := make([]NoteRow, len(notes))
19 index := map[int64]int{}
17 for i, n := range notes {
20 for i, n := range notes {
18 rows[i] = NoteRow{
21 rows[i] = NoteRow{
19 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
22 ID: n.ID, Author: n.Author, Body: n.Body, Path: n.FilePath,
20 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
23 Start: n.LineStart, End: n.LineEnd, HasSuggestion: n.Suggestion != "",
21 When: i18n.FormatDate(lang, n.CreatedAt),
24 When: i18n.FormatDate(lang, n.CreatedAt), At: n.CreatedAt, ParentID: n.ParentID,
25 HTML: template.HTML(markdown.Render(n.Body, "", "")),
26 }
27 index[n.ID] = i
28 }
29 for i := range rows {
30 parent := rows[i].ParentID
31 if parent == 0 {
32 continue
33 }
34 pi, ok := index[parent]
35 if !ok || rows[pi].ParentID != 0 {
36 rows[i].ParentID = 0
37 continue
22 }
38 }
39 rows[pi].Replies = append(rows[pi].Replies, rows[i])
23 }
40 }
41 return rows
42}
43
44func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang) ([]NoteRow, []DiffFileView) {
45 rows := buildNoteRows(notes, lang)
24 placed := map[int64]bool{}
46 placed := map[int64]bool{}
25 var views []DiffFileView
47 var views []DiffFileView
26 for _, f := range files {
48 for _, f := range files {
@@ -29,6 +51,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)
29 row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
51 row := DiffLineView{Kind: ln.Kind, Text: ln.Text, Old: ln.Old, New: ln.New}
30 if ln.New > 0 {
52 if ln.New > 0 {
31 for _, note := range rows {
53 for _, note := range rows {
54 if note.ParentID != 0 {
55 continue
56 }
32 if note.Path == f.Path && note.End == ln.New {
57 if note.Path == f.Path && note.End == ln.New {
33 row.Notes = append(row.Notes, note)
58 row.Notes = append(row.Notes, note)
34 placed[note.ID] = true
59 placed[note.ID] = true
@@ -41,6 +66,9 @@ func arrangeNotes(notes []store.Note, files []gitrepo.DiffFile, lang i18n.Lang)
41 }
66 }
42 var general []NoteRow
67 var general []NoteRow
43 for _, note := range rows {
68 for _, note := range rows {
69 if note.ParentID != 0 {
70 continue
71 }
44 if note.Path == "" || !placed[note.ID] {
72 if note.Path == "" || !placed[note.ID] {
45 general = append(general, note)
73 general = append(general, note)
46 }
74 }
internal/server/templates/branches.html added +109 −0
@@ -0,0 +1,109 @@
1 {{define "branches"}}
2 {{template "layout-start" .}}
3 <header class="pagehead">
4 <h1>{{t "title.branches"}}</h1>
5 {{if .CanWrite}}<button type="button" data-branch-open="create">{{t "branch.create"}}</button>{{end}}
6 </header>
7 <label class="branchsearch">{{t "branch.search"}}
8 <input type="search" data-branch-filter autocomplete="off" placeholder="{{t "branch.search"}}">
9 </label>
10 <table class="branchtable">
11 <thead>
12 <tr>
13 <th>{{t "branch.name"}}</th>
14 <th>{{t "branch.last"}}</th>
15 <th>{{t "branch.compare"}}</th>
16 <th>{{t "mr.pipeline"}}</th>
17 <th>{{t "mr.title"}}</th>
18 <th>{{t "branch.actions"}}</th>
19 </tr>
20 </thead>
21 <tbody>
22 {{range .Branches}}
23 <tr data-branch-row data-name="{{.Name}}">
24 <td>
25 <a href="/{{$.Repo.FullPath}}?rev={{urlquery .Name}}">{{.Name}}</a>
26 {{if .Default}}<span class="pill">{{t "branch.default"}}</span>{{end}}
27 {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
28 </td>
29 <td>
30 {{if .SHA}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a> {{.Subject}} <span class="muted">{{.When}}</span>{{end}}
31 </td>
32 <td class="nums">
33 {{if and (eq .Ahead 0) (eq .Behind 0)}}<span class="muted">{{t "branch.even"}}</span>{{else}}
34 {{if .Ahead}}<span class="addstat">{{t "branch.ahead" .Ahead}}</span>{{end}}
35 {{if .Behind}}<span class="delstat">{{t "branch.behind" .Behind}}</span>{{end}}
36 {{end}}
37 </td>
38 <td>
39 {{if .PipeStatus}}<a class="status {{.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.PipeID}}"><span class="mark"></span>{{.PipeLabel}}</a>{{end}}
40 </td>
41 <td>
42 {{if .MRNumber}}<a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.MRNumber}}">!{{.MRNumber}}</a>{{end}}
43 </td>
44 <td class="branchacts">
45 {{if not .Default}}
46 <a href="/{{$.Repo.FullPath}}/-/compare?from={{urlquery $.Repo.DefaultBranch}}&amp;to={{urlquery .Name}}">{{t "branch.compare"}}</a>
47 <a href="/{{$.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .Name}}&amp;target={{urlquery $.Repo.DefaultBranch}}">{{t "branch.newMR"}}</a>
48 {{end}}
49 {{if and $.CanWrite (not .Default) (not .Protected)}}
50 <button type="button" class="ghost" data-rename="{{.Name}}">{{t "branch.rename"}}</button>
51 <button type="button" class="ghost" data-delete="{{.Name}}">{{t "branch.delete"}}</button>
52 {{end}}
53 </td>
54 </tr>
55 {{else}}
56 <tr><td colspan="6" class="muted">{{t "repo.noBranches"}}</td></tr>
57 {{end}}
58 </tbody>
59 </table>
60 {{if .CanWrite}}
61 <dialog class="branch-dialog" data-branch-dialog="create">
62 <form method="post" action="/{{.Repo.FullPath}}/-/branches">
63 <h2>{{t "branch.create"}}</h2>
64 <input type="hidden" name="csrf" value="{{.CSRF}}">
65 <label>{{t "branch.name"}} <input name="name" required autocomplete="off"></label>
66 <label>{{t "branch.from"}}
67 <input name="from" list="branch-revs" value="{{.Repo.DefaultBranch}}" required>
68 </label>
69 <datalist id="branch-revs">
70 {{range .Branches}}<option value="{{.Name}}"></option>{{end}}
71 {{range .Tags}}<option value="{{.Name}}"></option>{{end}}
72 </datalist>
73 <div class="row">
74 <button type="submit">{{t "branch.create"}}</button>
75 <button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
76 </div>
77 </form>
78 </dialog>
79 <dialog class="branch-dialog" data-branch-dialog="delete">
80 <form method="post" action="/{{.Repo.FullPath}}/-/branches/delete">
81 <h2>{{t "branch.delete"}}</h2>
82 <input type="hidden" name="csrf" value="{{.CSRF}}">
83 <input type="hidden" name="name" value="" data-delete-name>
84 <p data-delete-ask data-pattern="{{t "branch.deleteAsk" "%s"}}"></p>
85 <label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>
86 <div class="row">
87 <button type="submit">{{t "branch.delete"}}</button>
88 <button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
89 </div>
90 </form>
91 </dialog>
92 <dialog class="branch-dialog" data-branch-dialog="rename">
93 <form method="post" action="/{{.Repo.FullPath}}/-/branches/rename">
94 <h2>{{t "branch.rename"}}</h2>
95 <input type="hidden" name="csrf" value="{{.CSRF}}">
96 <input type="hidden" name="name" value="" data-rename-name>
97 <p data-rename-ask data-pattern="{{t "branch.renameAsk" "%s"}}"></p>
98 <label>{{t "branch.name"}} <input name="new_name" required autocomplete="off"></label>
99 <label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>
100 <div class="row">
101 <button type="submit">{{t "branch.rename"}}</button>
102 <button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
103 </div>
104 </form>
105 </dialog>
106 <script src="/assets/branch.js"></script>
107 {{end}}
108 {{template "layout-end" .}}
109 {{end}}
@@ -0,0 +1,109 @@
1{{define "branches"}}
2{{template "layout-start" .}}
3<header class="pagehead">
4 <h1>{{t "title.branches"}}</h1>
5 {{if .CanWrite}}<button type="button" data-branch-open="create">{{t "branch.create"}}</button>{{end}}
6</header>
7<label class="branchsearch">{{t "branch.search"}}
8 <input type="search" data-branch-filter autocomplete="off" placeholder="{{t "branch.search"}}">
9</label>
10<table class="branchtable">
11 <thead>
12 <tr>
13 <th>{{t "branch.name"}}</th>
14 <th>{{t "branch.last"}}</th>
15 <th>{{t "branch.compare"}}</th>
16 <th>{{t "mr.pipeline"}}</th>
17 <th>{{t "mr.title"}}</th>
18 <th>{{t "branch.actions"}}</th>
19 </tr>
20 </thead>
21 <tbody>
22 {{range .Branches}}
23 <tr data-branch-row data-name="{{.Name}}">
24 <td>
25 <a href="/{{$.Repo.FullPath}}?rev={{urlquery .Name}}">{{.Name}}</a>
26 {{if .Default}}<span class="pill">{{t "branch.default"}}</span>{{end}}
27 {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}
28 </td>
29 <td>
30 {{if .SHA}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a> {{.Subject}} <span class="muted">{{.When}}</span>{{end}}
31 </td>
32 <td class="nums">
33 {{if and (eq .Ahead 0) (eq .Behind 0)}}<span class="muted">{{t "branch.even"}}</span>{{else}}
34 {{if .Ahead}}<span class="addstat">{{t "branch.ahead" .Ahead}}</span>{{end}}
35 {{if .Behind}}<span class="delstat">{{t "branch.behind" .Behind}}</span>{{end}}
36 {{end}}
37 </td>
38 <td>
39 {{if .PipeStatus}}<a class="status {{.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.PipeID}}"><span class="mark"></span>{{.PipeLabel}}</a>{{end}}
40 </td>
41 <td>
42 {{if .MRNumber}}<a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.MRNumber}}">!{{.MRNumber}}</a>{{end}}
43 </td>
44 <td class="branchacts">
45 {{if not .Default}}
46 <a href="/{{$.Repo.FullPath}}/-/compare?from={{urlquery $.Repo.DefaultBranch}}&amp;to={{urlquery .Name}}">{{t "branch.compare"}}</a>
47 <a href="/{{$.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .Name}}&amp;target={{urlquery $.Repo.DefaultBranch}}">{{t "branch.newMR"}}</a>
48 {{end}}
49 {{if and $.CanWrite (not .Default) (not .Protected)}}
50 <button type="button" class="ghost" data-rename="{{.Name}}">{{t "branch.rename"}}</button>
51 <button type="button" class="ghost" data-delete="{{.Name}}">{{t "branch.delete"}}</button>
52 {{end}}
53 </td>
54 </tr>
55 {{else}}
56 <tr><td colspan="6" class="muted">{{t "repo.noBranches"}}</td></tr>
57 {{end}}
58 </tbody>
59</table>
60{{if .CanWrite}}
61<dialog class="branch-dialog" data-branch-dialog="create">
62 <form method="post" action="/{{.Repo.FullPath}}/-/branches">
63 <h2>{{t "branch.create"}}</h2>
64 <input type="hidden" name="csrf" value="{{.CSRF}}">
65 <label>{{t "branch.name"}} <input name="name" required autocomplete="off"></label>
66 <label>{{t "branch.from"}}
67 <input name="from" list="branch-revs" value="{{.Repo.DefaultBranch}}" required>
68 </label>
69 <datalist id="branch-revs">
70 {{range .Branches}}<option value="{{.Name}}"></option>{{end}}
71 {{range .Tags}}<option value="{{.Name}}"></option>{{end}}
72 </datalist>
73 <div class="row">
74 <button type="submit">{{t "branch.create"}}</button>
75 <button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
76 </div>
77 </form>
78</dialog>
79<dialog class="branch-dialog" data-branch-dialog="delete">
80 <form method="post" action="/{{.Repo.FullPath}}/-/branches/delete">
81 <h2>{{t "branch.delete"}}</h2>
82 <input type="hidden" name="csrf" value="{{.CSRF}}">
83 <input type="hidden" name="name" value="" data-delete-name>
84 <p data-delete-ask data-pattern="{{t "branch.deleteAsk" "%s"}}"></p>
85 <label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>
86 <div class="row">
87 <button type="submit">{{t "branch.delete"}}</button>
88 <button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
89 </div>
90 </form>
91</dialog>
92<dialog class="branch-dialog" data-branch-dialog="rename">
93 <form method="post" action="/{{.Repo.FullPath}}/-/branches/rename">
94 <h2>{{t "branch.rename"}}</h2>
95 <input type="hidden" name="csrf" value="{{.CSRF}}">
96 <input type="hidden" name="name" value="" data-rename-name>
97 <p data-rename-ask data-pattern="{{t "branch.renameAsk" "%s"}}"></p>
98 <label>{{t "branch.name"}} <input name="new_name" required autocomplete="off"></label>
99 <label>{{t "branch.confirm"}} <input name="confirm" required autocomplete="off"></label>
100 <div class="row">
101 <button type="submit">{{t "branch.rename"}}</button>
102 <button type="button" class="ghost" data-dialog-close>{{t "action.cancel"}}</button>
103 </div>
104 </form>
105</dialog>
106<script src="/assets/branch.js"></script>
107{{end}}
108{{template "layout-end" .}}
109{{end}}
internal/server/templates/collab.html +101 −78
@@ -1,28 +1,22 @@
1 1 {{define "mrs"}}
2 2 {{template "layout-start" .}}
3 3 <header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
4 {{if .CanWrite}}<p class="pageacts"><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new">{{t "mr.create"}}</a></p>{{end}}
4 5 <ul class="clean">
5 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
6 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span>{{if .Draft}} <span class="pill">{{t "mr.draft"}}</span>{{end}} <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
6 7 </ul>
7 {{if .CanWrite}}
8 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
9 <h2>{{t "mr.new"}}</h2>
10 <input type="hidden" name="csrf" value="{{.CSRF}}">
11 <label>{{t "mr.titleField"}} <input name="title" required></label>
12 <label>{{t "mr.description"}} <textarea name="description"></textarea></label>
13 <label>{{t "mr.source"}} <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
14 <label>{{t "mr.target"}} <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15 <button type="submit">{{t "action.open"}}</button>
16 </form>
17 {{end}}
18 8 {{template "layout-end" .}}
19 9 {{end}}
20 10
21 11 {{define "mr"}}
22 12 {{template "layout-start" .}}
23 13 <header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>
24 <p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>
25 {{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}
14 <p>
15 <span class="pill">{{.MR.Status}}</span>
16 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
17 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
18 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}
19 </p>
26 20 <h2>{{t "mr.pipeline"}}</h2>
27 21 {{if .MRPipe}}
28 22 {{$pipe := .MRPipe}}
@@ -44,8 +38,6 @@
44 38 </div>
45 39 </div>
46 40 {{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
47 <h2>{{t "mr.commits"}}</h2>
48 <pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
49 41 {{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
50 42 {{if .CanMerge}}
51 43 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
@@ -81,76 +73,107 @@
81 73 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
82 74 </form>
83 75 {{end}}
84 <h2>{{t "mr.changes"}}</h2>
85 {{if .CanApply}}
86 <div class="applybar" hidden data-apply-bar>
87 <button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
88 </div>
89 <dialog class="sugmodal" data-apply-dialog>
90 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
76 <p class="sub">
77 <a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>
78 <a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}</a>
79 <a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}</a>
80 <a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}</a>
81 </p>
82 <section{{if ne .Tab "overview"}} hidden{{end}}>
83 {{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}
84 {{if .CanEditMR}}
85 <details class="panel">
86 <summary>{{t "mr.edit"}}</summary>
87 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}">
88 <input type="hidden" name="csrf" value="{{.CSRF}}">
89 <label>{{t "mr.titleField"}} <input name="title" value="{{.MR.Title}}" required></label>
90 <label>{{t "mr.description"}} <textarea name="description">{{.MR.Description}}</textarea></label>
91 <label>{{t "mr.labels"}} <input name="labels" value="{{.MR.Labels}}"> <span class="muted">{{t "mr.labelsHint"}}</span></label>
92 <button type="submit">{{t "mr.save"}}</button>
93 </form>
94 </details>
95 {{end}}
96 <h2>{{t "mr.timeline"}}</h2>
97 <ol class="timeline">
98 {{range .Timeline}}
99 <li>
100 {{if .Actor}}<strong>{{.Actor}}</strong>{{end}}
101 {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
102 <span class="muted">{{.When}}</span>
103 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
104 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
105 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
106 {{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button>{{end}}
107 </li>
108 {{end}}
109 </ol>
110 {{if .CanComment}}
111 <form id="comment-form" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
91 112 <input type="hidden" name="csrf" value="{{.CSRF}}">
92 <div data-apply-ids></div>
93 <h2>{{t "sug.applyWord"}}</h2>
94 <label>{{t "sug.title"}} <input name="title" required></label>
95 <label>{{t "sug.description"}} <textarea name="description"></textarea></label>
96 <p class="muted">{{t "sug.optional"}}</p>
97 <div class="row">
98 <button type="submit">{{t "sug.submit"}}</button>
99 <button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
100 </div>
113 <input type="hidden" name="parent" value="" data-reply-parent>
114 <p class="muted" hidden data-reply-label></p>
115 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
116 <button type="submit">{{t "action.post"}}</button>
101 117 </form>
102 </dialog>
103 {{end}}
104 <div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
105 {{range .DiffFiles}}
106 <section class="difffile" data-path="{{.Path}}">
107 <header>{{.Path}}</header>
108 {{range .Lines}}
109 <div class="diffline kind-{{.Kind}}"{{if .New}} data-line="{{.New}}"{{end}}>
110 <span class="gutter{{if not .New}} off{{end}}"></span>
111 <span class="ln">{{if .New}}{{.New}}{{else if .Old}}{{.Old}}{{end}}</span>
112 <code>{{.Text}}</code>
118 {{end}}
119 </section>
120 <section{{if ne .Tab "commits"}} hidden{{end}}>
121 <h2>{{t "mr.commits"}}</h2>
122 <ul class="clean">
123 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code> {{.Author}}</span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}
124 </ul>
125 </section>
126 <section{{if ne .Tab "pipelines"}} hidden{{end}}>
127 <h2>{{t "mr.pipelines"}}</h2>
128 {{if .PipeRows}}
129 <ul class="clean">
130 {{range .PipeRows}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span></li>{{end}}
131 </ul>
132 {{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
133 </section>
134 <section{{if ne .Tab "changes"}} hidden{{end}}>
135 <h2>{{t "mr.changes"}}</h2>
136 {{if .CanApply}}
137 <div class="applybar" hidden data-apply-bar>
138 <button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
113 139 </div>
114 {{range .Notes}}
115 <article class="linenote" id="note-{{.ID}}">
116 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
117 <div class="muted">{{.Path}}:{{.Start}}-{{.End}}</div>
118 <pre class="note">{{.Body}}</pre>
119 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
120 </article>
140 <dialog class="sugmodal" data-apply-dialog>
141 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
142 <input type="hidden" name="csrf" value="{{.CSRF}}">
143 <div data-apply-ids></div>
144 <h2>{{t "sug.applyWord"}}</h2>
145 <label>{{t "sug.title"}} <input name="title" required></label>
146 <label>{{t "sug.description"}} <textarea name="description"></textarea></label>
147 <p class="muted">{{t "sug.optional"}}</p>
148 <div class="row">
149 <button type="submit">{{t "sug.submit"}}</button>
150 <button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
151 </div>
152 </form>
153 </dialog>
121 154 {{end}}
155 <div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
156 {{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
157 {{if .CanComment}}
158 <form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
159 <input type="hidden" name="csrf" value="{{.CSRF}}">
160 <input type="hidden" name="path" value="">
161 <input type="hidden" name="line_start" value="">
162 <input type="hidden" name="line_end" value="">
163 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
164 <p class="muted">{{t "sug.hint"}}</p>
165 <div class="row">
166 <button type="submit">{{t "action.post"}}</button>
167 <button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
168 </div>
169 </form>
170 <button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
122 171 {{end}}
123 </section>
124 {{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
125 {{if .CanComment}}
126 <form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
127 <input type="hidden" name="csrf" value="{{.CSRF}}">
128 <input type="hidden" name="path" value="">
129 <input type="hidden" name="line_start" value="">
130 <input type="hidden" name="line_end" value="">
131 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
132 <p class="muted">{{t "sug.hint"}}</p>
133 <div class="row">
134 <button type="submit">{{t "action.post"}}</button>
135 <button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
136 172 </div>
137 </form>
138 <button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
139 {{end}}
140 </div>
141 <h2>{{t "mr.comments"}}</h2>
142 <ul class="clean">
143 {{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}}
144 </ul>
145 {{if .CanComment}}
146 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
147 <input type="hidden" name="csrf" value="{{.CSRF}}">
148 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
149 <button type="submit">{{t "action.post"}}</button>
150 </form>
151 {{end}}
173 </section>
152 174 <script src="/assets/suggest.js"></script>
153 175 <script src="/assets/pipeline.js"></script>
176 <script src="/assets/mr.js"></script>
154 177 {{template "layout-end" .}}
155 178 {{end}}
156 179
@@ -1,28 +1,22 @@
1{{define "mrs"}}
1{{define "mrs"}}
2{{template "layout-start" .}}
2{{template "layout-start" .}}
3<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
3<header class="pagehead"><h1>{{t "mr.title"}}</h1></header>
4{{if .CanWrite}}<p class="pageacts"><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new">{{t "mr.create"}}</a></p>{{end}}
4<ul class="clean">
5<ul class="clean">
5 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
6 {{range .MRs}}<li><a href="/{{$.Repo.FullPath}}/-/merge-requests/{{.Number}}">!{{.Number}} {{.Title}}</a> <span class="pill">{{.Status}}</span>{{if .Draft}} <span class="pill">{{t "mr.draft"}}</span>{{end}} <span class="muted">{{.SourceBranch}} → {{.TargetBranch}}</span></li>{{else}}<li class="muted">{{t "mr.none"}}</li>{{end}}
6</ul>
7</ul>
7{{if .CanWrite}}
8<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
9 <h2>{{t "mr.new"}}</h2>
10 <input type="hidden" name="csrf" value="{{.CSRF}}">
11 <label>{{t "mr.titleField"}} <input name="title" required></label>
12 <label>{{t "mr.description"}} <textarea name="description"></textarea></label>
13 <label>{{t "mr.source"}} <select name="source">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
14 <label>{{t "mr.target"}} <select name="target">{{range .Branches}}<option>{{.Name}}</option>{{end}}</select></label>
15 <button type="submit">{{t "action.open"}}</button>
16</form>
17{{end}}
18{{template "layout-end" .}}
8{{template "layout-end" .}}
19{{end}}
9{{end}}
20
10
21{{define "mr"}}
11{{define "mr"}}
22{{template "layout-start" .}}
12{{template "layout-start" .}}
23<header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>
13<header class="pagehead"><h1>!{{.MR.Number}} {{.MR.Title}}</h1></header>
24<p><span class="pill">{{.MR.Status}}</span> {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}</p>
14<p>
25{{if .MR.Description}}<pre>{{.MR.Description}}</pre>{{end}}
15 <span class="pill">{{.MR.Status}}</span>
16 {{if .MR.Draft}}<span class="pill">{{t "mr.draft"}}</span>{{end}}
17 {{range .Labels}}<span class="pill">{{.}}</span>{{end}}
18 {{.MR.SourceBranch}} → {{.MR.TargetBranch}} · {{.MR.Author}}
19</p>
26<h2>{{t "mr.pipeline"}}</h2>
20<h2>{{t "mr.pipeline"}}</h2>
27{{if .MRPipe}}
21{{if .MRPipe}}
28{{$pipe := .MRPipe}}
22{{$pipe := .MRPipe}}
@@ -44,8 +38,6 @@
44 </div>
38 </div>
45</div>
39</div>
46{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
40{{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
47<h2>{{t "mr.commits"}}</h2>
48<pre>{{if .Diff}}{{.Diff}}{{else}}{{t "mr.noDiff"}}{{end}}</pre>
49{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
41{{range .MergeBlocks}}<p class="flash bad">{{.}}</p>{{end}}
50{{if .CanMerge}}
42{{if .CanMerge}}
51<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
43<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/merge">
@@ -81,76 +73,107 @@
81 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
73 <button class="ghost" type="submit" name="status" value="rejected">{{t "rev.rejected"}}</button>
82</form>
74</form>
83{{end}}
75{{end}}
84<h2>{{t "mr.changes"}}</h2>
76<p class="sub">
85{{if .CanApply}}
77 <a href="?tab=overview"{{if eq .Tab "overview"}} class="on"{{end}}>{{t "mr.overview"}}</a>
86<div class="applybar" hidden data-apply-bar>
78 <a href="?tab=commits"{{if eq .Tab "commits"}} class="on"{{end}}>{{t "mr.commits"}}</a>
87 <button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
79 <a href="?tab=pipelines"{{if eq .Tab "pipelines"}} class="on"{{end}}>{{t "mr.pipelines"}}</a>
88</div>
80 <a href="?tab=changes"{{if eq .Tab "changes"}} class="on"{{end}}>{{t "mr.changes"}}</a>
89<dialog class="sugmodal" data-apply-dialog>
81</p>
90 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
82<section{{if ne .Tab "overview"}} hidden{{end}}>
83 {{if .MR.Description}}<div class="mdbody">{{.DescHTML}}</div>{{end}}
84 {{if .CanEditMR}}
85 <details class="panel">
86 <summary>{{t "mr.edit"}}</summary>
87 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}">
88 <input type="hidden" name="csrf" value="{{.CSRF}}">
89 <label>{{t "mr.titleField"}} <input name="title" value="{{.MR.Title}}" required></label>
90 <label>{{t "mr.description"}} <textarea name="description">{{.MR.Description}}</textarea></label>
91 <label>{{t "mr.labels"}} <input name="labels" value="{{.MR.Labels}}"> <span class="muted">{{t "mr.labelsHint"}}</span></label>
92 <button type="submit">{{t "mr.save"}}</button>
93 </form>
94 </details>
95 {{end}}
96 <h2>{{t "mr.timeline"}}</h2>
97 <ol class="timeline">
98 {{range .Timeline}}
99 <li>
100 {{if .Actor}}<strong>{{.Actor}}</strong>{{end}}
101 {{if .URL}}<a href="{{.URL}}">{{.Text}}</a>{{else}}{{.Text}}{{end}}
102 <span class="muted">{{.When}}</span>
103 {{if .Body}}<pre class="pushlist">{{.Body}}</pre>{{end}}
104 {{if .HTML}}<div class="mdbody">{{.HTML}}</div>{{end}}
105 {{range .Replies}}<div class="reply"><strong>{{.Actor}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
106 {{if and (eq .Kind "comment") $.CanComment}}<button type="button" class="ghost" data-reply="{{.ID}}" data-reply-name="{{.Actor}}">{{t "mr.reply"}}</button>{{end}}
107 </li>
108 {{end}}
109 </ol>
110 {{if .CanComment}}
111 <form id="comment-form" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
91 <input type="hidden" name="csrf" value="{{.CSRF}}">
112 <input type="hidden" name="csrf" value="{{.CSRF}}">
92 <div data-apply-ids></div>
113 <input type="hidden" name="parent" value="" data-reply-parent>
93 <h2>{{t "sug.applyWord"}}</h2>
114 <p class="muted" hidden data-reply-label></p>
94 <label>{{t "sug.title"}} <input name="title" required></label>
115 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
95 <label>{{t "sug.description"}} <textarea name="description"></textarea></label>
116 <button type="submit">{{t "action.post"}}</button>
96 <p class="muted">{{t "sug.optional"}}</p>
97 <div class="row">
98 <button type="submit">{{t "sug.submit"}}</button>
99 <button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
100 </div>
101 </form>
117 </form>
102</dialog>
118 {{end}}
103{{end}}
119</section>
104<div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
120<section{{if ne .Tab "commits"}} hidden{{end}}>
105{{range .DiffFiles}}
121 <h2>{{t "mr.commits"}}</h2>
106<section class="difffile" data-path="{{.Path}}">
122 <ul class="clean">
107 <header>{{.Path}}</header>
123 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code> {{.Author}}</span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}
108 {{range .Lines}}
124 </ul>
109 <div class="diffline kind-{{.Kind}}"{{if .New}} data-line="{{.New}}"{{end}}>
125</section>
110 <span class="gutter{{if not .New}} off{{end}}"></span>
126<section{{if ne .Tab "pipelines"}} hidden{{end}}>
111 <span class="ln">{{if .New}}{{.New}}{{else if .Old}}{{.Old}}{{end}}</span>
127 <h2>{{t "mr.pipelines"}}</h2>
112 <code>{{.Text}}</code>
128 {{if .PipeRows}}
129 <ul class="clean">
130 {{range .PipeRows}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a> <span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span></li>{{end}}
131 </ul>
132 {{else}}<p class="muted">{{t "mr.noPipeline"}}</p>{{end}}
133</section>
134<section{{if ne .Tab "changes"}} hidden{{end}}>
135 <h2>{{t "mr.changes"}}</h2>
136 {{if .CanApply}}
137 <div class="applybar" hidden data-apply-bar>
138 <button type="button" data-apply-open>{{t "sug.applyWord"}} (<span data-apply-count>0</span>)</button>
113 </div>
139 </div>
114 {{range .Notes}}
140 <dialog class="sugmodal" data-apply-dialog>
115 <article class="linenote" id="note-{{.ID}}">
141 <form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/suggestions">
116 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
142 <input type="hidden" name="csrf" value="{{.CSRF}}">
117 <div class="muted">{{.Path}}:{{.Start}}-{{.End}}</div>
143 <div data-apply-ids></div>
118 <pre class="note">{{.Body}}</pre>
144 <h2>{{t "sug.applyWord"}}</h2>
119 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
145 <label>{{t "sug.title"}} <input name="title" required></label>
120 </article>
146 <label>{{t "sug.description"}} <textarea name="description"></textarea></label>
147 <p class="muted">{{t "sug.optional"}}</p>
148 <div class="row">
149 <button type="submit">{{t "sug.submit"}}</button>
150 <button type="button" class="ghost" data-apply-cancel>{{t "action.cancel"}}</button>
151 </div>
152 </form>
153 </dialog>
121 {{end}}
154 {{end}}
155 <div class="diff"{{if .CanComment}} data-can-comment="1"{{end}}>
156 {{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
157 {{if .CanComment}}
158 <form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
159 <input type="hidden" name="csrf" value="{{.CSRF}}">
160 <input type="hidden" name="path" value="">
161 <input type="hidden" name="line_start" value="">
162 <input type="hidden" name="line_end" value="">
163 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
164 <p class="muted">{{t "sug.hint"}}</p>
165 <div class="row">
166 <button type="submit">{{t "action.post"}}</button>
167 <button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
168 </div>
169 </form>
170 <button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
122 {{end}}
171 {{end}}
123</section>
124{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
125{{if .CanComment}}
126<form class="lineform" method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes" hidden data-line-form>
127 <input type="hidden" name="csrf" value="{{.CSRF}}">
128 <input type="hidden" name="path" value="">
129 <input type="hidden" name="line_start" value="">
130 <input type="hidden" name="line_end" value="">
131 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
132 <p class="muted">{{t "sug.hint"}}</p>
133 <div class="row">
134 <button type="submit">{{t "action.post"}}</button>
135 <button type="button" class="ghost" data-line-cancel>{{t "action.cancel"}}</button>
136 </div>
172 </div>
137</form>
173</section>
138<button type="button" class="bubble" hidden data-bubble aria-label="{{t "sug.bubble"}}"><span class="bubble-icon"></span></button>
139{{end}}
140</div>
141<h2>{{t "mr.comments"}}</h2>
142<ul class="clean">
143 {{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}}
144</ul>
145{{if .CanComment}}
146<form method="post" action="/{{.Repo.FullPath}}/-/merge-requests/{{.MR.Number}}/notes">
147 <input type="hidden" name="csrf" value="{{.CSRF}}">
148 <label>{{t "mr.comment"}} <textarea name="body" required></textarea></label>
149 <button type="submit">{{t "action.post"}}</button>
150</form>
151{{end}}
152<script src="/assets/suggest.js"></script>
174<script src="/assets/suggest.js"></script>
153<script src="/assets/pipeline.js"></script>
175<script src="/assets/pipeline.js"></script>
176<script src="/assets/mr.js"></script>
154{{template "layout-end" .}}
177{{template "layout-end" .}}
155{{end}}
178{{end}}
156
179
internal/server/templates/commit.html added +118 −0
@@ -0,0 +1,118 @@
1 {{define "commit"}}
2 {{template "layout-start" .}}
3 <article class="commitpage">
4 <header class="commithead"><h1>{{.Commit.Subject}}</h1></header>
5 {{if .Commit.Body}}<pre class="commitmsg">{{.Commit.Body}}</pre>{{end}}
6 <section class="card commitmeta">
7 <div class="projhead">
8 {{template "avatar" .Commit}}
9 <div>
10 <p>{{template "commitwho" .Commit}}</p>
11 <p class="muted">{{t "commit.authored"}} {{.Commit.Date}}{{if .Commit.When}} · {{.Commit.When}}{{end}}</p>
12 </div>
13 </div>
14 <dl class="commitfacts">
15 <div>
16 <dt>{{t "commit.sha"}}</dt>
17 <dd><code class="sha">{{.Commit.SHA}}</code> <button type="button" class="iconbtn" data-copy="{{.Commit.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button></dd>
18 </div>
19 {{if .CommitDiff.Parents}}
20 <div>
21 <dt>{{if eq (len .CommitDiff.Parents) 1}}{{t "commit.parent"}}{{else}}{{t "commit.parents"}}{{end}}</dt>
22 <dd class="parents">{{range .CommitDiff.Parents}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a>{{end}}</dd>
23 </div>
24 {{end}}
25 {{if .Commit.PipeStatus}}
26 <div>
27 <dt>{{t "pipe.one"}}</dt>
28 <dd><a class="status {{.Commit.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Commit.PipeID}}"><span class="mark"></span>{{.Commit.PipeLabel}}</a></dd>
29 </div>
30 {{end}}
31 </dl>
32 </section>
33 {{if not .CommitDiff.Files}}
34 <p class="muted">{{t "commit.empty"}}</p>
35 {{else}}
36 {{template "repodiff" .}}
37 {{end}}
38 </article>
39 <script src="/assets/repo.js"></script>
40 {{template "layout-end" .}}
41 {{end}}
42
43 {{define "repodiff"}}
44 <div class="commitdiff" id="commitdiff" data-commit-diff data-mode="inline">
45 <script src="/assets/commit-mode.js"></script>
46 <div class="commitbar diffbar">
47 <div class="grow">
48 <strong>{{tn .CommitDiff.FilesN "commit.file.one" "commit.file.many"}}</strong>
49 <span class="addstat">+{{.CommitDiff.Added}}</span>
50 <span class="delstat">−{{.CommitDiff.Deleted}}</span>
51 </div>
52 <div class="diffswitch" role="group" aria-label="{{t "commit.view"}}">
53 <button type="button" data-diff-mode="inline" aria-pressed="true">{{t "commit.inline"}}</button>
54 <button type="button" data-diff-mode="side" aria-pressed="false">{{t "commit.side"}}</button>
55 </div>
56 </div>
57 <div class="commitlayout">
58 <nav class="commitfiles" aria-label="{{t "commit.changed"}}">
59 <h2>{{t "commit.changed"}}</h2>
60 <ul>
61 {{range .CommitDiff.Tree}}
62 <li class="d{{.Depth}}">
63 {{if .Dir}}{{template "ficon" .Icon}}<span>{{.Name}}</span>{{else}}<a href="#{{.Anchor}}" data-diff-link="{{.Anchor}}">{{template "ficon" .Icon}}<span class="name">{{.Name}}</span></a> <span class="addstat">+{{.Added}}</span><span class="delstat">−{{.Deleted}}</span>{{end}}
64 </li>
65 {{end}}
66 </ul>
67 </nav>
68 <div class="commitdiffs">
69 {{range .CommitDiff.Files}}
70 <section class="commitfile" id="{{.Anchor}}" data-path="{{.Path}}" data-collapsed="{{if .Collapsed}}1{{else}}0{{end}}">
71 <header>
72 {{if .HasBody}}<button type="button" class="ghost" data-toggle-diff data-show="{{t "commit.show"}}" data-hide="{{t "commit.hide"}}" aria-expanded="{{if .Collapsed}}false{{else}}true{{end}}">{{if .Collapsed}}{{t "commit.show"}}{{else}}{{t "commit.hide"}}{{end}}</button>{{end}}
73 <span class="path">{{if .OldPath}}<span class="oldpath">{{.OldPath}}</span> <span aria-hidden="true">→</span> {{end}}{{if .FileURL}}<a href="{{.FileURL}}">{{.Path}}</a>{{else}}{{.Path}}{{end}}</span>
74 {{if eq .Status "added"}}<span class="pill">{{t "commit.added"}}</span>{{else if eq .Status "deleted"}}<span class="pill">{{t "commit.deleted"}}</span>{{else if eq .Status "renamed"}}<span class="pill">{{t "commit.renamed"}}</span>{{end}}
75 {{if .Binary}}<span class="pill">{{t "commit.binary"}}</span>{{end}}
76 <span class="counts"><span class="addstat">+{{.Added}}</span> <span class="delstat">−{{.Deleted}}</span></span>
77 </header>
78 {{if .HasBody}}
79 <div class="diffbody">
80 {{if .Binary}}<p class="muted binaryhint">{{t "commit.binaryHint"}}</p>{{else}}
81 <div class="unified">
82 {{range .Lines}}
83 <div class="commitline kind-{{.Kind}}{{if and $.CanComment (ne .Kind "hunk")}} with-gutter{{end}}"{{if and $.CanComment .New}} data-line="{{.New}}"{{end}}>
84 {{if and $.CanComment (ne .Kind "hunk")}}<span class="gutter{{if not .New}} off{{end}}"></span>{{end}}
85 <span class="ln">{{if .Old}}{{.Old}}{{end}}</span>
86 <span class="ln">{{if .New}}{{.New}}{{end}}</span>
87 <code>{{.HTML}}</code>
88 </div>
89 {{if $.CanComment}}{{range .Notes}}
90 <article class="linenote" id="note-{{.ID}}">
91 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
92 <div class="mdbody">{{.HTML}}</div>
93 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
94 {{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
95 </article>
96 {{end}}{{end}}
97 {{end}}
98 </div>
99 <div class="split">
100 {{range .Pairs}}
101 {{if .Hunk}}<div class="commitline kind-hunk"><code>{{.Hunk}}</code></div>{{else}}
102 <div class="pair">
103 <div class="half kind-{{if .LKind}}{{.LKind}}{{else}}empty{{end}}"><span class="ln">{{if .LNo}}{{.LNo}}{{end}}</span><code>{{.LHTML}}</code></div>
104 <div class="half kind-{{if .RKind}}{{.RKind}}{{else}}empty{{end}}"><span class="ln">{{if .RNo}}{{.RNo}}{{end}}</span><code>{{.RHTML}}</code></div>
105 </div>
106 {{end}}
107 {{end}}
108 </div>
109 {{end}}
110 </div>
111 {{end}}
112 </section>
113 {{end}}
114 </div>
115 </div>
116 </div>
117 <script src="/assets/commit.js"></script>
118 {{end}}
@@ -0,0 +1,118 @@
1{{define "commit"}}
2{{template "layout-start" .}}
3<article class="commitpage">
4<header class="commithead"><h1>{{.Commit.Subject}}</h1></header>
5{{if .Commit.Body}}<pre class="commitmsg">{{.Commit.Body}}</pre>{{end}}
6<section class="card commitmeta">
7 <div class="projhead">
8 {{template "avatar" .Commit}}
9 <div>
10 <p>{{template "commitwho" .Commit}}</p>
11 <p class="muted">{{t "commit.authored"}} {{.Commit.Date}}{{if .Commit.When}} · {{.Commit.When}}{{end}}</p>
12 </div>
13 </div>
14 <dl class="commitfacts">
15 <div>
16 <dt>{{t "commit.sha"}}</dt>
17 <dd><code class="sha">{{.Commit.SHA}}</code> <button type="button" class="iconbtn" data-copy="{{.Commit.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button></dd>
18 </div>
19 {{if .CommitDiff.Parents}}
20 <div>
21 <dt>{{if eq (len .CommitDiff.Parents) 1}}{{t "commit.parent"}}{{else}}{{t "commit.parents"}}{{end}}</dt>
22 <dd class="parents">{{range .CommitDiff.Parents}}<a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><code>{{.Short}}</code></a>{{end}}</dd>
23 </div>
24 {{end}}
25 {{if .Commit.PipeStatus}}
26 <div>
27 <dt>{{t "pipe.one"}}</dt>
28 <dd><a class="status {{.Commit.PipeStatus}}" href="/{{$.Repo.FullPath}}/-/pipelines/{{.Commit.PipeID}}"><span class="mark"></span>{{.Commit.PipeLabel}}</a></dd>
29 </div>
30 {{end}}
31 </dl>
32</section>
33{{if not .CommitDiff.Files}}
34<p class="muted">{{t "commit.empty"}}</p>
35{{else}}
36{{template "repodiff" .}}
37{{end}}
38</article>
39<script src="/assets/repo.js"></script>
40{{template "layout-end" .}}
41{{end}}
42
43{{define "repodiff"}}
44<div class="commitdiff" id="commitdiff" data-commit-diff data-mode="inline">
45<script src="/assets/commit-mode.js"></script>
46<div class="commitbar diffbar">
47 <div class="grow">
48 <strong>{{tn .CommitDiff.FilesN "commit.file.one" "commit.file.many"}}</strong>
49 <span class="addstat">+{{.CommitDiff.Added}}</span>
50 <span class="delstat">−{{.CommitDiff.Deleted}}</span>
51 </div>
52 <div class="diffswitch" role="group" aria-label="{{t "commit.view"}}">
53 <button type="button" data-diff-mode="inline" aria-pressed="true">{{t "commit.inline"}}</button>
54 <button type="button" data-diff-mode="side" aria-pressed="false">{{t "commit.side"}}</button>
55 </div>
56</div>
57<div class="commitlayout">
58 <nav class="commitfiles" aria-label="{{t "commit.changed"}}">
59 <h2>{{t "commit.changed"}}</h2>
60 <ul>
61 {{range .CommitDiff.Tree}}
62 <li class="d{{.Depth}}">
63 {{if .Dir}}{{template "ficon" .Icon}}<span>{{.Name}}</span>{{else}}<a href="#{{.Anchor}}" data-diff-link="{{.Anchor}}">{{template "ficon" .Icon}}<span class="name">{{.Name}}</span></a> <span class="addstat">+{{.Added}}</span><span class="delstat">−{{.Deleted}}</span>{{end}}
64 </li>
65 {{end}}
66 </ul>
67 </nav>
68 <div class="commitdiffs">
69 {{range .CommitDiff.Files}}
70 <section class="commitfile" id="{{.Anchor}}" data-path="{{.Path}}" data-collapsed="{{if .Collapsed}}1{{else}}0{{end}}">
71 <header>
72 {{if .HasBody}}<button type="button" class="ghost" data-toggle-diff data-show="{{t "commit.show"}}" data-hide="{{t "commit.hide"}}" aria-expanded="{{if .Collapsed}}false{{else}}true{{end}}">{{if .Collapsed}}{{t "commit.show"}}{{else}}{{t "commit.hide"}}{{end}}</button>{{end}}
73 <span class="path">{{if .OldPath}}<span class="oldpath">{{.OldPath}}</span> <span aria-hidden="true">→</span> {{end}}{{if .FileURL}}<a href="{{.FileURL}}">{{.Path}}</a>{{else}}{{.Path}}{{end}}</span>
74 {{if eq .Status "added"}}<span class="pill">{{t "commit.added"}}</span>{{else if eq .Status "deleted"}}<span class="pill">{{t "commit.deleted"}}</span>{{else if eq .Status "renamed"}}<span class="pill">{{t "commit.renamed"}}</span>{{end}}
75 {{if .Binary}}<span class="pill">{{t "commit.binary"}}</span>{{end}}
76 <span class="counts"><span class="addstat">+{{.Added}}</span> <span class="delstat">−{{.Deleted}}</span></span>
77 </header>
78 {{if .HasBody}}
79 <div class="diffbody">
80 {{if .Binary}}<p class="muted binaryhint">{{t "commit.binaryHint"}}</p>{{else}}
81 <div class="unified">
82 {{range .Lines}}
83 <div class="commitline kind-{{.Kind}}{{if and $.CanComment (ne .Kind "hunk")}} with-gutter{{end}}"{{if and $.CanComment .New}} data-line="{{.New}}"{{end}}>
84 {{if and $.CanComment (ne .Kind "hunk")}}<span class="gutter{{if not .New}} off{{end}}"></span>{{end}}
85 <span class="ln">{{if .Old}}{{.Old}}{{end}}</span>
86 <span class="ln">{{if .New}}{{.New}}{{end}}</span>
87 <code>{{.HTML}}</code>
88 </div>
89 {{if $.CanComment}}{{range .Notes}}
90 <article class="linenote" id="note-{{.ID}}">
91 <strong>{{.Author}}</strong> <span class="muted">{{.When}}</span>
92 <div class="mdbody">{{.HTML}}</div>
93 {{if and $.CanApply .HasSuggestion}}<label class="sugcheck"><input type="checkbox" data-suggestion="{{.ID}}"> {{t "sug.include"}}</label>{{end}}
94 {{range .Replies}}<div class="reply"><strong>{{.Author}}</strong> <span class="muted">{{.When}}</span><div class="mdbody">{{.HTML}}</div></div>{{end}}
95 </article>
96 {{end}}{{end}}
97 {{end}}
98 </div>
99 <div class="split">
100 {{range .Pairs}}
101 {{if .Hunk}}<div class="commitline kind-hunk"><code>{{.Hunk}}</code></div>{{else}}
102 <div class="pair">
103 <div class="half kind-{{if .LKind}}{{.LKind}}{{else}}empty{{end}}"><span class="ln">{{if .LNo}}{{.LNo}}{{end}}</span><code>{{.LHTML}}</code></div>
104 <div class="half kind-{{if .RKind}}{{.RKind}}{{else}}empty{{end}}"><span class="ln">{{if .RNo}}{{.RNo}}{{end}}</span><code>{{.RHTML}}</code></div>
105 </div>
106 {{end}}
107 {{end}}
108 </div>
109 {{end}}
110 </div>
111 {{end}}
112 </section>
113 {{end}}
114 </div>
115</div>
116</div>
117<script src="/assets/commit.js"></script>
118{{end}}
internal/server/templates/newmr.html added +61 −0
@@ -0,0 +1,61 @@
1 {{define "comparediff"}}
2 {{if or (eq .CompareFrom "") (eq .CompareTo "") (eq .CompareFrom .CompareTo)}}
3 <p class="muted">{{t "mr.emptyCompare"}}</p>
4 {{else}}
5 <h2>{{t "mr.commits"}}</h2>
6 <ul class="clean">
7 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code></span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}
8 </ul>
9 <h2>{{t "mr.changes"}}</h2>
10 {{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
11 {{end}}
12 {{end}}
13
14 {{define "compare"}}
15 {{template "layout-start" .}}
16 <header class="pagehead"><h1>{{t "branch.compare"}}</h1></header>
17 <p>{{.CompareFrom}} → {{.CompareTo}}</p>
18 {{template "comparediff" .}}
19 {{if and .CompareTo (ne .CompareFrom .CompareTo) .CanWrite}}
20 <p><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .CompareTo}}&amp;target={{urlquery .CompareFrom}}">{{t "mr.create"}}</a></p>
21 {{end}}
22 {{template "layout-end" .}}
23 {{end}}
24
25 {{define "newmr"}}
26 {{template "layout-start" .}}
27 <header class="pagehead"><h1>{{t "mr.create"}}</h1></header>
28 <form class="row" method="get" action="/{{.Repo.FullPath}}/-/merge-requests/new" data-mr-pick>
29 <label>{{t "mr.source"}}
30 <select name="source">{{range .Branches}}<option{{if eq .Name $.CompareFrom}} selected{{end}}>{{.Name}}</option>{{end}}</select>
31 </label>
32 <label>{{t "mr.target"}}
33 <select name="target">{{range .Branches}}<option{{if eq .Name $.CompareTo}} selected{{end}}>{{.Name}}</option>{{end}}</select>
34 </label>
35 <button type="submit">{{t "branch.compare"}}</button>
36 </form>
37 {{template "comparediff" .}}
38 {{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}
39 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
40 <input type="hidden" name="csrf" value="{{.CSRF}}">
41 <input type="hidden" name="source" value="{{.CompareFrom}}">
42 <input type="hidden" name="target" value="{{.CompareTo}}">
43 <label>{{t "mr.titleField"}} <input name="title" value="{{.FormTitle}}" required></label>
44 <p class="fieldlabel">{{t "mr.description"}}</p>
45 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
46 <div class="mdtabs" role="tablist">
47 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
48 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
49 </div>
50 <div data-md-write>
51 <textarea name="description"></textarea>
52 </div>
53 <div class="mdbody" data-md-preview hidden></div>
54 </div>
55 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
56 <button type="submit">{{t "mr.create"}}</button>
57 </form>
58 <script src="/assets/mr.js"></script>
59 {{end}}
60 {{template "layout-end" .}}
61 {{end}}
@@ -0,0 +1,61 @@
1{{define "comparediff"}}
2{{if or (eq .CompareFrom "") (eq .CompareTo "") (eq .CompareFrom .CompareTo)}}
3<p class="muted">{{t "mr.emptyCompare"}}</p>
4{{else}}
5<h2>{{t "mr.commits"}}</h2>
6<ul class="clean">
7 {{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <span class="muted"><code>{{.Short}}</code></span></li>{{else}}<li class="muted">{{t "mr.noDiff"}}</li>{{end}}
8</ul>
9<h2>{{t "mr.changes"}}</h2>
10{{if .CommitDiff}}{{if .CommitDiff.Files}}{{template "repodiff" .}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}{{else}}<p class="muted">{{t "mr.noDiff"}}</p>{{end}}
11{{end}}
12{{end}}
13
14{{define "compare"}}
15{{template "layout-start" .}}
16<header class="pagehead"><h1>{{t "branch.compare"}}</h1></header>
17<p>{{.CompareFrom}} → {{.CompareTo}}</p>
18{{template "comparediff" .}}
19{{if and .CompareTo (ne .CompareFrom .CompareTo) .CanWrite}}
20<p><a class="btn" href="/{{.Repo.FullPath}}/-/merge-requests/new?source={{urlquery .CompareTo}}&amp;target={{urlquery .CompareFrom}}">{{t "mr.create"}}</a></p>
21{{end}}
22{{template "layout-end" .}}
23{{end}}
24
25{{define "newmr"}}
26{{template "layout-start" .}}
27<header class="pagehead"><h1>{{t "mr.create"}}</h1></header>
28<form class="row" method="get" action="/{{.Repo.FullPath}}/-/merge-requests/new" data-mr-pick>
29 <label>{{t "mr.source"}}
30 <select name="source">{{range .Branches}}<option{{if eq .Name $.CompareFrom}} selected{{end}}>{{.Name}}</option>{{end}}</select>
31 </label>
32 <label>{{t "mr.target"}}
33 <select name="target">{{range .Branches}}<option{{if eq .Name $.CompareTo}} selected{{end}}>{{.Name}}</option>{{end}}</select>
34 </label>
35 <button type="submit">{{t "branch.compare"}}</button>
36</form>
37{{template "comparediff" .}}
38{{if and .CompareFrom .CompareTo (ne .CompareFrom .CompareTo)}}
39<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/merge-requests">
40 <input type="hidden" name="csrf" value="{{.CSRF}}">
41 <input type="hidden" name="source" value="{{.CompareFrom}}">
42 <input type="hidden" name="target" value="{{.CompareTo}}">
43 <label>{{t "mr.titleField"}} <input name="title" value="{{.FormTitle}}" required></label>
44 <p class="fieldlabel">{{t "mr.description"}}</p>
45 <div class="mdbox" data-md-box data-md-url="/{{.Repo.FullPath}}/-/markdown">
46 <div class="mdtabs" role="tablist">
47 <button type="button" data-md-tab="write" aria-selected="true">{{t "mr.write"}}</button>
48 <button type="button" data-md-tab="preview" aria-selected="false">{{t "mr.preview"}}</button>
49 </div>
50 <div data-md-write>
51 <textarea name="description"></textarea>
52 </div>
53 <div class="mdbody" data-md-preview hidden></div>
54 </div>
55 <label class="row"><input type="checkbox" name="draft" value="1"> {{t "mr.markDraft"}}</label>
56 <button type="submit">{{t "mr.create"}}</button>
57</form>
58<script src="/assets/mr.js"></script>
59{{end}}
60{{template "layout-end" .}}
61{{end}}
internal/server/templates/pages.html +0 −22
@@ -456,25 +456,3 @@
456 456 {{template "layout-end" .}}
457 457 {{end}}
458 458
459 {{define "commit"}}
460 {{template "layout-start" .}}
461 <header class="pagehead"><h1>{{.Commit.Subject}}</h1></header>
462 <div class="projhead">
463 {{template "avatar" .Commit}}
464 <div>
465 <p>{{template "commitwho" .Commit}}</p>
466 <p class="muted">{{.Commit.SHA}} · {{.Commit.Date}}</p>
467 </div>
468 </div>
469 {{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}
470 {{template "layout-end" .}}
471 {{end}}
472
473 {{define "branches"}}
474 {{template "layout-start" .}}
475 <header class="pagehead"><h1>{{t "title.branches"}}</h1></header>
476 <ul class="clean">
477 {{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}</li>{{else}}<li class="muted">{{t "repo.noBranches"}}</li>{{end}}
478 </ul>
479 {{template "layout-end" .}}
480 {{end}}
@@ -456,25 +456,3 @@
456{{template "layout-end" .}}
456{{template "layout-end" .}}
457{{end}}
457{{end}}
458
458
459{{define "commit"}}
460{{template "layout-start" .}}
461<header class="pagehead"><h1>{{.Commit.Subject}}</h1></header>
462<div class="projhead">
463 {{template "avatar" .Commit}}
464 <div>
465 <p>{{template "commitwho" .Commit}}</p>
466 <p class="muted">{{.Commit.SHA}} · {{.Commit.Date}}</p>
467 </div>
468</div>
469{{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}
470{{template "layout-end" .}}
471{{end}}
472
473{{define "branches"}}
474{{template "layout-start" .}}
475<header class="pagehead"><h1>{{t "title.branches"}}</h1></header>
476<ul class="clean">
477 {{range .Branches}}<li><a href="/{{$.Repo.FullPath}}?rev={{.Name}}">{{.Name}}</a> {{if .Protected}}<span class="pill">{{t "vis.protected"}}</span>{{end}}</li>{{else}}<li class="muted">{{t "repo.noBranches"}}</li>{{end}}
478</ul>
479{{template "layout-end" .}}
480{{end}}
internal/store/flow.go +10 −15
@@ -143,6 +143,8 @@ type MergeRequest struct {
143 143 Status string
144 144 CreatedAt time.Time
145 145 UpdatedAt time.Time
146 Draft bool
147 Labels string
146 148 }
147 149
148 150 // CreateMergeRequest nummert per repository.
@@ -185,13 +187,14 @@ func (s *Store) MergeRequestByNumber(ctx context.Context, repoID, number int64)
185 187 return scanMR(row)
186 188 }
187 189
188 const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at
190 const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at, m.draft, m.labels
189 191 FROM merge_requests m JOIN users u ON u.id = m.author_id`
190 192
191 193 func scanMR(row *sql.Row) (MergeRequest, error) {
192 194 var m MergeRequest
193 195 var created, updated string
194 if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
196 var draft int
197 if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {
195 198 if errors.Is(err, sql.ErrNoRows) {
196 199 return MergeRequest{}, errNotFound
197 200 }
@@ -199,6 +202,7 @@ func scanMR(row *sql.Row) (MergeRequest, error) {
199 202 }
200 203 m.CreatedAt = parseTime(created)
201 204 m.UpdatedAt = parseTime(updated)
205 m.Draft = draft == 1
202 206 return m, nil
203 207 }
204 208
@@ -209,18 +213,7 @@ func (s *Store) ListMergeRequests(ctx context.Context, repoID int64) ([]MergeReq
209 213 return nil, err
210 214 }
211 215 defer rows.Close()
212 var out []MergeRequest
213 for rows.Next() {
214 var m MergeRequest
215 var created, updated string
216 if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
217 return nil, err
218 }
219 m.CreatedAt = parseTime(created)
220 m.UpdatedAt = parseTime(updated)
221 out = append(out, m)
222 }
223 return out, rows.Err()
216 return scanMRList(rows)
224 217 }
225 218
226 219 // SetMergeRequestStatus zet open, merged of closed.
@@ -256,11 +249,13 @@ func scanMRList(rows *sql.Rows) ([]MergeRequest, error) {
256 249 for rows.Next() {
257 250 var m MergeRequest
258 251 var created, updated string
259 if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
252 var draft int
253 if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {
260 254 return nil, err
261 255 }
262 256 m.CreatedAt = parseTime(created)
263 257 m.UpdatedAt = parseTime(updated)
258 m.Draft = draft == 1
264 259 out = append(out, m)
265 260 }
266 261 return out, rows.Err()
@@ -143,6 +143,8 @@ type MergeRequest struct {
143 Status string
143 Status string
144 CreatedAt time.Time
144 CreatedAt time.Time
145 UpdatedAt time.Time
145 UpdatedAt time.Time
146 Draft bool
147 Labels string
146}
148}
147
149
148// CreateMergeRequest nummert per repository.
150// CreateMergeRequest nummert per repository.
@@ -185,13 +187,14 @@ func (s *Store) MergeRequestByNumber(ctx context.Context, repoID, number int64)
185 return scanMR(row)
187 return scanMR(row)
186}
188}
187
189
188const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at
190const mrSelect = `SELECT m.id, m.repo_id, m.number, m.title, m.description, m.source_branch, m.target_branch, m.author_id, u.username, m.status, m.created_at, m.updated_at, m.draft, m.labels
189FROM merge_requests m JOIN users u ON u.id = m.author_id`
191FROM merge_requests m JOIN users u ON u.id = m.author_id`
190
192
191func scanMR(row *sql.Row) (MergeRequest, error) {
193func scanMR(row *sql.Row) (MergeRequest, error) {
192 var m MergeRequest
194 var m MergeRequest
193 var created, updated string
195 var created, updated string
194 if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
196 var draft int
197 if err := row.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {
195 if errors.Is(err, sql.ErrNoRows) {
198 if errors.Is(err, sql.ErrNoRows) {
196 return MergeRequest{}, errNotFound
199 return MergeRequest{}, errNotFound
197 }
200 }
@@ -199,6 +202,7 @@ func scanMR(row *sql.Row) (MergeRequest, error) {
199 }
202 }
200 m.CreatedAt = parseTime(created)
203 m.CreatedAt = parseTime(created)
201 m.UpdatedAt = parseTime(updated)
204 m.UpdatedAt = parseTime(updated)
205 m.Draft = draft == 1
202 return m, nil
206 return m, nil
203}
207}
204
208
@@ -209,18 +213,7 @@ func (s *Store) ListMergeRequests(ctx context.Context, repoID int64) ([]MergeReq
209 return nil, err
213 return nil, err
210 }
214 }
211 defer rows.Close()
215 defer rows.Close()
212 var out []MergeRequest
216 return scanMRList(rows)
213 for rows.Next() {
214 var m MergeRequest
215 var created, updated string
216 if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
217 return nil, err
218 }
219 m.CreatedAt = parseTime(created)
220 m.UpdatedAt = parseTime(updated)
221 out = append(out, m)
222 }
223 return out, rows.Err()
224}
217}
225
218
226// SetMergeRequestStatus zet open, merged of closed.
219// SetMergeRequestStatus zet open, merged of closed.
@@ -256,11 +249,13 @@ func scanMRList(rows *sql.Rows) ([]MergeRequest, error) {
256 for rows.Next() {
249 for rows.Next() {
257 var m MergeRequest
250 var m MergeRequest
258 var created, updated string
251 var created, updated string
259 if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated); err != nil {
252 var draft int
253 if err := rows.Scan(&m.ID, &m.RepoID, &m.Number, &m.Title, &m.Description, &m.SourceBranch, &m.TargetBranch, &m.AuthorID, &m.Author, &m.Status, &created, &updated, &draft, &m.Labels); err != nil {
260 return nil, err
254 return nil, err
261 }
255 }
262 m.CreatedAt = parseTime(created)
256 m.CreatedAt = parseTime(created)
263 m.UpdatedAt = parseTime(updated)
257 m.UpdatedAt = parseTime(updated)
258 m.Draft = draft == 1
264 out = append(out, m)
259 out = append(out, m)
265 }
260 }
266 return out, rows.Err()
261 return out, rows.Err()
internal/store/mr_extra.go added +105 −0
@@ -0,0 +1,105 @@
1 package store
2
3 import (
4 "context"
5 "strings"
6 "time"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9 )
10
11 // SetDraft zet of haalt het conceptvinkje weg.
12 func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {
13 bit := 0
14 if draft {
15 bit = 1
16 }
17 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET draft = ?, updated_at = ? WHERE id = ?`, bit, now(), id)
18 return err
19 }
20
21 // UpdateMergeRequest bewaart titel, beschrijving en labels.
22 func (s *Store) UpdateMergeRequest(ctx context.Context, id int64, title, description, labels string) error {
23 title = trim(title, 200)
24 if title == "" {
25 return i18n.E("err.mrTitle")
26 }
27 description = trim(description, 20000)
28 labels = trim(labels, 200)
29 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET title = ?, description = ?, labels = ?, updated_at = ? WHERE id = ?`,
30 title, description, labels, now(), id)
31 return err
32 }
33
34 // RenameOpenMRBranches werkt open verzoeken bij als een branch een nieuwe naam krijgt.
35 func (s *Store) RenameOpenMRBranches(ctx context.Context, repoID int64, oldName, newName string) error {
36 ts := now()
37 if _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET source_branch = ?, updated_at = ? WHERE repo_id = ? AND source_branch = ? AND status = 'open'`,
38 newName, ts, repoID, oldName); err != nil {
39 return err
40 }
41 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET target_branch = ?, updated_at = ? WHERE repo_id = ? AND target_branch = ? AND status = 'open'`,
42 newName, ts, repoID, oldName)
43 return err
44 }
45
46 // MREvent is één gebeurtenis op de tijdlijn van een merge request.
47 type MREvent struct {
48 ID int64
49 ActorID int64
50 Actor string
51 Kind string
52 Body string
53 CreatedAt time.Time
54 }
55
56 // AddMREvent bewaart een gebeurtenis. actorID 0 is toegestaan.
57 func (s *Store) AddMREvent(ctx context.Context, repoID, mrID, actorID int64, kind, body string) error {
58 kind = strings.TrimSpace(kind)
59 if kind == "" {
60 return i18n.E("err.badForm")
61 }
62 _, err := s.db.ExecContext(ctx, `INSERT INTO mr_events (repo_id, mr_id, actor_id, kind, body, created_at) VALUES (?, ?, ?, ?, ?, ?)`,
63 repoID, mrID, actorID, trim(kind, 40), trim(body, 4000), now())
64 return err
65 }
66
67 // ListMREvents geeft de gebeurtenissen, oudste eerst.
68 func (s *Store) ListMREvents(ctx context.Context, mrID int64) ([]MREvent, error) {
69 rows, err := s.db.QueryContext(ctx, `SELECT e.id, e.actor_id, COALESCE(u.username, ''), e.kind, e.body, e.created_at
70 FROM mr_events e LEFT JOIN users u ON u.id = e.actor_id
71 WHERE e.mr_id = ? ORDER BY e.id`, mrID)
72 if err != nil {
73 return nil, err
74 }
75 defer rows.Close()
76 var out []MREvent
77 for rows.Next() {
78 var e MREvent
79 var created string
80 if err := rows.Scan(&e.ID, &e.ActorID, &e.Actor, &e.Kind, &e.Body, &created); err != nil {
81 return nil, err
82 }
83 e.CreatedAt = parseTime(created)
84 out = append(out, e)
85 }
86 return out, rows.Err()
87 }
88
89 // PipelinesForMR geeft de pipelines van deze merge request, oudste eerst.
90 func (s *Store) PipelinesForMR(ctx context.Context, repoID, mrID int64) ([]Pipeline, error) {
91 rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE repo_id = ? AND mr_id = ? ORDER BY id`, repoID, mrID)
92 if err != nil {
93 return nil, err
94 }
95 defer rows.Close()
96 var out []Pipeline
97 for rows.Next() {
98 p, err := scanPipeline(rows)
99 if err != nil {
100 return nil, err
101 }
102 out = append(out, p)
103 }
104 return out, rows.Err()
105 }
@@ -0,0 +1,105 @@
1package store
2
3import (
4 "context"
5 "strings"
6 "time"
7
8 "gitlab.com/Timfa/bluegit/internal/i18n"
9)
10
11// SetDraft zet of haalt het conceptvinkje weg.
12func (s *Store) SetDraft(ctx context.Context, id int64, draft bool) error {
13 bit := 0
14 if draft {
15 bit = 1
16 }
17 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET draft = ?, updated_at = ? WHERE id = ?`, bit, now(), id)
18 return err
19}
20
21// UpdateMergeRequest bewaart titel, beschrijving en labels.
22func (s *Store) UpdateMergeRequest(ctx context.Context, id int64, title, description, labels string) error {
23 title = trim(title, 200)
24 if title == "" {
25 return i18n.E("err.mrTitle")
26 }
27 description = trim(description, 20000)
28 labels = trim(labels, 200)
29 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET title = ?, description = ?, labels = ?, updated_at = ? WHERE id = ?`,
30 title, description, labels, now(), id)
31 return err
32}
33
34// RenameOpenMRBranches werkt open verzoeken bij als een branch een nieuwe naam krijgt.
35func (s *Store) RenameOpenMRBranches(ctx context.Context, repoID int64, oldName, newName string) error {
36 ts := now()
37 if _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET source_branch = ?, updated_at = ? WHERE repo_id = ? AND source_branch = ? AND status = 'open'`,
38 newName, ts, repoID, oldName); err != nil {
39 return err
40 }
41 _, err := s.db.ExecContext(ctx, `UPDATE merge_requests SET target_branch = ?, updated_at = ? WHERE repo_id = ? AND target_branch = ? AND status = 'open'`,
42 newName, ts, repoID, oldName)
43 return err
44}
45
46// MREvent is één gebeurtenis op de tijdlijn van een merge request.
47type MREvent struct {
48 ID int64
49 ActorID int64
50 Actor string
51 Kind string
52 Body string
53 CreatedAt time.Time
54}
55
56// AddMREvent bewaart een gebeurtenis. actorID 0 is toegestaan.
57func (s *Store) AddMREvent(ctx context.Context, repoID, mrID, actorID int64, kind, body string) error {
58 kind = strings.TrimSpace(kind)
59 if kind == "" {
60 return i18n.E("err.badForm")
61 }
62 _, err := s.db.ExecContext(ctx, `INSERT INTO mr_events (repo_id, mr_id, actor_id, kind, body, created_at) VALUES (?, ?, ?, ?, ?, ?)`,
63 repoID, mrID, actorID, trim(kind, 40), trim(body, 4000), now())
64 return err
65}
66
67// ListMREvents geeft de gebeurtenissen, oudste eerst.
68func (s *Store) ListMREvents(ctx context.Context, mrID int64) ([]MREvent, error) {
69 rows, err := s.db.QueryContext(ctx, `SELECT e.id, e.actor_id, COALESCE(u.username, ''), e.kind, e.body, e.created_at
70 FROM mr_events e LEFT JOIN users u ON u.id = e.actor_id
71 WHERE e.mr_id = ? ORDER BY e.id`, mrID)
72 if err != nil {
73 return nil, err
74 }
75 defer rows.Close()
76 var out []MREvent
77 for rows.Next() {
78 var e MREvent
79 var created string
80 if err := rows.Scan(&e.ID, &e.ActorID, &e.Actor, &e.Kind, &e.Body, &created); err != nil {
81 return nil, err
82 }
83 e.CreatedAt = parseTime(created)
84 out = append(out, e)
85 }
86 return out, rows.Err()
87}
88
89// PipelinesForMR geeft de pipelines van deze merge request, oudste eerst.
90func (s *Store) PipelinesForMR(ctx context.Context, repoID, mrID int64) ([]Pipeline, error) {
91 rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE repo_id = ? AND mr_id = ? ORDER BY id`, repoID, mrID)
92 if err != nil {
93 return nil, err
94 }
95 defer rows.Close()
96 var out []Pipeline
97 for rows.Next() {
98 p, err := scanPipeline(rows)
99 if err != nil {
100 return nil, err
101 }
102 out = append(out, p)
103 }
104 return out, rows.Err()
105}
internal/store/notes.go +19 −8
@@ -24,12 +24,23 @@ type Note struct {
24 24 LineEnd int
25 25 Suggestion string
26 26 BaseText string
27 ParentID int64
27 28 CreatedAt time.Time
28 29 }
29 30
30 31 // AddNote bewaart een algemene reactie en telt hem als bijdrage.
31 32 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 return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", 0)
34 }
35
36 // AddReply bewaart een reactie op een bestaande reactie, één niveau diep.
37 func (s *Store) AddReply(ctx context.Context, repoID, mrID, authorID, parentID int64, body string) (Note, error) {
38 var parentMR, parentParent int64
39 err := s.db.QueryRowContext(ctx, `SELECT mr_id, parent_id FROM notes WHERE id = ? AND repo_id = ?`, parentID, repoID).Scan(&parentMR, &parentParent)
40 if err != nil || parentMR != mrID || parentParent != 0 {
41 return Note{}, i18n.E("err.noteParent")
42 }
43 return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", parentID)
33 44 }
34 45
35 46 // AddLineNote bewaart een reactie op regels, optioneel met een suggestie.
@@ -37,10 +48,10 @@ func (s *Store) AddLineNote(ctx context.Context, repoID, mrID, authorID int64, b
37 48 if path == "" || start < 1 || end < start {
38 49 return Note{}, i18n.E("err.sugLines")
39 50 }
40 return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base)
51 return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base, 0)
41 52 }
42 53
43 func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
54 func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string, parentID int64) (Note, error) {
44 55 body = strings.TrimSpace(body)
45 56 if body == "" {
46 57 return Note{}, i18n.E("err.noteEmpty")
@@ -56,8 +67,8 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo
56 67 }
57 68 defer func() { _ = tx.Rollback() }()
58 69 ts := now()
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)
70 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, parent_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
71 repoID, mrID, authorID, body, ts, path, start, end, suggestion, base, parentID)
61 72 if err != nil {
62 73 return Note{}, err
63 74 }
@@ -72,13 +83,13 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo
72 83 return Note{
73 84 ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,
74 85 FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,
75 CreatedAt: parseTime(ts),
86 ParentID: parentID, CreatedAt: parseTime(ts),
76 87 }, nil
77 88 }
78 89
79 90 // ListNotes geeft de reacties van één merge request, oudste eerst.
80 91 func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
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
92 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, n.parent_id
82 93 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
83 94 if err != nil {
84 95 return nil, err
@@ -88,7 +99,7 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
88 99 for rows.Next() {
89 100 var n Note
90 101 var created string
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 {
102 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, &n.ParentID); err != nil {
92 103 return nil, err
93 104 }
94 105 n.CreatedAt = parseTime(created)
@@ -24,12 +24,23 @@ type Note struct {
24 LineEnd int
24 LineEnd int
25 Suggestion string
25 Suggestion string
26 BaseText string
26 BaseText string
27 ParentID int64
27 CreatedAt time.Time
28 CreatedAt time.Time
28}
29}
29
30
30// AddNote bewaart een algemene reactie en telt hem als bijdrage.
31// AddNote bewaart een algemene reactie en telt hem als bijdrage.
31func (s *Store) AddNote(ctx context.Context, repoID, mrID, authorID int64, body string) (Note, error) {
32func (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 return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", 0)
34}
35
36// AddReply bewaart een reactie op een bestaande reactie, één niveau diep.
37func (s *Store) AddReply(ctx context.Context, repoID, mrID, authorID, parentID int64, body string) (Note, error) {
38 var parentMR, parentParent int64
39 err := s.db.QueryRowContext(ctx, `SELECT mr_id, parent_id FROM notes WHERE id = ? AND repo_id = ?`, parentID, repoID).Scan(&parentMR, &parentParent)
40 if err != nil || parentMR != mrID || parentParent != 0 {
41 return Note{}, i18n.E("err.noteParent")
42 }
43 return s.insertNote(ctx, repoID, mrID, authorID, body, "", 0, 0, "", "", parentID)
33}
44}
34
45
35// AddLineNote bewaart een reactie op regels, optioneel met een suggestie.
46// AddLineNote bewaart een reactie op regels, optioneel met een suggestie.
@@ -37,10 +48,10 @@ func (s *Store) AddLineNote(ctx context.Context, repoID, mrID, authorID int64, b
37 if path == "" || start < 1 || end < start {
48 if path == "" || start < 1 || end < start {
38 return Note{}, i18n.E("err.sugLines")
49 return Note{}, i18n.E("err.sugLines")
39 }
50 }
40 return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base)
51 return s.insertNote(ctx, repoID, mrID, authorID, body, path, start, end, suggestion, base, 0)
41}
52}
42
53
43func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string) (Note, error) {
54func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, body, path string, start, end int, suggestion, base string, parentID int64) (Note, error) {
44 body = strings.TrimSpace(body)
55 body = strings.TrimSpace(body)
45 if body == "" {
56 if body == "" {
46 return Note{}, i18n.E("err.noteEmpty")
57 return Note{}, i18n.E("err.noteEmpty")
@@ -56,8 +67,8 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo
56 }
67 }
57 defer func() { _ = tx.Rollback() }()
68 defer func() { _ = tx.Rollback() }()
58 ts := now()
69 ts := now()
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 (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
70 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, parent_id) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
60 repoID, mrID, authorID, body, ts, path, start, end, suggestion, base)
71 repoID, mrID, authorID, body, ts, path, start, end, suggestion, base, parentID)
61 if err != nil {
72 if err != nil {
62 return Note{}, err
73 return Note{}, err
63 }
74 }
@@ -72,13 +83,13 @@ func (s *Store) insertNote(ctx context.Context, repoID, mrID, authorID int64, bo
72 return Note{
83 return Note{
73 ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,
84 ID: id, RepoID: repoID, MRID: mrID, AuthorID: authorID, Body: body,
74 FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,
85 FilePath: path, LineStart: start, LineEnd: end, Suggestion: suggestion, BaseText: base,
75 CreatedAt: parseTime(ts),
86 ParentID: parentID, CreatedAt: parseTime(ts),
76 }, nil
87 }, nil
77}
88}
78
89
79// ListNotes geeft de reacties van één merge request, oudste eerst.
90// ListNotes geeft de reacties van één merge request, oudste eerst.
80func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
91func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
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
92 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, n.parent_id
82 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
93 FROM notes n JOIN users u ON u.id = n.author_id WHERE n.mr_id = ? ORDER BY n.id`, mrID)
83 if err != nil {
94 if err != nil {
84 return nil, err
95 return nil, err
@@ -88,7 +99,7 @@ func (s *Store) ListNotes(ctx context.Context, mrID int64) ([]Note, error) {
88 for rows.Next() {
99 for rows.Next() {
89 var n Note
100 var n Note
90 var created string
101 var created string
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 {
102 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, &n.ParentID); err != nil {
92 return nil, err
103 return nil, err
93 }
104 }
94 n.CreatedAt = parseTime(created)
105 n.CreatedAt = parseTime(created)
internal/store/store.go +17 −1
@@ -90,6 +90,9 @@ func (s *Store) migrate() error {
90 90 `ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,
91 91 `ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
92 92 `ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
93 `ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,
94 `ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,
95 `ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
93 96 }
94 97 for _, q := range alters {
95 98 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -241,6 +244,8 @@ CREATE TABLE IF NOT EXISTS merge_requests (
241 244 status TEXT NOT NULL,
242 245 created_at TEXT NOT NULL,
243 246 updated_at TEXT NOT NULL,
247 draft INTEGER NOT NULL DEFAULT 0,
248 labels TEXT NOT NULL DEFAULT '',
244 249 UNIQUE(repo_id, number)
245 250 );
246 251 CREATE TABLE IF NOT EXISTS pipelines (
@@ -358,8 +363,19 @@ CREATE TABLE IF NOT EXISTS notes (
358 363 line_start INTEGER NOT NULL DEFAULT 0,
359 364 line_end INTEGER NOT NULL DEFAULT 0,
360 365 suggestion TEXT NOT NULL DEFAULT '',
361 base_text TEXT NOT NULL DEFAULT ''
366 base_text TEXT NOT NULL DEFAULT '',
367 parent_id INTEGER NOT NULL DEFAULT 0
362 368 );
369 CREATE TABLE IF NOT EXISTS mr_events (
370 id INTEGER PRIMARY KEY,
371 repo_id INTEGER NOT NULL,
372 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
373 actor_id INTEGER NOT NULL DEFAULT 0,
374 kind TEXT NOT NULL,
375 body TEXT NOT NULL DEFAULT '',
376 created_at TEXT NOT NULL
377 );
378 CREATE INDEX IF NOT EXISTS mr_events_mr ON mr_events(mr_id, id);
363 379 CREATE TABLE IF NOT EXISTS commit_pushers (
364 380 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
365 381 sha TEXT NOT NULL,
@@ -90,6 +90,9 @@ func (s *Store) migrate() error {
90 `ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,
90 `ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,
91 `ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
91 `ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
92 `ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
92 `ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
93 `ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,
94 `ALTER TABLE merge_requests ADD COLUMN labels TEXT NOT NULL DEFAULT ''`,
95 `ALTER TABLE notes ADD COLUMN parent_id INTEGER NOT NULL DEFAULT 0`,
93 }
96 }
94 for _, q := range alters {
97 for _, q := range alters {
95 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
98 if _, err := s.db.Exec(q); err != nil && !strings.Contains(strings.ToLower(err.Error()), "duplicate column") {
@@ -241,6 +244,8 @@ CREATE TABLE IF NOT EXISTS merge_requests (
241 status TEXT NOT NULL,
244 status TEXT NOT NULL,
242 created_at TEXT NOT NULL,
245 created_at TEXT NOT NULL,
243 updated_at TEXT NOT NULL,
246 updated_at TEXT NOT NULL,
247 draft INTEGER NOT NULL DEFAULT 0,
248 labels TEXT NOT NULL DEFAULT '',
244 UNIQUE(repo_id, number)
249 UNIQUE(repo_id, number)
245);
250);
246CREATE TABLE IF NOT EXISTS pipelines (
251CREATE TABLE IF NOT EXISTS pipelines (
@@ -358,8 +363,19 @@ CREATE TABLE IF NOT EXISTS notes (
358 line_start INTEGER NOT NULL DEFAULT 0,
363 line_start INTEGER NOT NULL DEFAULT 0,
359 line_end INTEGER NOT NULL DEFAULT 0,
364 line_end INTEGER NOT NULL DEFAULT 0,
360 suggestion TEXT NOT NULL DEFAULT '',
365 suggestion TEXT NOT NULL DEFAULT '',
361 base_text TEXT NOT NULL DEFAULT ''
366 base_text TEXT NOT NULL DEFAULT '',
367 parent_id INTEGER NOT NULL DEFAULT 0
362);
368);
369CREATE TABLE IF NOT EXISTS mr_events (
370 id INTEGER PRIMARY KEY,
371 repo_id INTEGER NOT NULL,
372 mr_id INTEGER NOT NULL REFERENCES merge_requests(id) ON DELETE CASCADE,
373 actor_id INTEGER NOT NULL DEFAULT 0,
374 kind TEXT NOT NULL,
375 body TEXT NOT NULL DEFAULT '',
376 created_at TEXT NOT NULL
377);
378CREATE INDEX IF NOT EXISTS mr_events_mr ON mr_events(mr_id, id);
363CREATE TABLE IF NOT EXISTS commit_pushers (
379CREATE TABLE IF NOT EXISTS commit_pushers (
364 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
380 repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
365 sha TEXT NOT NULL,
381 sha TEXT NOT NULL,