Merge branch 'cursor/commit-pusher-65da' into 'master'
Koppel commits aan de pusher See merge request Timfa/bluegit!6
@@ -102,6 +102,7 @@ type Commit struct {
102
102
SHA string
103
103
Short string
104
104
Author string
105
Email string
105
106
Date string
106
107
Unix int64
107
108
Subject string
@@ -121,7 +122,7 @@ func Log(ctx context.Context, gitBin, dir, rev string, limit int) ([]Commit, err
121
122
if rev == "" {
122
123
rev = "HEAD"
123
124
}
124
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ad%x1f%at%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)
125
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ae%x1f%ad%x1f%at%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)
125
126
if err != nil {
126
127
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {
127
128
return nil, nil
@@ -139,16 +140,16 @@ func parseLog(out string) []Commit {
139
140
continue
140
141
}
141
142
parts := strings.Split(rec, "\x1f")
142
if len(parts) < 5 {
143
if len(parts) < 6 {
143
144
continue
144
145
}
145
c := Commit{SHA: parts[0], Author: parts[1], Date: parts[2], Subject: parts[4]}
146
c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)
146
c := Commit{SHA: parts[0], Author: parts[1], Email: parts[2], Date: parts[3], Subject: parts[5]}
147
c.Unix, _ = strconv.ParseInt(parts[4], 10, 64)
147
148
if len(c.SHA) >= 10 {
148
149
c.Short = c.SHA[:10]
149
150
}
150
if len(parts) > 5 {
151
c.Body = strings.TrimSpace(parts[5])
151
if len(parts) > 6 {
152
c.Body = strings.TrimSpace(parts[6])
152
153
}
153
154
commits = append(commits, c)
154
155
}
@@ -393,7 +394,7 @@ func LastCommit(ctx context.Context, gitBin, dir, rev, path string) (Commit, err
393
394
if rev == "" {
394
395
rev = "HEAD"
395
396
}
396
args := []string{"-C", dir, "log", "-1", "--format=%H%x1f%an%x1f%at%x1f%s", rev}
397
args := []string{"-C", dir, "log", "-1", "--format=%H%x1f%an%x1f%ae%x1f%at%x1f%s", rev}
397
398
if path != "" {
398
399
args = append(args, "--", path)
399
400
}
@@ -406,11 +407,11 @@ func LastCommit(ctx context.Context, gitBin, dir, rev, path string) (Commit, err
406
407
}
407
408
line := strings.TrimSpace(out)
408
409
parts := strings.Split(line, "\x1f")
409
if len(parts) < 4 {
410
if len(parts) < 5 {
410
411
return Commit{}, nil
411
412
}
412
c := Commit{SHA: parts[0], Author: parts[1], Subject: parts[3]}
413
c.Unix, _ = strconv.ParseInt(parts[2], 10, 64)
413
c := Commit{SHA: parts[0], Author: parts[1], Email: parts[2], Subject: parts[4]}
414
c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)
414
415
if len(c.SHA) >= 10 {
415
416
c.Short = c.SHA[:10]
416
417
}
@@ -102,6 +102,7 @@ type Commit struct {102
SHA string102
SHA string103
Short string103
Short string104
Author string104
Author string105
Email string105
Date string106
Date string106
Unix int64107
Unix int64107
Subject string108
Subject string@@ -121,7 +122,7 @@ func Log(ctx context.Context, gitBin, dir, rev string, limit int) ([]Commit, err121
if rev == "" {122
if rev == "" {122
rev = "HEAD"123
rev = "HEAD"123
}124
}124
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ad%x1f%at%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)125
out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--format=%H%x1f%an%x1f%ae%x1f%ad%x1f%at%x1f%s%x1f%b%x1e", "--date=short", fmt.Sprintf("-n%d", limit), rev)125
if err != nil {126
if err != nil {126
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {127
if strings.Contains(err.Error(), "does not have any commits") || strings.Contains(err.Error(), "bad default revision") || strings.Contains(err.Error(), "ambiguous argument") {127
return nil, nil128
return nil, nil@@ -139,16 +140,16 @@ func parseLog(out string) []Commit {139
continue140
continue140
}141
}141
parts := strings.Split(rec, "\x1f")142
parts := strings.Split(rec, "\x1f")142
if len(parts) < 5 {143
if len(parts) < 6 {143
continue144
continue144
}145
}145
c := Commit{SHA: parts[0], Author: parts[1], Date: parts[2], Subject: parts[4]}146
c := Commit{SHA: parts[0], Author: parts[1], Email: parts[2], Date: parts[3], Subject: parts[5]}146
c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)147
c.Unix, _ = strconv.ParseInt(parts[4], 10, 64)147
if len(c.SHA) >= 10 {148
if len(c.SHA) >= 10 {148
c.Short = c.SHA[:10]149
c.Short = c.SHA[:10]149
}150
}150
if len(parts) > 5 {151
if len(parts) > 6 {151
c.Body = strings.TrimSpace(parts[5])152
c.Body = strings.TrimSpace(parts[6])152
}153
}153
commits = append(commits, c)154
commits = append(commits, c)154
}155
}@@ -393,7 +394,7 @@ func LastCommit(ctx context.Context, gitBin, dir, rev, path string) (Commit, err393
if rev == "" {394
if rev == "" {394
rev = "HEAD"395
rev = "HEAD"395
}396
}396
args := []string{"-C", dir, "log", "-1", "--format=%H%x1f%an%x1f%at%x1f%s", rev}397
args := []string{"-C", dir, "log", "-1", "--format=%H%x1f%an%x1f%ae%x1f%at%x1f%s", rev}397
if path != "" {398
if path != "" {398
args = append(args, "--", path)399
args = append(args, "--", path)399
}400
}@@ -406,11 +407,11 @@ func LastCommit(ctx context.Context, gitBin, dir, rev, path string) (Commit, err406
}407
}407
line := strings.TrimSpace(out)408
line := strings.TrimSpace(out)408
parts := strings.Split(line, "\x1f")409
parts := strings.Split(line, "\x1f")409
if len(parts) < 4 {410
if len(parts) < 5 {410
return Commit{}, nil411
return Commit{}, nil411
}412
}412
c := Commit{SHA: parts[0], Author: parts[1], Subject: parts[3]}413
c := Commit{SHA: parts[0], Author: parts[1], Email: parts[2], Subject: parts[4]}413
c.Unix, _ = strconv.ParseInt(parts[2], 10, 64)414
c.Unix, _ = strconv.ParseInt(parts[3], 10, 64)414
if len(c.SHA) >= 10 {415
if len(c.SHA) >= 10 {415
c.Short = c.SHA[:10]416
c.Short = c.SHA[:10]416
}417
}@@ -355,4 +355,5 @@ var en = map[string]string{
355
355
"err.assetCopy": "could not copy the asset",
356
356
"err.tagFail": "tag: %s",
357
357
"err.json": "invalid json",
358
"commit.pushedBy": "pushed by %s",
358
359
}
@@ -355,4 +355,5 @@ var en = map[string]string{355
"err.assetCopy": "could not copy the asset",355
"err.assetCopy": "could not copy the asset",356
"err.tagFail": "tag: %s",356
"err.tagFail": "tag: %s",357
"err.json": "invalid json",357
"err.json": "invalid json",358
"commit.pushedBy": "pushed by %s",358
}359
}@@ -352,6 +352,7 @@ var nl = map[string]string{
352
352
"err.assetCopy": "asset kopiëren",
353
353
"err.tagFail": "tag: %s",
354
354
"err.json": "json",
355
"commit.pushedBy": "gepusht door %s",
355
356
}
356
357
357
358
var de = map[string]string{
@@ -706,6 +707,7 @@ var de = map[string]string{
706
707
"err.assetCopy": "Asset konnte nicht kopiert werden",
707
708
"err.tagFail": "Tag: %s",
708
709
"err.json": "json",
710
"commit.pushedBy": "gepusht von %s",
709
711
}
710
712
711
713
var fr = map[string]string{
@@ -1060,4 +1062,5 @@ var fr = map[string]string{
1060
1062
"err.assetCopy": "impossible de copier l’artefact",
1061
1063
"err.tagFail": "tag : %s",
1062
1064
"err.json": "json",
1065
"commit.pushedBy": "poussé par %s",
1063
1066
}
@@ -352,6 +352,7 @@ var nl = map[string]string{352
"err.assetCopy": "asset kopiëren",352
"err.assetCopy": "asset kopiëren",353
"err.tagFail": "tag: %s",353
"err.tagFail": "tag: %s",354
"err.json": "json",354
"err.json": "json",355
"commit.pushedBy": "gepusht door %s",355
}356
}356
357
357
var de = map[string]string{358
var de = map[string]string{@@ -706,6 +707,7 @@ var de = map[string]string{706
"err.assetCopy": "Asset konnte nicht kopiert werden",707
"err.assetCopy": "Asset konnte nicht kopiert werden",707
"err.tagFail": "Tag: %s",708
"err.tagFail": "Tag: %s",708
"err.json": "json",709
"err.json": "json",710
"commit.pushedBy": "gepusht von %s",709
}711
}710
712
711
var fr = map[string]string{713
var fr = map[string]string{@@ -1060,4 +1062,5 @@ var fr = map[string]string{1060
"err.assetCopy": "impossible de copier l’artefact",1062
"err.assetCopy": "impossible de copier l’artefact",1061
"err.tagFail": "tag : %s",1063
"err.tagFail": "tag : %s",1062
"err.json": "json",1064
"err.json": "json",1065
"commit.pushedBy": "poussé par %s",1063
}1066
}@@ -73,6 +73,10 @@ func (s *Server) backfillRepo(ctx context.Context, repo store.Repo) error {
73
73
if err != nil {
74
74
return err
75
75
}
76
pushers, err := s.Store.PushersByRepo(ctx, repo.ID)
77
if err != nil {
78
return err
79
}
76
80
var rows []store.Contribution
77
81
seen := map[string]bool{}
78
82
for ref, sha := range refs {
@@ -88,7 +92,13 @@ func (s *Server) backfillRepo(ctx context.Context, repo store.Repo) error {
88
92
continue
89
93
}
90
94
seen[c.SHA] = true
91
uid, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name)
95
uid, ok := s.Store.UserIDByGitAuthor(ctx, c.Email)
96
if !ok {
97
if p, found := pushers[c.SHA]; found && p.UserID != 0 {
98
uid = p.UserID
99
ok = true
100
}
101
}
92
102
if !ok {
93
103
continue
94
104
}
@@ -111,6 +121,7 @@ func (s *Server) recordPushContributions(repo store.Repo, user store.User, befor
111
121
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
112
122
ctx := context.Background()
113
123
var rows []store.Contribution
124
var authors []store.PushAuthor
114
125
for ref, sha := range after {
115
126
if before[ref] == sha {
116
127
continue
@@ -126,8 +137,9 @@ func (s *Server) recordPushContributions(repo store.Repo, user store.User, befor
126
137
continue
127
138
}
128
139
for _, c := range list {
140
authors = append(authors, store.PushAuthor{SHA: c.SHA, Name: c.Name, Email: c.Email})
129
141
uid := user.ID
130
if id, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name); ok {
142
if id, ok := s.Store.UserIDByGitAuthor(ctx, c.Email); ok {
131
143
uid = id
132
144
}
133
145
when := time.Unix(c.Unix, 0).UTC()
@@ -139,6 +151,9 @@ func (s *Server) recordPushContributions(repo store.Repo, user store.User, befor
139
151
})
140
152
}
141
153
}
154
if err := s.Store.RememberPushers(ctx, repo.ID, user.ID, authors); err != nil && s.Log != nil {
155
s.Log.Error("pusher", "err", err)
156
}
142
157
if err := s.Store.AddContributions(ctx, rows); err != nil && s.Log != nil {
143
158
s.Log.Error("bijdragen", "err", err)
144
159
}
@@ -73,6 +73,10 @@ func (s *Server) backfillRepo(ctx context.Context, repo store.Repo) error {73
if err != nil {73
if err != nil {74
return err74
return err75
}75
}76
pushers, err := s.Store.PushersByRepo(ctx, repo.ID)77
if err != nil {78
return err79
}76
var rows []store.Contribution80
var rows []store.Contribution77
seen := map[string]bool{}81
seen := map[string]bool{}78
for ref, sha := range refs {82
for ref, sha := range refs {@@ -88,7 +92,13 @@ func (s *Server) backfillRepo(ctx context.Context, repo store.Repo) error {88
continue92
continue89
}93
}90
seen[c.SHA] = true94
seen[c.SHA] = true91
uid, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name)95
uid, ok := s.Store.UserIDByGitAuthor(ctx, c.Email)96
if !ok {97
if p, found := pushers[c.SHA]; found && p.UserID != 0 {98
uid = p.UserID99
ok = true100
}101
}92
if !ok {102
if !ok {93
continue103
continue94
}104
}@@ -111,6 +121,7 @@ func (s *Server) recordPushContributions(repo store.Repo, user store.User, befor111
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)121
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)112
ctx := context.Background()122
ctx := context.Background()113
var rows []store.Contribution123
var rows []store.Contribution124
var authors []store.PushAuthor114
for ref, sha := range after {125
for ref, sha := range after {115
if before[ref] == sha {126
if before[ref] == sha {116
continue127
continue@@ -126,8 +137,9 @@ func (s *Server) recordPushContributions(repo store.Repo, user store.User, befor126
continue137
continue127
}138
}128
for _, c := range list {139
for _, c := range list {140
authors = append(authors, store.PushAuthor{SHA: c.SHA, Name: c.Name, Email: c.Email})129
uid := user.ID141
uid := user.ID130
if id, ok := s.Store.UserIDByGitAuthor(ctx, c.Email, c.Name); ok {142
if id, ok := s.Store.UserIDByGitAuthor(ctx, c.Email); ok {131
uid = id143
uid = id132
}144
}133
when := time.Unix(c.Unix, 0).UTC()145
when := time.Unix(c.Unix, 0).UTC()@@ -139,6 +151,9 @@ func (s *Server) recordPushContributions(repo store.Repo, user store.User, befor139
})151
})140
}152
}141
}153
}154
if err := s.Store.RememberPushers(ctx, repo.ID, user.ID, authors); err != nil && s.Log != nil {155
s.Log.Error("pusher", "err", err)156
}142
if err := s.Store.AddContributions(ctx, rows); err != nil && s.Log != nil {157
if err := s.Store.AddContributions(ctx, rows); err != nil && s.Log != nil {143
s.Log.Error("bijdragen", "err", err)158
s.Log.Error("bijdragen", "err", err)144
}159
}@@ -0,0 +1,111 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"strings"
7
"unicode/utf8"
8
9
"gitlab.com/Timfa/bluegit/internal/gitrepo"
10
"gitlab.com/Timfa/bluegit/internal/i18n"
11
"gitlab.com/Timfa/bluegit/internal/store"
12
)
13
14
func (s *Server) profile(w http.ResponseWriter, r *http.Request) {
15
name := strings.ToLower(strings.TrimSpace(r.PathValue("username")))
16
u, err := s.Store.UserByUsername(r.Context(), name)
17
if err != nil {
18
http.NotFound(w, r)
19
return
20
}
21
v := s.view(w, r, u.Username)
22
v.Profile = &u
23
viewer := int64(0)
24
if v.User != nil {
25
viewer = v.User.ID
26
}
27
ids, err := s.Store.ListRepoIDs(r.Context(), viewer)
28
if err != nil {
29
ids = nil
30
}
31
v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r))
32
s.render(w, "profile", v)
33
}
34
35
func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {
36
shas := make([]string, 0, len(in))
37
for _, c := range in {
38
if c.SHA != "" {
39
shas = append(shas, c.SHA)
40
}
41
}
42
pushers := map[string]store.Pusher{}
43
if s.Store != nil && repoID != 0 && len(shas) > 0 {
44
if got, err := s.Store.PushersBySHA(ctx, repoID, shas); err == nil {
45
pushers = got
46
}
47
}
48
cache := map[string]store.User{}
49
miss := map[string]bool{}
50
var rows []CommitRow
51
for _, c := range in {
52
rows = append(rows, s.oneCommit(ctx, c, pushers[c.SHA], lang, cache, miss))
53
}
54
return rows
55
}
56
57
func (s *Server) oneCommit(ctx context.Context, c gitrepo.Commit, pusher store.Pusher, lang i18n.Lang, cache map[string]store.User, miss map[string]bool) CommitRow {
58
row := CommitRow{
59
SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,
60
Subject: c.Subject, Body: c.Body, When: i18n.Ago(lang, c.Unix),
61
Initial: initialOf(c.Author),
62
}
63
if u, ok := s.userForEmail(ctx, c.Email, cache, miss); ok {
64
row.Author = u.Username
65
row.UserURL = "/users/" + u.Username
66
row.Avatar = u.AvatarURL
67
row.Initial = initialOf(u.Username)
68
return row
69
}
70
if pusher.UserID != 0 && pusher.Username != "" {
71
row.Author = pusher.Username
72
row.UserURL = "/users/" + pusher.Username
73
row.Avatar = pusher.AvatarURL
74
row.Initial = initialOf(pusher.Username)
75
raw := strings.TrimSpace(c.Author)
76
if raw != "" && !strings.EqualFold(raw, pusher.Username) {
77
row.RawName = raw
78
row.PushedBy = pusher.Username
79
}
80
}
81
return row
82
}
83
84
func (s *Server) userForEmail(ctx context.Context, email string, cache map[string]store.User, miss map[string]bool) (store.User, bool) {
85
if s.Store == nil {
86
return store.User{}, false
87
}
88
key := strings.ToLower(strings.TrimSpace(email))
89
if u, ok := cache[key]; ok {
90
return u, true
91
}
92
if miss[key] {
93
return store.User{}, false
94
}
95
u, ok := s.Store.UserByGitEmail(ctx, email)
96
if !ok {
97
miss[key] = true
98
return store.User{}, false
99
}
100
cache[key] = u
101
return u, true
102
}
103
104
func initialOf(s string) string {
105
s = strings.TrimSpace(s)
106
if s == "" {
107
return "?"
108
}
109
r, _ := utf8.DecodeRuneInString(s)
110
return strings.ToUpper(string(r))
111
}
@@ -0,0 +1,111 @@1
package server2
3
import (4
"context"5
"net/http"6
"strings"7
"unicode/utf8"8
9
"gitlab.com/Timfa/bluegit/internal/gitrepo"10
"gitlab.com/Timfa/bluegit/internal/i18n"11
"gitlab.com/Timfa/bluegit/internal/store"12
)13
14
func (s *Server) profile(w http.ResponseWriter, r *http.Request) {15
name := strings.ToLower(strings.TrimSpace(r.PathValue("username")))16
u, err := s.Store.UserByUsername(r.Context(), name)17
if err != nil {18
http.NotFound(w, r)19
return20
}21
v := s.view(w, r, u.Username)22
v.Profile = &u23
viewer := int64(0)24
if v.User != nil {25
viewer = v.User.ID26
}27
ids, err := s.Store.ListRepoIDs(r.Context(), viewer)28
if err != nil {29
ids = nil30
}31
v.Heat = s.heatmap(r.Context(), u.ID, ids, s.langOf(r))32
s.render(w, "profile", v)33
}34
35
func (s *Server) presentCommits(ctx context.Context, repoID int64, in []gitrepo.Commit, lang i18n.Lang) []CommitRow {36
shas := make([]string, 0, len(in))37
for _, c := range in {38
if c.SHA != "" {39
shas = append(shas, c.SHA)40
}41
}42
pushers := map[string]store.Pusher{}43
if s.Store != nil && repoID != 0 && len(shas) > 0 {44
if got, err := s.Store.PushersBySHA(ctx, repoID, shas); err == nil {45
pushers = got46
}47
}48
cache := map[string]store.User{}49
miss := map[string]bool{}50
var rows []CommitRow51
for _, c := range in {52
rows = append(rows, s.oneCommit(ctx, c, pushers[c.SHA], lang, cache, miss))53
}54
return rows55
}56
57
func (s *Server) oneCommit(ctx context.Context, c gitrepo.Commit, pusher store.Pusher, lang i18n.Lang, cache map[string]store.User, miss map[string]bool) CommitRow {58
row := CommitRow{59
SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,60
Subject: c.Subject, Body: c.Body, When: i18n.Ago(lang, c.Unix),61
Initial: initialOf(c.Author),62
}63
if u, ok := s.userForEmail(ctx, c.Email, cache, miss); ok {64
row.Author = u.Username65
row.UserURL = "/users/" + u.Username66
row.Avatar = u.AvatarURL67
row.Initial = initialOf(u.Username)68
return row69
}70
if pusher.UserID != 0 && pusher.Username != "" {71
row.Author = pusher.Username72
row.UserURL = "/users/" + pusher.Username73
row.Avatar = pusher.AvatarURL74
row.Initial = initialOf(pusher.Username)75
raw := strings.TrimSpace(c.Author)76
if raw != "" && !strings.EqualFold(raw, pusher.Username) {77
row.RawName = raw78
row.PushedBy = pusher.Username79
}80
}81
return row82
}83
84
func (s *Server) userForEmail(ctx context.Context, email string, cache map[string]store.User, miss map[string]bool) (store.User, bool) {85
if s.Store == nil {86
return store.User{}, false87
}88
key := strings.ToLower(strings.TrimSpace(email))89
if u, ok := cache[key]; ok {90
return u, true91
}92
if miss[key] {93
return store.User{}, false94
}95
u, ok := s.Store.UserByGitEmail(ctx, email)96
if !ok {97
miss[key] = true98
return store.User{}, false99
}100
cache[key] = u101
return u, true102
}103
104
func initialOf(s string) string {105
s = strings.TrimSpace(s)106
if s == "" {107
return "?"108
}109
r, _ := utf8.DecodeRuneInString(s)110
return strings.ToUpper(string(r))111
}@@ -22,8 +22,9 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
22
22
s.branchList(r, v, dir)
23
23
lang := i18n.Parse(v.Lang)
24
24
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {
25
row := commitRow(c, lang)
26
v.Head = &row
25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
26
v.Head = &rows[0]
27
}
27
28
}
28
29
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")
29
30
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)
@@ -80,8 +81,9 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string
80
81
v.BlobSize = formatSize(n)
81
82
}
82
83
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {
83
row := commitRow(c, lang)
84
v.Head = &row
84
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
85
v.Head = &rows[0]
86
}
85
87
}
86
88
}
87
89
@@ -113,13 +115,6 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {
113
115
s.render(w, "tags", v)
114
116
}
115
117
116
func commitRow(c gitrepo.Commit, lang i18n.Lang) CommitRow {
117
return CommitRow{
118
SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,
119
Subject: c.Subject, Body: c.Body, When: i18n.Ago(lang, c.Unix),
120
}
121
}
122
123
118
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {
124
119
var out []FileRow
125
120
for _, e := range entries {
@@ -22,8 +22,9 @@ func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {22
s.branchList(r, v, dir)22
s.branchList(r, v, dir)23
lang := i18n.Parse(v.Lang)23
lang := i18n.Parse(v.Lang)24
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {24
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, ""); err == nil && c.SHA != "" {25
row := commitRow(c, lang)25
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {26
v.Head = &row26
v.Head = &rows[0]27
}27
}28
}28
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")29
entries, err := gitrepo.Tree(r.Context(), s.Git, dir, v.Rev, "")29
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)30
touch, _ := gitrepo.Touch(r.Context(), s.Git, dir, v.Rev)@@ -80,8 +81,9 @@ func (s *Server) fillFiles(r *http.Request, v *View, repo store.Repo, rel string80
v.BlobSize = formatSize(n)81
v.BlobSize = formatSize(n)81
}82
}82
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {83
if c, err := gitrepo.LastCommit(r.Context(), s.Git, dir, v.Rev, rel); err == nil && c.SHA != "" {83
row := commitRow(c, lang)84
if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {84
v.Head = &row85
v.Head = &rows[0]86
}85
}87
}86
}88
}87
89
@@ -113,13 +115,6 @@ func (s *Server) tags(w http.ResponseWriter, r *http.Request) {113
s.render(w, "tags", v)115
s.render(w, "tags", v)114
}116
}115
117
116
func commitRow(c gitrepo.Commit, lang i18n.Lang) CommitRow {117
return CommitRow{118
SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date,119
Subject: c.Subject, Body: c.Body, When: i18n.Ago(lang, c.Unix),120
}121
}122
123
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {118
func fileRows(entries []gitrepo.Entry, base string, touch map[string]gitrepo.Commit, lang i18n.Lang) []FileRow {124
var out []FileRow119
var out []FileRow125
for _, e := range entries {120
for _, e := range entries {@@ -0,0 +1,345 @@
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
"time"
15
16
"gitlab.com/Timfa/bluegit/internal/auth"
17
"gitlab.com/Timfa/bluegit/internal/config"
18
"gitlab.com/Timfa/bluegit/internal/gitrepo"
19
"gitlab.com/Timfa/bluegit/internal/store"
20
)
21
22
func TestCommitPusher(t *testing.T) {
23
if _, err := exec.LookPath("git"); err != nil {
24
t.Skip("git ontbreekt")
25
}
26
storage := t.TempDir()
27
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
28
if err != nil {
29
t.Fatal(err)
30
}
31
t.Cleanup(func() { _ = st.Close() })
32
cfg := config.Config{
33
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
34
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},
35
Git: config.Git{Binary: "git", DefaultBranch: "master"},
36
}
37
cfg.Auth.BaseURL = "https://auth.timfalken.com"
38
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
39
ts := httptest.NewServer(srv.Handler())
40
t.Cleanup(ts.Close)
41
42
jar, _ := cookiejar.New(nil)
43
client := &http.Client{Jar: jar}
44
res, err := client.Get(ts.URL + "/login")
45
if err != nil {
46
t.Fatal(err)
47
}
48
page := read(t, res)
49
csrf := csrfOf(t, page)
50
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrf}, "name": {"oud"}, "visibility": {"private"}})
51
if err != nil {
52
t.Fatal(err)
53
}
54
page = read(t, res)
55
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"notes"}, "visibility": {"private"}})
56
if err != nil {
57
t.Fatal(err)
58
}
59
page = read(t, res)
60
61
ctx := context.Background()
62
const avatar = "https://auth.timfalken.com/avatar/2"
63
ada, err := st.UpsertUser(ctx, 2, "ada", avatar, false)
64
if err != nil {
65
t.Fatal(err)
66
}
67
notes, err := st.RepoByPath(ctx, "tim", "notes")
68
if err != nil {
69
t.Fatal(err)
70
}
71
if err := st.SetMember(ctx, "repo", notes.ID, "ada", "developer"); err != nil {
72
t.Fatal(err)
73
}
74
75
res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})
76
if err != nil {
77
t.Fatal(err)
78
}
79
token := between(read(t, res), `<p class="code">`, "</p>")
80
if !strings.HasPrefix(token, "bg_") {
81
t.Fatal("geen token")
82
}
83
adaToken, err := st.CreateToken(ctx, ada.ID, "ada")
84
if err != nil {
85
t.Fatal(err)
86
}
87
88
oudWork := t.TempDir()
89
gitPrep(t, oudWork)
90
writeFile(t, filepath.Join(oudWork, "ghost.txt"), "ghost\n")
91
git(t, oudWork, "add", "ghost.txt")
92
gitAs(t, oudWork, "Ghost Writer", "ghost@example.com", "2026-09-01T12:00:00Z", "oud-ghost")
93
writeFile(t, filepath.Join(oudWork, "ada.txt"), "ada\n")
94
git(t, oudWork, "add", "ada.txt")
95
gitAs(t, oudWork, "Ada Lovelace", "ada@users.git.timfalken.com", "2026-09-02T12:00:00Z", "oud-ada")
96
git(t, oudWork, "remote", "add", "origin", gitrepo.Dir(storage, "tim", "oud"))
97
git(t, oudWork, "push", "origin", "master")
98
oudRepo, err := st.RepoByPath(ctx, "tim", "oud")
99
if err != nil {
100
t.Fatal(err)
101
}
102
if err := st.DropContributions(ctx, oudRepo.ID); err != nil {
103
t.Fatal(err)
104
}
105
106
res, err = client.Get(ts.URL + "/tim/oud")
107
if err != nil {
108
t.Fatal(err)
109
}
110
oud := read(t, res)
111
for _, want := range []string{
112
`href="/users/ada"`,
113
avatar,
114
"1 contribution in the last 12 months",
115
`title="1 contribution on 2 September 2026"`,
116
} {
117
if !strings.Contains(oud, want) {
118
t.Fatalf("oud mist %q", want)
119
}
120
}
121
if strings.Contains(oud, "pushed by") || strings.Contains(oud, `title="1 contribution on 1 September 2026"`) {
122
t.Fatal("oud verzint een pusher of telt de onbekende commit")
123
}
124
res, err = client.Get(ts.URL + "/tim/oud/-/commits")
125
if err != nil {
126
t.Fatal(err)
127
}
128
oudLog := read(t, res)
129
if !strings.Contains(oudLog, "Ghost Writer") || strings.Contains(oudLog, "pushed by") {
130
t.Fatal("historische commit hoort de ruwe naam te houden")
131
}
132
133
work := t.TempDir()
134
gitPrep(t, work)
135
writeFile(t, filepath.Join(work, "a.txt"), "a\n")
136
git(t, work, "add", "a.txt")
137
gitAs(t, work, "Other Person", "other@example.com", "2026-10-01T12:00:00Z", "van-een-ander")
138
shaA := revHEAD(t, work)
139
writeFile(t, filepath.Join(work, "b.txt"), "b\n")
140
git(t, work, "add", "b.txt")
141
gitAs(t, work, "Ada Lovelace", "ada@users.git.timfalken.com", "2026-10-02T12:00:00Z", "van-ada")
142
shaB := revHEAD(t, work)
143
writeFile(t, filepath.Join(work, "c.txt"), "c\n")
144
git(t, work, "add", "c.txt")
145
gitAs(t, work, "ada", "stranger@example.com", "2026-10-03T12:00:00Z", "naam-ada")
146
shaC := revHEAD(t, work)
147
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/notes.git"
148
git(t, work, "remote", "add", "origin", remote)
149
git(t, work, "push", "-u", "origin", "master")
150
151
res, err = client.Get(ts.URL + "/tim/notes")
152
if err != nil {
153
t.Fatal(err)
154
}
155
overview := read(t, res)
156
for _, want := range []string{`href="/users/tim"`, "pushed by tim", "naam-ada", ">T</span>"} {
157
if !strings.Contains(overview, want) {
158
t.Fatalf("overzicht mist %q", want)
159
}
160
}
161
if strings.Contains(overview, `href="/users/ada"`) {
162
t.Fatal("naam ada kreeg het profiel zonder passende e-mail")
163
}
164
165
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaB)
166
if err != nil {
167
t.Fatal(err)
168
}
169
emailPage := read(t, res)
170
if !strings.Contains(emailPage, `href="/users/ada"`) || !strings.Contains(emailPage, avatar) || strings.Contains(emailPage, "pushed by") {
171
t.Fatal("e-mailmatch hoort ada te tonen zonder pusher")
172
}
173
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaA)
174
if err != nil {
175
t.Fatal(err)
176
}
177
pushPage := read(t, res)
178
if !strings.Contains(pushPage, "Other Person") || !strings.Contains(pushPage, "pushed by tim") || !strings.Contains(pushPage, `href="/users/tim"`) || strings.Contains(pushPage, `href="/users/ada"`) {
179
t.Fatal("onbekende auteur hoort de pusher te tonen")
180
}
181
182
adaWork := t.TempDir()
183
adaRemote := strings.Replace(ts.URL, "http://", "http://ada:"+adaToken+"@", 1) + "/tim/notes.git"
184
git(t, adaWork, "clone", adaRemote, ".")
185
git(t, adaWork, "config", "user.email", "ada@users.git.timfalken.com")
186
git(t, adaWork, "config", "user.name", "ada")
187
git(t, adaWork, "config", "commit.gpgsign", "false")
188
git(t, adaWork, "checkout", "-b", "extra")
189
writeFile(t, filepath.Join(adaWork, "d.txt"), "d\n")
190
git(t, adaWork, "add", "d.txt")
191
gitAs(t, adaWork, "Stranger", "nope@example.com", "2026-10-04T12:00:00Z", "ada-pusht")
192
shaD := revHEAD(t, adaWork)
193
git(t, adaWork, "push", "-u", "origin", "extra")
194
195
got, err := st.PushersBySHA(ctx, notes.ID, []string{shaA, shaB, shaC, shaD})
196
if err != nil {
197
t.Fatal(err)
198
}
199
if got[shaA].Username != "tim" || got[shaB].Username != "tim" || got[shaC].Username != "tim" || got[shaD].Username != "ada" {
200
t.Fatalf("pushers a=%s b=%s c=%s d=%s", got[shaA].Username, got[shaB].Username, got[shaC].Username, got[shaD].Username)
201
}
202
203
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaD)
204
if err != nil {
205
t.Fatal(err)
206
}
207
adaPush := read(t, res)
208
if !strings.Contains(adaPush, "Stranger") || !strings.Contains(adaPush, "pushed by ada") || !strings.Contains(adaPush, `href="/users/ada"`) {
209
t.Fatal("nieuwe commit van ada hoort ada als pusher te hebben")
210
}
211
212
res, err = client.Get(ts.URL + "/")
213
if err != nil {
214
t.Fatal(err)
215
}
216
dash := read(t, res)
217
for _, want := range []string{
218
"2 contributions in the last 12 months",
219
`title="1 contribution on 1 October 2026"`,
220
`title="1 contribution on 3 October 2026"`,
221
} {
222
if !strings.Contains(dash, want) {
223
t.Fatalf("tim-heatmap mist %q", want)
224
}
225
}
226
for _, ban := range []string{
227
`title="1 contribution on 2 October 2026"`,
228
`title="1 contribution on 4 October 2026"`,
229
`title="1 contribution on 2 September 2026"`,
230
} {
231
if strings.Contains(dash, ban) {
232
t.Fatalf("tim-heatmap telt %s", ban)
233
}
234
}
235
236
adaJar, _ := cookiejar.New(nil)
237
adaClient := &http.Client{Jar: adaJar}
238
sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))
239
if err != nil {
240
t.Fatal(err)
241
}
242
u, _ := url.Parse(ts.URL)
243
adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})
244
res, err = adaClient.Get(ts.URL + "/")
245
if err != nil {
246
t.Fatal(err)
247
}
248
adaDash := read(t, res)
249
if !strings.Contains(adaDash, "2 contributions in the last 12 months") || !strings.Contains(adaDash, `title="1 contribution on 2 October 2026"`) || !strings.Contains(adaDash, `title="1 contribution on 4 October 2026"`) || strings.Contains(adaDash, `title="1 contribution on 1 October 2026"`) || strings.Contains(adaDash, `title="1 contribution on 2 September 2026"`) {
250
t.Fatal("ada-heatmap klopt niet")
251
}
252
253
res, err = client.Get(ts.URL + "/users/ada")
254
if err != nil {
255
t.Fatal(err)
256
}
257
profile := read(t, res)
258
if !strings.Contains(profile, "3 contributions in the last 12 months") || !strings.Contains(profile, `title="1 contribution on 2 September 2026"`) || !strings.Contains(profile, "<h1>ada</h1>") || strings.Contains(profile, `title="1 contribution on 1 September 2026"`) {
259
t.Fatal("profiel van ada klopt niet")
260
}
261
anon := &http.Client{}
262
res, err = anon.Get(ts.URL + "/users/ada")
263
if err != nil {
264
t.Fatal(err)
265
}
266
if !strings.Contains(read(t, res), "No contributions in the last 12 months") {
267
t.Fatal("anoniem profiel toont privébijdragen")
268
}
269
res, err = anon.Get(ts.URL + "/users/nobody")
270
if err != nil {
271
t.Fatal(err)
272
}
273
if res.StatusCode != http.StatusNotFound {
274
t.Fatalf("onbekend profiel %d", res.StatusCode)
275
}
276
_ = res.Body.Close()
277
278
if err := st.DropContributions(ctx, notes.ID); err != nil {
279
t.Fatal(err)
280
}
281
res, err = client.Get(ts.URL + "/tim/notes")
282
if err != nil {
283
t.Fatal(err)
284
}
285
again := read(t, res)
286
if !strings.Contains(again, "4 contributions in the last 12 months") || !strings.Contains(again, `title="1 contribution on 1 October 2026"`) {
287
t.Fatal("resync vergeet de pusher")
288
}
289
290
res, err = client.Get(ts.URL + "/settings")
291
if err != nil {
292
t.Fatal(err)
293
}
294
settings := read(t, res)
295
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"nl"}})
296
if err != nil {
297
t.Fatal(err)
298
}
299
_ = read(t, res)
300
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaA)
301
if err != nil {
302
t.Fatal(err)
303
}
304
nlPage := read(t, res)
305
if !strings.Contains(nlPage, "gepusht door tim") || strings.Contains(nlPage, "pushed by") {
306
t.Fatal("Nederlandse tekst ontbreekt")
307
}
308
}
309
310
func gitPrep(t *testing.T, dir string) {
311
t.Helper()
312
git(t, dir, "init", "-b", "master")
313
git(t, dir, "config", "user.email", "tim@users.git.timfalken.com")
314
git(t, dir, "config", "user.name", "tim")
315
git(t, dir, "config", "commit.gpgsign", "false")
316
}
317
318
func gitAs(t *testing.T, dir, name, email, date, message string) {
319
t.Helper()
320
cmd := exec.Command("git", "commit", "-m", message)
321
cmd.Dir = dir
322
cmd.Env = append(os.Environ(),
323
"GIT_AUTHOR_NAME="+name,
324
"GIT_AUTHOR_EMAIL="+email,
325
"GIT_COMMITTER_NAME="+name,
326
"GIT_COMMITTER_EMAIL="+email,
327
"GIT_AUTHOR_DATE="+date,
328
"GIT_COMMITTER_DATE="+date,
329
)
330
out, err := cmd.CombinedOutput()
331
if err != nil {
332
t.Fatalf("commit %s: %v\n%s", message, err, out)
333
}
334
}
335
336
func revHEAD(t *testing.T, dir string) string {
337
t.Helper()
338
cmd := exec.Command("git", "rev-parse", "HEAD")
339
cmd.Dir = dir
340
out, err := cmd.Output()
341
if err != nil {
342
t.Fatal(err)
343
}
344
return strings.TrimSpace(string(out))
345
}
@@ -0,0 +1,345 @@1
package server2
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
"time"15
16
"gitlab.com/Timfa/bluegit/internal/auth"17
"gitlab.com/Timfa/bluegit/internal/config"18
"gitlab.com/Timfa/bluegit/internal/gitrepo"19
"gitlab.com/Timfa/bluegit/internal/store"20
)21
22
func TestCommitPusher(t *testing.T) {23
if _, err := exec.LookPath("git"); err != nil {24
t.Skip("git ontbreekt")25
}26
storage := t.TempDir()27
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())28
if err != nil {29
t.Fatal(err)30
}31
t.Cleanup(func() { _ = st.Close() })32
cfg := config.Config{33
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,34
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test"},35
Git: config.Git{Binary: "git", DefaultBranch: "master"},36
}37
cfg.Auth.BaseURL = "https://auth.timfalken.com"38
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}39
ts := httptest.NewServer(srv.Handler())40
t.Cleanup(ts.Close)41
42
jar, _ := cookiejar.New(nil)43
client := &http.Client{Jar: jar}44
res, err := client.Get(ts.URL + "/login")45
if err != nil {46
t.Fatal(err)47
}48
page := read(t, res)49
csrf := csrfOf(t, page)50
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrf}, "name": {"oud"}, "visibility": {"private"}})51
if err != nil {52
t.Fatal(err)53
}54
page = read(t, res)55
res, err = client.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"notes"}, "visibility": {"private"}})56
if err != nil {57
t.Fatal(err)58
}59
page = read(t, res)60
61
ctx := context.Background()62
const avatar = "https://auth.timfalken.com/avatar/2"63
ada, err := st.UpsertUser(ctx, 2, "ada", avatar, false)64
if err != nil {65
t.Fatal(err)66
}67
notes, err := st.RepoByPath(ctx, "tim", "notes")68
if err != nil {69
t.Fatal(err)70
}71
if err := st.SetMember(ctx, "repo", notes.ID, "ada", "developer"); err != nil {72
t.Fatal(err)73
}74
75
res, err = client.PostForm(ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"laptop"}})76
if err != nil {77
t.Fatal(err)78
}79
token := between(read(t, res), `<p class="code">`, "</p>")80
if !strings.HasPrefix(token, "bg_") {81
t.Fatal("geen token")82
}83
adaToken, err := st.CreateToken(ctx, ada.ID, "ada")84
if err != nil {85
t.Fatal(err)86
}87
88
oudWork := t.TempDir()89
gitPrep(t, oudWork)90
writeFile(t, filepath.Join(oudWork, "ghost.txt"), "ghost\n")91
git(t, oudWork, "add", "ghost.txt")92
gitAs(t, oudWork, "Ghost Writer", "ghost@example.com", "2026-09-01T12:00:00Z", "oud-ghost")93
writeFile(t, filepath.Join(oudWork, "ada.txt"), "ada\n")94
git(t, oudWork, "add", "ada.txt")95
gitAs(t, oudWork, "Ada Lovelace", "ada@users.git.timfalken.com", "2026-09-02T12:00:00Z", "oud-ada")96
git(t, oudWork, "remote", "add", "origin", gitrepo.Dir(storage, "tim", "oud"))97
git(t, oudWork, "push", "origin", "master")98
oudRepo, err := st.RepoByPath(ctx, "tim", "oud")99
if err != nil {100
t.Fatal(err)101
}102
if err := st.DropContributions(ctx, oudRepo.ID); err != nil {103
t.Fatal(err)104
}105
106
res, err = client.Get(ts.URL + "/tim/oud")107
if err != nil {108
t.Fatal(err)109
}110
oud := read(t, res)111
for _, want := range []string{112
`href="/users/ada"`,113
avatar,114
"1 contribution in the last 12 months",115
`title="1 contribution on 2 September 2026"`,116
} {117
if !strings.Contains(oud, want) {118
t.Fatalf("oud mist %q", want)119
}120
}121
if strings.Contains(oud, "pushed by") || strings.Contains(oud, `title="1 contribution on 1 September 2026"`) {122
t.Fatal("oud verzint een pusher of telt de onbekende commit")123
}124
res, err = client.Get(ts.URL + "/tim/oud/-/commits")125
if err != nil {126
t.Fatal(err)127
}128
oudLog := read(t, res)129
if !strings.Contains(oudLog, "Ghost Writer") || strings.Contains(oudLog, "pushed by") {130
t.Fatal("historische commit hoort de ruwe naam te houden")131
}132
133
work := t.TempDir()134
gitPrep(t, work)135
writeFile(t, filepath.Join(work, "a.txt"), "a\n")136
git(t, work, "add", "a.txt")137
gitAs(t, work, "Other Person", "other@example.com", "2026-10-01T12:00:00Z", "van-een-ander")138
shaA := revHEAD(t, work)139
writeFile(t, filepath.Join(work, "b.txt"), "b\n")140
git(t, work, "add", "b.txt")141
gitAs(t, work, "Ada Lovelace", "ada@users.git.timfalken.com", "2026-10-02T12:00:00Z", "van-ada")142
shaB := revHEAD(t, work)143
writeFile(t, filepath.Join(work, "c.txt"), "c\n")144
git(t, work, "add", "c.txt")145
gitAs(t, work, "ada", "stranger@example.com", "2026-10-03T12:00:00Z", "naam-ada")146
shaC := revHEAD(t, work)147
remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/notes.git"148
git(t, work, "remote", "add", "origin", remote)149
git(t, work, "push", "-u", "origin", "master")150
151
res, err = client.Get(ts.URL + "/tim/notes")152
if err != nil {153
t.Fatal(err)154
}155
overview := read(t, res)156
for _, want := range []string{`href="/users/tim"`, "pushed by tim", "naam-ada", ">T</span>"} {157
if !strings.Contains(overview, want) {158
t.Fatalf("overzicht mist %q", want)159
}160
}161
if strings.Contains(overview, `href="/users/ada"`) {162
t.Fatal("naam ada kreeg het profiel zonder passende e-mail")163
}164
165
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaB)166
if err != nil {167
t.Fatal(err)168
}169
emailPage := read(t, res)170
if !strings.Contains(emailPage, `href="/users/ada"`) || !strings.Contains(emailPage, avatar) || strings.Contains(emailPage, "pushed by") {171
t.Fatal("e-mailmatch hoort ada te tonen zonder pusher")172
}173
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaA)174
if err != nil {175
t.Fatal(err)176
}177
pushPage := read(t, res)178
if !strings.Contains(pushPage, "Other Person") || !strings.Contains(pushPage, "pushed by tim") || !strings.Contains(pushPage, `href="/users/tim"`) || strings.Contains(pushPage, `href="/users/ada"`) {179
t.Fatal("onbekende auteur hoort de pusher te tonen")180
}181
182
adaWork := t.TempDir()183
adaRemote := strings.Replace(ts.URL, "http://", "http://ada:"+adaToken+"@", 1) + "/tim/notes.git"184
git(t, adaWork, "clone", adaRemote, ".")185
git(t, adaWork, "config", "user.email", "ada@users.git.timfalken.com")186
git(t, adaWork, "config", "user.name", "ada")187
git(t, adaWork, "config", "commit.gpgsign", "false")188
git(t, adaWork, "checkout", "-b", "extra")189
writeFile(t, filepath.Join(adaWork, "d.txt"), "d\n")190
git(t, adaWork, "add", "d.txt")191
gitAs(t, adaWork, "Stranger", "nope@example.com", "2026-10-04T12:00:00Z", "ada-pusht")192
shaD := revHEAD(t, adaWork)193
git(t, adaWork, "push", "-u", "origin", "extra")194
195
got, err := st.PushersBySHA(ctx, notes.ID, []string{shaA, shaB, shaC, shaD})196
if err != nil {197
t.Fatal(err)198
}199
if got[shaA].Username != "tim" || got[shaB].Username != "tim" || got[shaC].Username != "tim" || got[shaD].Username != "ada" {200
t.Fatalf("pushers a=%s b=%s c=%s d=%s", got[shaA].Username, got[shaB].Username, got[shaC].Username, got[shaD].Username)201
}202
203
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaD)204
if err != nil {205
t.Fatal(err)206
}207
adaPush := read(t, res)208
if !strings.Contains(adaPush, "Stranger") || !strings.Contains(adaPush, "pushed by ada") || !strings.Contains(adaPush, `href="/users/ada"`) {209
t.Fatal("nieuwe commit van ada hoort ada als pusher te hebben")210
}211
212
res, err = client.Get(ts.URL + "/")213
if err != nil {214
t.Fatal(err)215
}216
dash := read(t, res)217
for _, want := range []string{218
"2 contributions in the last 12 months",219
`title="1 contribution on 1 October 2026"`,220
`title="1 contribution on 3 October 2026"`,221
} {222
if !strings.Contains(dash, want) {223
t.Fatalf("tim-heatmap mist %q", want)224
}225
}226
for _, ban := range []string{227
`title="1 contribution on 2 October 2026"`,228
`title="1 contribution on 4 October 2026"`,229
`title="1 contribution on 2 September 2026"`,230
} {231
if strings.Contains(dash, ban) {232
t.Fatalf("tim-heatmap telt %s", ban)233
}234
}235
236
adaJar, _ := cookiejar.New(nil)237
adaClient := &http.Client{Jar: adaJar}238
sess, err := st.CreateSession(ctx, ada.ID, "dev", time.Now().Add(time.Hour))239
if err != nil {240
t.Fatal(err)241
}242
u, _ := url.Parse(ts.URL)243
adaJar.SetCookies(u, []*http.Cookie{{Name: "bluegit_session", Value: sess.ID, Path: "/"}})244
res, err = adaClient.Get(ts.URL + "/")245
if err != nil {246
t.Fatal(err)247
}248
adaDash := read(t, res)249
if !strings.Contains(adaDash, "2 contributions in the last 12 months") || !strings.Contains(adaDash, `title="1 contribution on 2 October 2026"`) || !strings.Contains(adaDash, `title="1 contribution on 4 October 2026"`) || strings.Contains(adaDash, `title="1 contribution on 1 October 2026"`) || strings.Contains(adaDash, `title="1 contribution on 2 September 2026"`) {250
t.Fatal("ada-heatmap klopt niet")251
}252
253
res, err = client.Get(ts.URL + "/users/ada")254
if err != nil {255
t.Fatal(err)256
}257
profile := read(t, res)258
if !strings.Contains(profile, "3 contributions in the last 12 months") || !strings.Contains(profile, `title="1 contribution on 2 September 2026"`) || !strings.Contains(profile, "<h1>ada</h1>") || strings.Contains(profile, `title="1 contribution on 1 September 2026"`) {259
t.Fatal("profiel van ada klopt niet")260
}261
anon := &http.Client{}262
res, err = anon.Get(ts.URL + "/users/ada")263
if err != nil {264
t.Fatal(err)265
}266
if !strings.Contains(read(t, res), "No contributions in the last 12 months") {267
t.Fatal("anoniem profiel toont privébijdragen")268
}269
res, err = anon.Get(ts.URL + "/users/nobody")270
if err != nil {271
t.Fatal(err)272
}273
if res.StatusCode != http.StatusNotFound {274
t.Fatalf("onbekend profiel %d", res.StatusCode)275
}276
_ = res.Body.Close()277
278
if err := st.DropContributions(ctx, notes.ID); err != nil {279
t.Fatal(err)280
}281
res, err = client.Get(ts.URL + "/tim/notes")282
if err != nil {283
t.Fatal(err)284
}285
again := read(t, res)286
if !strings.Contains(again, "4 contributions in the last 12 months") || !strings.Contains(again, `title="1 contribution on 1 October 2026"`) {287
t.Fatal("resync vergeet de pusher")288
}289
290
res, err = client.Get(ts.URL + "/settings")291
if err != nil {292
t.Fatal(err)293
}294
settings := read(t, res)295
res, err = client.PostForm(ts.URL+"/settings/language", url.Values{"csrf": {csrfOf(t, settings)}, "language": {"nl"}})296
if err != nil {297
t.Fatal(err)298
}299
_ = read(t, res)300
res, err = client.Get(ts.URL + "/tim/notes/-/commit/" + shaA)301
if err != nil {302
t.Fatal(err)303
}304
nlPage := read(t, res)305
if !strings.Contains(nlPage, "gepusht door tim") || strings.Contains(nlPage, "pushed by") {306
t.Fatal("Nederlandse tekst ontbreekt")307
}308
}309
310
func gitPrep(t *testing.T, dir string) {311
t.Helper()312
git(t, dir, "init", "-b", "master")313
git(t, dir, "config", "user.email", "tim@users.git.timfalken.com")314
git(t, dir, "config", "user.name", "tim")315
git(t, dir, "config", "commit.gpgsign", "false")316
}317
318
func gitAs(t *testing.T, dir, name, email, date, message string) {319
t.Helper()320
cmd := exec.Command("git", "commit", "-m", message)321
cmd.Dir = dir322
cmd.Env = append(os.Environ(),323
"GIT_AUTHOR_NAME="+name,324
"GIT_AUTHOR_EMAIL="+email,325
"GIT_COMMITTER_NAME="+name,326
"GIT_COMMITTER_EMAIL="+email,327
"GIT_AUTHOR_DATE="+date,328
"GIT_COMMITTER_DATE="+date,329
)330
out, err := cmd.CombinedOutput()331
if err != nil {332
t.Fatalf("commit %s: %v\n%s", message, err, out)333
}334
}335
336
func revHEAD(t *testing.T, dir string) string {337
t.Helper()338
cmd := exec.Command("git", "rev-parse", "HEAD")339
cmd.Dir = dir340
out, err := cmd.Output()341
if err != nil {342
t.Fatal(err)343
}344
return strings.TrimSpace(string(out))345
}@@ -125,7 +125,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {
125
125
v.Page = "commits"
126
126
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
127
127
list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)
128
v.Commits = toCommits(list)
128
v.Commits = s.presentCommits(r.Context(), repo.ID, list, i18n.Parse(v.Lang))
129
129
s.render(w, "commits", v)
130
130
}
131
131
@@ -146,8 +146,8 @@ func (s *Server) commit(w http.ResponseWriter, r *http.Request) {
146
146
return
147
147
}
148
148
v := s.repoView(w, r, repo, role, c.Subject)
149
row := toCommits([]gitrepo.Commit{c})[0]
150
v.Commit = &row
149
rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, i18n.Parse(v.Lang))
150
v.Commit = &rows[0]
151
151
s.render(w, "commit", v)
152
152
}
153
153
@@ -454,14 +454,6 @@ func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {
454
454
s.finishCreate(w, r, "/groups/"+g.Path, s.tr(r, "flash.groupCreated"))
455
455
}
456
456
457
func toCommits(in []gitrepo.Commit) []CommitRow {
458
var out []CommitRow
459
for _, c := range in {
460
out = append(out, CommitRow{SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date, Subject: c.Subject, Body: c.Body})
461
}
462
return out
463
}
464
465
457
func toEntries(base string, in []gitrepo.Entry) []EntryRow {
466
458
var out []EntryRow
467
459
for _, e := range in {
@@ -125,7 +125,7 @@ func (s *Server) commits(w http.ResponseWriter, r *http.Request) {125
v.Page = "commits"125
v.Page = "commits"126
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)126
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)127
list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)127
list, _ := gitrepo.Log(r.Context(), s.Git, dir, v.Rev, 50)128
v.Commits = toCommits(list)128
v.Commits = s.presentCommits(r.Context(), repo.ID, list, i18n.Parse(v.Lang))129
s.render(w, "commits", v)129
s.render(w, "commits", v)130
}130
}131
131
@@ -146,8 +146,8 @@ func (s *Server) commit(w http.ResponseWriter, r *http.Request) {146
return146
return147
}147
}148
v := s.repoView(w, r, repo, role, c.Subject)148
v := s.repoView(w, r, repo, role, c.Subject)149
row := toCommits([]gitrepo.Commit{c})[0]149
rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, i18n.Parse(v.Lang))150
v.Commit = &row150
v.Commit = &rows[0]151
s.render(w, "commit", v)151
s.render(w, "commit", v)152
}152
}153
153
@@ -454,14 +454,6 @@ func (s *Server) createGroup(w http.ResponseWriter, r *http.Request) {454
s.finishCreate(w, r, "/groups/"+g.Path, s.tr(r, "flash.groupCreated"))454
s.finishCreate(w, r, "/groups/"+g.Path, s.tr(r, "flash.groupCreated"))455
}455
}456
456
457
func toCommits(in []gitrepo.Commit) []CommitRow {458
var out []CommitRow459
for _, c := range in {460
out = append(out, CommitRow{SHA: c.SHA, Short: c.Short, Author: c.Author, Date: c.Date, Subject: c.Subject, Body: c.Body})461
}462
return out463
}464
465
func toEntries(base string, in []gitrepo.Entry) []EntryRow {457
func toEntries(base string, in []gitrepo.Entry) []EntryRow {466
var out []EntryRow458
var out []EntryRow467
for _, e := range in {459
for _, e := range in {@@ -85,6 +85,7 @@ func (s *Server) Handler() http.Handler {
85
85
mux.HandleFunc("POST /settings/ssh", s.addSSH)
86
86
mux.HandleFunc("POST /settings/ssh/delete", s.deleteSSH)
87
87
mux.HandleFunc("GET /settings/export", s.export)
88
mux.HandleFunc("GET /users/{username}", s.profile)
88
89
mux.HandleFunc("GET /groups/{path}", s.groupPage)
89
90
mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)
90
91
mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)
@@ -470,6 +471,7 @@ type View struct {
470
471
TagNames []string
471
472
Heat *activity.Calendar
472
473
Notes []NoteRow
474
Profile *store.User
473
475
}
474
476
475
477
// LangChoice is één taal in de instellingen.
@@ -505,8 +507,11 @@ type CodeLine struct {
505
507
}
506
508
507
509
// CommitRow is een commit in de interface.
510
// Author is de gekoppelde gebruiker, of anders de ruwe git-naam.
511
// RawName en PushedBy zijn gezet als de pusher de fallback is en de git-naam afwijkt.
508
512
type CommitRow struct {
509
513
SHA, Short, Author, Date, Subject, Body, When string
514
UserURL, Avatar, Initial, RawName, PushedBy string
510
515
}
511
516
512
517
// EntryRow is een bestand of map.
@@ -85,6 +85,7 @@ func (s *Server) Handler() http.Handler {85
mux.HandleFunc("POST /settings/ssh", s.addSSH)85
mux.HandleFunc("POST /settings/ssh", s.addSSH)86
mux.HandleFunc("POST /settings/ssh/delete", s.deleteSSH)86
mux.HandleFunc("POST /settings/ssh/delete", s.deleteSSH)87
mux.HandleFunc("GET /settings/export", s.export)87
mux.HandleFunc("GET /settings/export", s.export)88
mux.HandleFunc("GET /users/{username}", s.profile)88
mux.HandleFunc("GET /groups/{path}", s.groupPage)89
mux.HandleFunc("GET /groups/{path}", s.groupPage)89
mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)90
mux.HandleFunc("GET /groups/{path}/logo", s.groupLogo)90
mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)91
mux.HandleFunc("POST /groups/{path}/settings", s.saveGroup)@@ -470,6 +471,7 @@ type View struct {470
TagNames []string471
TagNames []string471
Heat *activity.Calendar472
Heat *activity.Calendar472
Notes []NoteRow473
Notes []NoteRow474
Profile *store.User473
}475
}474
476
475
// LangChoice is één taal in de instellingen.477
// LangChoice is één taal in de instellingen.@@ -505,8 +507,11 @@ type CodeLine struct {505
}507
}506
508
507
// CommitRow is een commit in de interface.509
// CommitRow is een commit in de interface.510
// Author is de gekoppelde gebruiker, of anders de ruwe git-naam.511
// RawName en PushedBy zijn gezet als de pusher de fallback is en de git-naam afwijkt.508
type CommitRow struct {512
type CommitRow struct {509
SHA, Short, Author, Date, Subject, Body, When string513
SHA, Short, Author, Date, Subject, Body, When string514
UserURL, Avatar, Initial, RawName, PushedBy string510
}515
}511
516
512
// EntryRow is een bestand of map.517
// EntryRow is een bestand of map.@@ -98,11 +98,16 @@ main.wide { max-width: 1180px; }
98
98
border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.75rem; margin: 0.4rem 0 0.8rem;
99
99
}
100
100
.commitbar .grow { flex: 1; min-width: 0; }
101
.commitbar .grow a { display: block; font-weight: 650; color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
101
.commitbar .subject { display: block; font-weight: 650; color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
102
102
.avatar {
103
103
width: 32px; height: 32px; border-radius: 50%; background: #d5e0ee; color: var(--ink);
104
104
display: grid; place-items: center; font-size: 0.85rem; font-weight: 700; flex: none;
105
105
}
106
img.avatar { object-fit: cover; display: block; }
107
.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }
108
.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }
109
.commitwho a:hover { text-decoration: underline; }
110
ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }
106
111
.sha { background: white; border: 1px solid var(--line); border-radius: 6px; padding: 0.15rem 0.4rem; }
107
112
.iconbtn, .copyline button {
108
113
background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 8px;
@@ -98,11 +98,16 @@ main.wide { max-width: 1180px; }98
border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.75rem; margin: 0.4rem 0 0.8rem;98
border: 1px solid var(--line); border-radius: 10px; padding: 0.55rem 0.75rem; margin: 0.4rem 0 0.8rem;99
}99
}100
.commitbar .grow { flex: 1; min-width: 0; }100
.commitbar .grow { flex: 1; min-width: 0; }101
.commitbar .grow a { display: block; font-weight: 650; color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }101
.commitbar .subject { display: block; font-weight: 650; color: inherit; text-decoration: none; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }102
.avatar {102
.avatar {103
width: 32px; height: 32px; border-radius: 50%; background: #d5e0ee; color: var(--ink);103
width: 32px; height: 32px; border-radius: 50%; background: #d5e0ee; color: var(--ink);104
display: grid; place-items: center; font-size: 0.85rem; font-weight: 700; flex: none;104
display: grid; place-items: center; font-size: 0.85rem; font-weight: 700; flex: none;105
}105
}106
img.avatar { object-fit: cover; display: block; }107
.avatar.lg { width: 64px; height: 64px; font-size: 1.35rem; }108
.commitwho a { color: var(--ink); font-weight: 650; text-decoration: none; }109
.commitwho a:hover { text-decoration: underline; }110
ul.clean li.commitline { display: flex; gap: 0.65rem; align-items: center; }106
.sha { background: white; border: 1px solid var(--line); border-radius: 6px; padding: 0.15rem 0.4rem; }111
.sha { background: white; border: 1px solid var(--line); border-radius: 6px; padding: 0.15rem 0.4rem; }107
.iconbtn, .copyline button {112
.iconbtn, .copyline button {108
background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 8px;113
background: white; color: var(--ink); border: 1px solid var(--line); border-radius: 8px;@@ -64,6 +64,16 @@
64
64
{{template "layout-end" .}}
65
65
{{end}}
66
66
67
{{define "profile"}}
68
{{template "layout-start" .}}
69
<div class="projhead">
70
{{if .Profile.AvatarURL}}<img class="avatar lg" src="{{.Profile.AvatarURL}}" alt="">{{else}}<span class="avatar lg">{{initial .Profile.Username}}</span>{{end}}
71
<h1>{{.Profile.Username}}</h1>
72
</div>
73
{{if .Heat}}{{template "heatmap" .Heat}}{{end}}
74
{{template "layout-end" .}}
75
{{end}}
76
67
77
{{define "heatmap"}}
68
78
<section class="heat" aria-label="{{t "heat.title"}}">
69
79
<h2>{{t "heat.title"}}</h2>
@@ -221,13 +231,19 @@
221
231
{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.protected"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}
222
232
{{end}}
223
233
234
{{define "avatar"}}
235
{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}
236
{{end}}
237
238
{{define "commitwho"}}<span class="commitwho">{{if .UserURL}}<a href="{{.UserURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .RawName}} {{.RawName}}{{end}}{{if .PushedBy}} · {{t "commit.pushedBy" .PushedBy}}{{end}}</span>{{end}}
239
224
240
{{define "commitbar"}}
225
241
{{if .Head}}
226
242
<div class="commitbar">
227
<span class="avatar">{{initial .Head.Author}}</span>
243
{{template "avatar" .Head}}
228
244
<div class="grow">
229
<a href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>
230
<div class="muted">{{.Head.Author}} · {{.Head.When}}</div>
245
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>
246
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>
231
247
</div>
232
248
<code class="sha">{{slice .Head.SHA 0 8}}</code>
233
249
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>
@@ -377,7 +393,7 @@
377
393
<h1>{{t "title.commits"}}</h1>
378
394
{{template "repotabs" .}}
379
395
<ul class="clean">
380
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{else}}<li class="muted">{{t "repo.noCommits"}}</li>{{end}}
396
{{range .Commits}}<li class="commitline">{{template "avatar" .}}<div><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <div class="muted"><code>{{.Short}}</code> · {{template "commitwho" .}} · {{.Date}}</div></div></li>{{else}}<li class="muted">{{t "repo.noCommits"}}</li>{{end}}
381
397
</ul>
382
398
{{template "layout-end" .}}
383
399
{{end}}
@@ -386,7 +402,13 @@
386
402
{{template "layout-start" .}}
387
403
<h1>{{.Commit.Subject}}</h1>
388
404
{{template "repotabs" .}}
389
<p class="muted">{{.Commit.SHA}} · {{.Commit.Author}} · {{.Commit.Date}}</p>
405
<div class="projhead">
406
{{template "avatar" .Commit}}
407
<div>
408
<p>{{template "commitwho" .Commit}}</p>
409
<p class="muted">{{.Commit.SHA}} · {{.Commit.Date}}</p>
410
</div>
411
</div>
390
412
{{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}
391
413
{{template "layout-end" .}}
392
414
{{end}}
@@ -64,6 +64,16 @@64
{{template "layout-end" .}}64
{{template "layout-end" .}}65
{{end}}65
{{end}}66
66
67
{{define "profile"}}68
{{template "layout-start" .}}69
<div class="projhead">70
{{if .Profile.AvatarURL}}<img class="avatar lg" src="{{.Profile.AvatarURL}}" alt="">{{else}}<span class="avatar lg">{{initial .Profile.Username}}</span>{{end}}71
<h1>{{.Profile.Username}}</h1>72
</div>73
{{if .Heat}}{{template "heatmap" .Heat}}{{end}}74
{{template "layout-end" .}}75
{{end}}76
67
{{define "heatmap"}}77
{{define "heatmap"}}68
<section class="heat" aria-label="{{t "heat.title"}}">78
<section class="heat" aria-label="{{t "heat.title"}}">69
<h2>{{t "heat.title"}}</h2>79
<h2>{{t "heat.title"}}</h2>@@ -221,13 +231,19 @@221
{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.protected"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}231
{{if .RevProtected}}<svg class="vis" viewBox="0 0 16 16" aria-label="{{t "vis.protected"}}"><rect x="3.5" y="7" width="9" height="6.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.4"/><path fill="none" stroke="currentColor" stroke-width="1.4" d="M5.5 7V5a2.5 2.5 0 0 1 5 0v2"/></svg>{{end}}222
{{end}}232
{{end}}223
233
234
{{define "avatar"}}235
{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="">{{else}}<span class="avatar">{{if .Initial}}{{.Initial}}{{else}}{{initial .Author}}{{end}}</span>{{end}}236
{{end}}237
238
{{define "commitwho"}}<span class="commitwho">{{if .UserURL}}<a href="{{.UserURL}}">{{.Author}}</a>{{else}}{{.Author}}{{end}}{{if .RawName}} {{.RawName}}{{end}}{{if .PushedBy}} · {{t "commit.pushedBy" .PushedBy}}{{end}}</span>{{end}}239
224
{{define "commitbar"}}240
{{define "commitbar"}}225
{{if .Head}}241
{{if .Head}}226
<div class="commitbar">242
<div class="commitbar">227
<span class="avatar">{{initial .Head.Author}}</span>243
{{template "avatar" .Head}}228
<div class="grow">244
<div class="grow">229
<a href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>245
<a class="subject" href="/{{.Repo.FullPath}}/-/commit/{{.Head.SHA}}">{{.Head.Subject}}</a>230
<div class="muted">{{.Head.Author}} · {{.Head.When}}</div>246
<div class="muted">{{template "commitwho" .Head}} · {{.Head.When}}</div>231
</div>247
</div>232
<code class="sha">{{slice .Head.SHA 0 8}}</code>248
<code class="sha">{{slice .Head.SHA 0 8}}</code>233
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>249
<button type="button" class="iconbtn" data-copy="{{.Head.SHA}}" aria-label="{{t "action.copy"}}">{{t "action.copy"}}</button>@@ -377,7 +393,7 @@377
<h1>{{t "title.commits"}}</h1>393
<h1>{{t "title.commits"}}</h1>378
{{template "repotabs" .}}394
{{template "repotabs" .}}379
<ul class="clean">395
<ul class="clean">380
{{range .Commits}}<li><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Short}}</a> {{.Subject}} <span class="muted">{{.Author}} · {{.Date}}</span></li>{{else}}<li class="muted">{{t "repo.noCommits"}}</li>{{end}}396
{{range .Commits}}<li class="commitline">{{template "avatar" .}}<div><a href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Subject}}</a> <div class="muted"><code>{{.Short}}</code> · {{template "commitwho" .}} · {{.Date}}</div></div></li>{{else}}<li class="muted">{{t "repo.noCommits"}}</li>{{end}}381
</ul>397
</ul>382
{{template "layout-end" .}}398
{{template "layout-end" .}}383
{{end}}399
{{end}}@@ -386,7 +402,13 @@386
{{template "layout-start" .}}402
{{template "layout-start" .}}387
<h1>{{.Commit.Subject}}</h1>403
<h1>{{.Commit.Subject}}</h1>388
{{template "repotabs" .}}404
{{template "repotabs" .}}389
<p class="muted">{{.Commit.SHA}} · {{.Commit.Author}} · {{.Commit.Date}}</p>405
<div class="projhead">406
{{template "avatar" .Commit}}407
<div>408
<p>{{template "commitwho" .Commit}}</p>409
<p class="muted">{{.Commit.SHA}} · {{.Commit.Date}}</p>410
</div>411
</div>390
{{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}412
{{if .Commit.Body}}<pre>{{.Commit.Body}}</pre>{{end}}391
{{template "layout-end" .}}413
{{template "layout-end" .}}392
{{end}}414
{{end}}@@ -97,33 +97,39 @@ func (s *Store) DropContributions(ctx context.Context, repoID int64) error {
97
97
return err
98
98
}
99
99
100
// UserIDByGitAuthor koppelt een commit aan een account via het e-mailadres of de naam.
101
func (s *Store) UserIDByGitAuthor(ctx context.Context, email, name string) (int64, bool) {
102
if id, ok := s.userIDByName(ctx, emailLocal(email)); ok {
103
return id, true
100
// UserByGitEmail koppelt het lokale deel van een auteur-e-mail aan een gebruikersnaam.
101
// Er is geen e-mailkolom: ada@example.com hoort bij de gebruiker ada.
102
// Een waarde zonder @ telt niet, en de git-auteurnaam telt niet.
103
func (s *Store) UserByGitEmail(ctx context.Context, email string) (User, bool) {
104
local, ok := emailLocal(email)
105
if !ok {
106
return User{}, false
104
107
}
105
if id, ok := s.userIDByName(ctx, name); ok {
106
return id, true
108
u, err := s.UserByUsername(ctx, local)
109
if err != nil {
110
return User{}, false
107
111
}
108
return 0, false
112
return u, true
109
113
}
110
114
111
func (s *Store) userIDByName(ctx context.Context, name string) (int64, bool) {
112
name = strings.ToLower(strings.TrimSpace(name))
113
if name == "" || strings.ContainsAny(name, " @") {
114
return 0, false
115
}
116
u, err := s.UserByUsername(ctx, name)
117
if err != nil {
115
// UserIDByGitAuthor is UserByGitEmail als alleen het id nodig is.
116
func (s *Store) UserIDByGitAuthor(ctx context.Context, email string) (int64, bool) {
117
u, ok := s.UserByGitEmail(ctx, email)
118
if !ok {
118
119
return 0, false
119
120
}
120
121
return u.ID, true
121
122
}
122
123
123
func emailLocal(email string) string {
124
func emailLocal(email string) (string, bool) {
124
125
email = strings.ToLower(strings.TrimSpace(email))
125
if i := strings.LastIndex(email, "@"); i >= 0 {
126
email = email[:i]
126
i := strings.LastIndex(email, "@")
127
if i <= 0 || i == len(email)-1 {
128
return "", false
129
}
130
local := email[:i]
131
if local == "" || strings.ContainsAny(local, " @") {
132
return "", false
127
133
}
128
return email
134
return local, true
129
135
}
@@ -97,33 +97,39 @@ func (s *Store) DropContributions(ctx context.Context, repoID int64) error {97
return err97
return err98
}98
}99
99
100
// UserIDByGitAuthor koppelt een commit aan een account via het e-mailadres of de naam.100
// UserByGitEmail koppelt het lokale deel van een auteur-e-mail aan een gebruikersnaam.101
func (s *Store) UserIDByGitAuthor(ctx context.Context, email, name string) (int64, bool) {101
// Er is geen e-mailkolom: ada@example.com hoort bij de gebruiker ada.102
if id, ok := s.userIDByName(ctx, emailLocal(email)); ok {102
// Een waarde zonder @ telt niet, en de git-auteurnaam telt niet.103
return id, true103
func (s *Store) UserByGitEmail(ctx context.Context, email string) (User, bool) {104
local, ok := emailLocal(email)105
if !ok {106
return User{}, false104
}107
}105
if id, ok := s.userIDByName(ctx, name); ok {108
u, err := s.UserByUsername(ctx, local)106
return id, true109
if err != nil {110
return User{}, false107
}111
}108
return 0, false112
return u, true109
}113
}110
114
111
func (s *Store) userIDByName(ctx context.Context, name string) (int64, bool) {115
// UserIDByGitAuthor is UserByGitEmail als alleen het id nodig is.112
name = strings.ToLower(strings.TrimSpace(name))116
func (s *Store) UserIDByGitAuthor(ctx context.Context, email string) (int64, bool) {113
if name == "" || strings.ContainsAny(name, " @") {117
u, ok := s.UserByGitEmail(ctx, email)114
return 0, false118
if !ok {115
}116
u, err := s.UserByUsername(ctx, name)117
if err != nil {118
return 0, false119
return 0, false119
}120
}120
return u.ID, true121
return u.ID, true121
}122
}122
123
123
func emailLocal(email string) string {124
func emailLocal(email string) (string, bool) {124
email = strings.ToLower(strings.TrimSpace(email))125
email = strings.ToLower(strings.TrimSpace(email))125
if i := strings.LastIndex(email, "@"); i >= 0 {126
i := strings.LastIndex(email, "@")126
email = email[:i]127
if i <= 0 || i == len(email)-1 {128
return "", false129
}130
local := email[:i]131
if local == "" || strings.ContainsAny(local, " @") {132
return "", false127
}133
}128
return email134
return local, true129
}135
}@@ -48,13 +48,35 @@ func TestContributionsFilterAndNotes(t *testing.T) {
48
48
if err != nil || len(none) != 0 {
49
49
t.Fatalf("lege lijst %v %v", none, err)
50
50
}
51
id, ok := s.UserIDByGitAuthor(ctx, "Tim@users.git.timfalken.com", "Tim Falken")
51
id, ok := s.UserIDByGitAuthor(ctx, "Tim@users.git.timfalken.com")
52
52
if !ok || id != tim.ID {
53
53
t.Fatalf("auteur %d %v", id, ok)
54
54
}
55
if _, ok := s.UserIDByGitAuthor(ctx, "onbekend@example.com", "Niemand"); ok {
55
if id, ok := s.UserIDByGitAuthor(ctx, "ada@example.com"); !ok || id != ada.ID {
56
t.Fatalf("lokaal deel %d %v", id, ok)
57
}
58
if _, ok := s.UserIDByGitAuthor(ctx, "onbekend@example.com"); ok {
56
59
t.Fatal("onbekende auteur gekoppeld")
57
60
}
61
if _, ok := s.UserIDByGitAuthor(ctx, "tim"); ok {
62
t.Fatal("naam zonder e-mail gekoppeld")
63
}
64
if err := s.RememberPushers(ctx, demo.ID, tim.ID, []PushAuthor{{SHA: "abc", Name: "Other Person", Email: "other@example.com"}}); err != nil {
65
t.Fatal(err)
66
}
67
if err := s.RememberPushers(ctx, demo.ID, ada.ID, []PushAuthor{{SHA: "abc", Name: "Other Person", Email: "other@example.com"}, {SHA: "", Name: "leeg", Email: ""}}); err != nil {
68
t.Fatal(err)
69
}
70
got, err := s.PushersBySHA(ctx, demo.ID, []string{"abc", "missing"})
71
if err != nil {
72
t.Fatal(err)
73
}
74
if got["abc"].Username != "tim" || got["abc"].UserID != tim.ID {
75
t.Fatalf("eerste pusher %+v", got["abc"])
76
}
77
if _, ok := got["missing"]; ok {
78
t.Fatal("ontbrekende sha")
79
}
58
80
mr, err := s.CreateMergeRequest(ctx, demo.ID, tim.ID, "titel", "", "feature", "master")
59
81
if err != nil {
60
82
t.Fatal(err)
@@ -48,13 +48,35 @@ func TestContributionsFilterAndNotes(t *testing.T) {48
if err != nil || len(none) != 0 {48
if err != nil || len(none) != 0 {49
t.Fatalf("lege lijst %v %v", none, err)49
t.Fatalf("lege lijst %v %v", none, err)50
}50
}51
id, ok := s.UserIDByGitAuthor(ctx, "Tim@users.git.timfalken.com", "Tim Falken")51
id, ok := s.UserIDByGitAuthor(ctx, "Tim@users.git.timfalken.com")52
if !ok || id != tim.ID {52
if !ok || id != tim.ID {53
t.Fatalf("auteur %d %v", id, ok)53
t.Fatalf("auteur %d %v", id, ok)54
}54
}55
if _, ok := s.UserIDByGitAuthor(ctx, "onbekend@example.com", "Niemand"); ok {55
if id, ok := s.UserIDByGitAuthor(ctx, "ada@example.com"); !ok || id != ada.ID {56
t.Fatalf("lokaal deel %d %v", id, ok)57
}58
if _, ok := s.UserIDByGitAuthor(ctx, "onbekend@example.com"); ok {56
t.Fatal("onbekende auteur gekoppeld")59
t.Fatal("onbekende auteur gekoppeld")57
}60
}61
if _, ok := s.UserIDByGitAuthor(ctx, "tim"); ok {62
t.Fatal("naam zonder e-mail gekoppeld")63
}64
if err := s.RememberPushers(ctx, demo.ID, tim.ID, []PushAuthor{{SHA: "abc", Name: "Other Person", Email: "other@example.com"}}); err != nil {65
t.Fatal(err)66
}67
if err := s.RememberPushers(ctx, demo.ID, ada.ID, []PushAuthor{{SHA: "abc", Name: "Other Person", Email: "other@example.com"}, {SHA: "", Name: "leeg", Email: ""}}); err != nil {68
t.Fatal(err)69
}70
got, err := s.PushersBySHA(ctx, demo.ID, []string{"abc", "missing"})71
if err != nil {72
t.Fatal(err)73
}74
if got["abc"].Username != "tim" || got["abc"].UserID != tim.ID {75
t.Fatalf("eerste pusher %+v", got["abc"])76
}77
if _, ok := got["missing"]; ok {78
t.Fatal("ontbrekende sha")79
}58
mr, err := s.CreateMergeRequest(ctx, demo.ID, tim.ID, "titel", "", "feature", "master")80
mr, err := s.CreateMergeRequest(ctx, demo.ID, tim.ID, "titel", "", "feature", "master")59
if err != nil {81
if err != nil {60
t.Fatal(err)82
t.Fatal(err)@@ -0,0 +1,92 @@
1
package store
2
3
import (
4
"context"
5
"database/sql"
6
"strings"
7
)
8
9
// PushAuthor is de git-auteur van een commit die net nieuw werd.
10
type PushAuthor struct {
11
SHA, Name, Email string
12
}
13
14
// Pusher is wie een commit als eerste in deze repository pushte.
15
type Pusher struct {
16
UserID int64
17
Username string
18
AvatarURL string
19
Name string
20
Email string
21
}
22
23
// RememberPushers onthoudt de pusher. Een commit die al een pusher heeft
24
// houdt die: een latere push, rebase of merge overschrijft hem niet.
25
func (s *Store) RememberPushers(ctx context.Context, repoID, userID int64, rows []PushAuthor) error {
26
if repoID == 0 || userID == 0 || len(rows) == 0 {
27
return nil
28
}
29
tx, err := s.db.BeginTx(ctx, nil)
30
if err != nil {
31
return err
32
}
33
defer func() { _ = tx.Rollback() }()
34
for _, row := range rows {
35
sha := strings.TrimSpace(row.SHA)
36
if sha == "" {
37
continue
38
}
39
if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO commit_pushers (repo_id, sha, user_id, author_name, author_email, created_at) VALUES (?, ?, ?, ?, ?, ?)`,
40
repoID, sha, userID, row.Name, row.Email, now()); err != nil {
41
return err
42
}
43
}
44
return tx.Commit()
45
}
46
47
// PushersBySHA leest de eerste pusher van de gevraagde commits.
48
func (s *Store) PushersBySHA(ctx context.Context, repoID int64, shas []string) (map[string]Pusher, error) {
49
if repoID == 0 || len(shas) == 0 {
50
return map[string]Pusher{}, nil
51
}
52
hold := make([]string, len(shas))
53
args := make([]any, 0, len(shas)+1)
54
args = append(args, repoID)
55
for i, sha := range shas {
56
hold[i] = "?"
57
args = append(args, sha)
58
}
59
q := pusherSelect + ` WHERE p.repo_id = ? AND p.sha IN (` + strings.Join(hold, ",") + `)`
60
rows, err := s.db.QueryContext(ctx, q, args...)
61
if err != nil {
62
return nil, err
63
}
64
defer rows.Close()
65
return scanPushers(rows)
66
}
67
68
// PushersByRepo leest elke eerste pusher van een repository.
69
func (s *Store) PushersByRepo(ctx context.Context, repoID int64) (map[string]Pusher, error) {
70
rows, err := s.db.QueryContext(ctx, pusherSelect+` WHERE p.repo_id = ?`, repoID)
71
if err != nil {
72
return nil, err
73
}
74
defer rows.Close()
75
return scanPushers(rows)
76
}
77
78
const pusherSelect = `SELECT p.sha, p.user_id, u.username, u.avatar_url, p.author_name, p.author_email
79
FROM commit_pushers p JOIN users u ON u.id = p.user_id`
80
81
func scanPushers(rows *sql.Rows) (map[string]Pusher, error) {
82
out := map[string]Pusher{}
83
for rows.Next() {
84
var sha string
85
var p Pusher
86
if err := rows.Scan(&sha, &p.UserID, &p.Username, &p.AvatarURL, &p.Name, &p.Email); err != nil {
87
return nil, err
88
}
89
out[sha] = p
90
}
91
return out, rows.Err()
92
}
@@ -0,0 +1,92 @@1
package store2
3
import (4
"context"5
"database/sql"6
"strings"7
)8
9
// PushAuthor is de git-auteur van een commit die net nieuw werd.10
type PushAuthor struct {11
SHA, Name, Email string12
}13
14
// Pusher is wie een commit als eerste in deze repository pushte.15
type Pusher struct {16
UserID int6417
Username string18
AvatarURL string19
Name string20
Email string21
}22
23
// RememberPushers onthoudt de pusher. Een commit die al een pusher heeft24
// houdt die: een latere push, rebase of merge overschrijft hem niet.25
func (s *Store) RememberPushers(ctx context.Context, repoID, userID int64, rows []PushAuthor) error {26
if repoID == 0 || userID == 0 || len(rows) == 0 {27
return nil28
}29
tx, err := s.db.BeginTx(ctx, nil)30
if err != nil {31
return err32
}33
defer func() { _ = tx.Rollback() }()34
for _, row := range rows {35
sha := strings.TrimSpace(row.SHA)36
if sha == "" {37
continue38
}39
if _, err := tx.ExecContext(ctx, `INSERT OR IGNORE INTO commit_pushers (repo_id, sha, user_id, author_name, author_email, created_at) VALUES (?, ?, ?, ?, ?, ?)`,40
repoID, sha, userID, row.Name, row.Email, now()); err != nil {41
return err42
}43
}44
return tx.Commit()45
}46
47
// PushersBySHA leest de eerste pusher van de gevraagde commits.48
func (s *Store) PushersBySHA(ctx context.Context, repoID int64, shas []string) (map[string]Pusher, error) {49
if repoID == 0 || len(shas) == 0 {50
return map[string]Pusher{}, nil51
}52
hold := make([]string, len(shas))53
args := make([]any, 0, len(shas)+1)54
args = append(args, repoID)55
for i, sha := range shas {56
hold[i] = "?"57
args = append(args, sha)58
}59
q := pusherSelect + ` WHERE p.repo_id = ? AND p.sha IN (` + strings.Join(hold, ",") + `)`60
rows, err := s.db.QueryContext(ctx, q, args...)61
if err != nil {62
return nil, err63
}64
defer rows.Close()65
return scanPushers(rows)66
}67
68
// PushersByRepo leest elke eerste pusher van een repository.69
func (s *Store) PushersByRepo(ctx context.Context, repoID int64) (map[string]Pusher, error) {70
rows, err := s.db.QueryContext(ctx, pusherSelect+` WHERE p.repo_id = ?`, repoID)71
if err != nil {72
return nil, err73
}74
defer rows.Close()75
return scanPushers(rows)76
}77
78
const pusherSelect = `SELECT p.sha, p.user_id, u.username, u.avatar_url, p.author_name, p.author_email79
FROM commit_pushers p JOIN users u ON u.id = p.user_id`80
81
func scanPushers(rows *sql.Rows) (map[string]Pusher, error) {82
out := map[string]Pusher{}83
for rows.Next() {84
var sha string85
var p Pusher86
if err := rows.Scan(&sha, &p.UserID, &p.Username, &p.AvatarURL, &p.Name, &p.Email); err != nil {87
return nil, err88
}89
out[sha] = p90
}91
return out, rows.Err()92
}@@ -297,6 +297,15 @@ CREATE TABLE IF NOT EXISTS notes (
297
297
body TEXT NOT NULL,
298
298
created_at TEXT NOT NULL
299
299
);
300
CREATE TABLE IF NOT EXISTS commit_pushers (
301
repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,
302
sha TEXT NOT NULL,
303
user_id INTEGER NOT NULL REFERENCES users(id),
304
author_name TEXT NOT NULL,
305
author_email TEXT NOT NULL,
306
created_at TEXT NOT NULL,
307
PRIMARY KEY (repo_id, sha)
308
);
300
309
`
301
310
302
311
func now() string { return time.Now().UTC().Format(time.RFC3339) }
@@ -297,6 +297,15 @@ CREATE TABLE IF NOT EXISTS notes (297
body TEXT NOT NULL,297
body TEXT NOT NULL,298
created_at TEXT NOT NULL298
created_at TEXT NOT NULL299
);299
);300
CREATE TABLE IF NOT EXISTS commit_pushers (301
repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE,302
sha TEXT NOT NULL,303
user_id INTEGER NOT NULL REFERENCES users(id),304
author_name TEXT NOT NULL,305
author_email TEXT NOT NULL,306
created_at TEXT NOT NULL,307
PRIMARY KEY (repo_id, sha)308
);300
`309
`301
310
302
func now() string { return time.Now().UTC().Format(time.RFC3339) }311
func now() string { return time.Now().UTC().Format(time.RFC3339) }