BlueGit

timfa bluegit

Merge branch 'feature/commit-graph' into stage

Commitgrafiek op de projectoverzichtspagina, links van de centrale kolom.

timfa Grok Bot · pushed by timfa

Authored 2026-11-12 · 5 days ago

Hash
f5d47c33fc91377644532407183b96e5595c58c6
18 files changed +1691 −5
README.md +1 −0
@@ -11,6 +11,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
11 11 ## Wat het doet
12 12
13 13 - Repositories van een gebruiker of een groep, met bestanden, commits, branches, tags en releases.
14 - Op de project-overzichtspagina staat een commitgrafiek in de lege ruimte naast de centrale kolom, als er plek is. De hoofdbranch gebruikt de BlueGit-blauw; andere branches krijgen een vaste kleur uit hun naam. De grafiek wordt in het geheugen bewaard (LRU) en bij een push ververst, zodat herhaald laden geen git-I/O op schijf doet.
14 15 - Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.
15 16 - Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.
16 17 - Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.
@@ -11,6 +11,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
11## Wat het doet
11## Wat het doet
12
12
13- Repositories van een gebruiker of een groep, met bestanden, commits, branches, tags en releases.
13- Repositories van een gebruiker of een groep, met bestanden, commits, branches, tags en releases.
14- Op de project-overzichtspagina staat een commitgrafiek in de lege ruimte naast de centrale kolom, als er plek is. De hoofdbranch gebruikt de BlueGit-blauw; andere branches krijgen een vaste kleur uit hun naam. De grafiek wordt in het geheugen bewaard (LRU) en bij een push ververst, zodat herhaald laden geen git-I/O op schijf doet.
14- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.
15- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.
15- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.
16- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.
16- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.
17- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.
docs/ARCHITECTURE.md +6 −0
@@ -92,3 +92,9 @@ De bestemming wordt bij het verbinden opgelost. Privébereiken (RFC1918, loopbac
92 92 De systeemgebruiker `bluegit` kan alles lezen wat op de schijf staat, inclusief geheimen (hij heeft `secret.key`). Mensen op de website kunnen dat niet, behalve een beheerder via het JSON-export dat de auth-server verplicht stelt. CI-jobs zien de geheimen die de regel van beschermde branches toelaat. Ze zien de Docker-socket niet.
93 93
94 94 Webhooks gaan niet naar een privénetwerk. De classificatie staat in `internal/ssrf`. Een allowlist van hosts, opnieuw proberen en een testknop staan nog op de roadmap.
95
96 ## Commitgrafiek
97
98 De project-overzichtspagina toont een commitgrafiek in de lege ruimte links van de centrale kolom, als die ruimte breed genoeg is. Anders blijft hij verborgen; de bestaande kolom schuift niet. De hoofdbranch is altijd `--blue`. Andere branches krijgen een deterministische kleur uit een palet van CSS-variabelen, op basis van de branchnaam.
99
100 De gelegde grafiek (recente commits over alle branches, inclusief merges en forks) staat in een begrensde LRU-cache in het geheugen, per repository (en hoofdbranch). Een herhaalde pageview doet geen git-I/O. Bij een push wist `refsChanged` de entry en vult `refreshCache` hem op de achtergrond opnieuw. Deze cache schrijft niet naar schijf en is onafhankelijk van de optionele leescache.
@@ -92,3 +92,9 @@ De bestemming wordt bij het verbinden opgelost. Privébereiken (RFC1918, loopbac
92De systeemgebruiker `bluegit` kan alles lezen wat op de schijf staat, inclusief geheimen (hij heeft `secret.key`). Mensen op de website kunnen dat niet, behalve een beheerder via het JSON-export dat de auth-server verplicht stelt. CI-jobs zien de geheimen die de regel van beschermde branches toelaat. Ze zien de Docker-socket niet.
92De systeemgebruiker `bluegit` kan alles lezen wat op de schijf staat, inclusief geheimen (hij heeft `secret.key`). Mensen op de website kunnen dat niet, behalve een beheerder via het JSON-export dat de auth-server verplicht stelt. CI-jobs zien de geheimen die de regel van beschermde branches toelaat. Ze zien de Docker-socket niet.
93
93
94Webhooks gaan niet naar een privénetwerk. De classificatie staat in `internal/ssrf`. Een allowlist van hosts, opnieuw proberen en een testknop staan nog op de roadmap.
94Webhooks gaan niet naar een privénetwerk. De classificatie staat in `internal/ssrf`. Een allowlist van hosts, opnieuw proberen en een testknop staan nog op de roadmap.
95
96## Commitgrafiek
97
98De project-overzichtspagina toont een commitgrafiek in de lege ruimte links van de centrale kolom, als die ruimte breed genoeg is. Anders blijft hij verborgen; de bestaande kolom schuift niet. De hoofdbranch is altijd `--blue`. Andere branches krijgen een deterministische kleur uit een palet van CSS-variabelen, op basis van de branchnaam.
99
100De gelegde grafiek (recente commits over alle branches, inclusief merges en forks) staat in een begrensde LRU-cache in het geheugen, per repository (en hoofdbranch). Een herhaalde pageview doet geen git-I/O. Bij een push wist `refsChanged` de entry en vult `refreshCache` hem op de achtergrond opnieuw. Deze cache schrijft niet naar schijf en is onafhankelijk van de optionele leescache.
internal/gitgraph/cache.go added +158 −0
@@ -0,0 +1,158 @@
1 package gitgraph
2
3 import (
4 "container/list"
5 "context"
6 "strings"
7 "sync"
8 )
9
10 // DefaultMaxBytes is 8 MiB, ruim voor honderden grafieken.
11 const DefaultMaxBytes = 8 << 20
12
13 // Loader leest commits en refs uit git. Wordt alleen bij een miss aangeroepen.
14 type Loader func(ctx context.Context) ([]Commit, []Ref, error)
15
16 // Cache bewaart gelegde grafieken in het geheugen. Geen schijf-I/O.
17 type Cache struct {
18 max int64
19
20 mu sync.Mutex
21 lru *list.List // voorkant = recent
22 items map[string]*list.Element
23 size int64
24 hits int64
25 miss int64
26 }
27
28 type cached struct {
29 key string
30 repo int64
31 graph *Graph
32 bytes int64
33 }
34
35 // NewCache maakt een lege LRU-cache. max <= 0 gebruikt DefaultMaxBytes.
36 func NewCache(max int64) *Cache {
37 if max <= 0 {
38 max = DefaultMaxBytes
39 }
40 return &Cache{max: max, lru: list.New(), items: map[string]*list.Element{}}
41 }
42
43 // Get geeft een cached grafiek, of legt er één vanuit load. load wordt
44 // bij een hit niet aangeroepen.
45 func (c *Cache) Get(ctx context.Context, key, defaultBranch string, load Loader) (*Graph, error) {
46 if c == nil {
47 commits, refs, err := load(ctx)
48 if err != nil {
49 return nil, err
50 }
51 return Layout(commits, refs, defaultBranch), nil
52 }
53 if g, ok := c.lookup(key); ok {
54 return g, nil
55 }
56 commits, refs, err := load(ctx)
57 if err != nil {
58 return nil, err
59 }
60 g := Layout(commits, refs, defaultBranch)
61 c.put(key, repoIDFromKey(key), g)
62 return g, nil
63 }
64
65 func repoIDFromKey(key string) int64 {
66 var id int64
67 for _, r := range key {
68 if r == ':' {
69 break
70 }
71 if r < '0' || r > '9' {
72 return 0
73 }
74 id = id*10 + int64(r-'0')
75 }
76 return id
77 }
78
79 func (c *Cache) lookup(key string) (*Graph, bool) {
80 c.mu.Lock()
81 defer c.mu.Unlock()
82 el, ok := c.items[key]
83 if !ok {
84 c.miss++
85 return nil, false
86 }
87 c.lru.MoveToFront(el)
88 c.hits++
89 return el.Value.(*cached).graph, true
90 }
91
92 func (c *Cache) put(key string, repoID int64, g *Graph) {
93 if c == nil || g == nil {
94 return
95 }
96 n := estimateBytes(g)
97 c.mu.Lock()
98 defer c.mu.Unlock()
99 if el, ok := c.items[key]; ok {
100 c.size -= el.Value.(*cached).bytes
101 c.lru.Remove(el)
102 delete(c.items, key)
103 }
104 c.items[key] = c.lru.PushFront(&cached{key: key, repo: repoID, graph: g, bytes: n})
105 c.size += n
106 c.evictLocked()
107 }
108
109 func estimateBytes(g *Graph) int64 {
110 n := 256
111 for _, r := range g.Rows {
112 n += 128 + len(r.SHA) + len(r.Subject) + len(r.Author) + len(r.Email)
113 for _, lb := range r.Labels {
114 n += 32 + len(lb.Name)
115 }
116 }
117 n += len(g.Edges) * 40
118 return int64(n)
119 }
120
121 func (c *Cache) evictLocked() {
122 for c.size > c.max && c.lru.Len() > 1 {
123 el := c.lru.Back()
124 e := el.Value.(*cached)
125 c.lru.Remove(el)
126 delete(c.items, e.key)
127 c.size -= e.bytes
128 }
129 }
130
131 // Drop vergeet alle grafieken van één repository (na een push of verwijdering).
132 func (c *Cache) Drop(repoID int64) {
133 if c == nil {
134 return
135 }
136 prefix := strings.TrimSpace(strings.SplitN(Key(repoID, nil, "", 0), ":", 2)[0]) + ":"
137 // Key always starts with "<id>:"
138 _ = prefix
139 c.mu.Lock()
140 defer c.mu.Unlock()
141 for key, el := range c.items {
142 if el.Value.(*cached).repo == repoID {
143 c.size -= el.Value.(*cached).bytes
144 c.lru.Remove(el)
145 delete(c.items, key)
146 }
147 }
148 }
149
150 // Stats is hits, misses en huidig geheugengebruik, voor metingen.
151 func (c *Cache) Stats() (hits, misses, entries int64, bytes int64) {
152 if c == nil {
153 return 0, 0, 0, 0
154 }
155 c.mu.Lock()
156 defer c.mu.Unlock()
157 return c.hits, c.miss, int64(len(c.items)), c.size
158 }
@@ -0,0 +1,158 @@
1package gitgraph
2
3import (
4 "container/list"
5 "context"
6 "strings"
7 "sync"
8)
9
10// DefaultMaxBytes is 8 MiB, ruim voor honderden grafieken.
11const DefaultMaxBytes = 8 << 20
12
13// Loader leest commits en refs uit git. Wordt alleen bij een miss aangeroepen.
14type Loader func(ctx context.Context) ([]Commit, []Ref, error)
15
16// Cache bewaart gelegde grafieken in het geheugen. Geen schijf-I/O.
17type Cache struct {
18 max int64
19
20 mu sync.Mutex
21 lru *list.List // voorkant = recent
22 items map[string]*list.Element
23 size int64
24 hits int64
25 miss int64
26}
27
28type cached struct {
29 key string
30 repo int64
31 graph *Graph
32 bytes int64
33}
34
35// NewCache maakt een lege LRU-cache. max <= 0 gebruikt DefaultMaxBytes.
36func NewCache(max int64) *Cache {
37 if max <= 0 {
38 max = DefaultMaxBytes
39 }
40 return &Cache{max: max, lru: list.New(), items: map[string]*list.Element{}}
41}
42
43// Get geeft een cached grafiek, of legt er één vanuit load. load wordt
44// bij een hit niet aangeroepen.
45func (c *Cache) Get(ctx context.Context, key, defaultBranch string, load Loader) (*Graph, error) {
46 if c == nil {
47 commits, refs, err := load(ctx)
48 if err != nil {
49 return nil, err
50 }
51 return Layout(commits, refs, defaultBranch), nil
52 }
53 if g, ok := c.lookup(key); ok {
54 return g, nil
55 }
56 commits, refs, err := load(ctx)
57 if err != nil {
58 return nil, err
59 }
60 g := Layout(commits, refs, defaultBranch)
61 c.put(key, repoIDFromKey(key), g)
62 return g, nil
63}
64
65func repoIDFromKey(key string) int64 {
66 var id int64
67 for _, r := range key {
68 if r == ':' {
69 break
70 }
71 if r < '0' || r > '9' {
72 return 0
73 }
74 id = id*10 + int64(r-'0')
75 }
76 return id
77}
78
79func (c *Cache) lookup(key string) (*Graph, bool) {
80 c.mu.Lock()
81 defer c.mu.Unlock()
82 el, ok := c.items[key]
83 if !ok {
84 c.miss++
85 return nil, false
86 }
87 c.lru.MoveToFront(el)
88 c.hits++
89 return el.Value.(*cached).graph, true
90}
91
92func (c *Cache) put(key string, repoID int64, g *Graph) {
93 if c == nil || g == nil {
94 return
95 }
96 n := estimateBytes(g)
97 c.mu.Lock()
98 defer c.mu.Unlock()
99 if el, ok := c.items[key]; ok {
100 c.size -= el.Value.(*cached).bytes
101 c.lru.Remove(el)
102 delete(c.items, key)
103 }
104 c.items[key] = c.lru.PushFront(&cached{key: key, repo: repoID, graph: g, bytes: n})
105 c.size += n
106 c.evictLocked()
107}
108
109func estimateBytes(g *Graph) int64 {
110 n := 256
111 for _, r := range g.Rows {
112 n += 128 + len(r.SHA) + len(r.Subject) + len(r.Author) + len(r.Email)
113 for _, lb := range r.Labels {
114 n += 32 + len(lb.Name)
115 }
116 }
117 n += len(g.Edges) * 40
118 return int64(n)
119}
120
121func (c *Cache) evictLocked() {
122 for c.size > c.max && c.lru.Len() > 1 {
123 el := c.lru.Back()
124 e := el.Value.(*cached)
125 c.lru.Remove(el)
126 delete(c.items, e.key)
127 c.size -= e.bytes
128 }
129}
130
131// Drop vergeet alle grafieken van één repository (na een push of verwijdering).
132func (c *Cache) Drop(repoID int64) {
133 if c == nil {
134 return
135 }
136 prefix := strings.TrimSpace(strings.SplitN(Key(repoID, nil, "", 0), ":", 2)[0]) + ":"
137 // Key always starts with "<id>:"
138 _ = prefix
139 c.mu.Lock()
140 defer c.mu.Unlock()
141 for key, el := range c.items {
142 if el.Value.(*cached).repo == repoID {
143 c.size -= el.Value.(*cached).bytes
144 c.lru.Remove(el)
145 delete(c.items, key)
146 }
147 }
148}
149
150// Stats is hits, misses en huidig geheugengebruik, voor metingen.
151func (c *Cache) Stats() (hits, misses, entries int64, bytes int64) {
152 if c == nil {
153 return 0, 0, 0, 0
154 }
155 c.mu.Lock()
156 defer c.mu.Unlock()
157 return c.hits, c.miss, int64(len(c.items)), c.size
158}
internal/gitgraph/cache_test.go added +85 −0
@@ -0,0 +1,85 @@
1 package gitgraph
2
3 import (
4 "context"
5 "errors"
6 "testing"
7 )
8
9 func TestCacheHitSkipsLoader(t *testing.T) {
10 c := NewCache(0)
11 commits := commits("c:b", "b:a", "a:")
12 refs := []Ref{{Name: "master", SHA: "c", Kind: "branch"}}
13 key := Key(7, map[string]string{"refs/heads/master": "c"}, "master", 40)
14 var loads int
15 load := func(ctx context.Context) ([]Commit, []Ref, error) {
16 loads++
17 return commits, refs, nil
18 }
19 g1, err := c.Get(context.Background(), key, "master", load)
20 if err != nil || g1 == nil || len(g1.Rows) != 3 {
21 t.Fatalf("koud: %v %+v", err, g1)
22 }
23 if loads != 1 {
24 t.Fatalf("eerste load=%d", loads)
25 }
26 fail := func(ctx context.Context) ([]Commit, []Ref, error) {
27 t.Fatal("loader mag bij een hit niet worden aangeroepen")
28 return nil, nil, errors.New("geen git")
29 }
30 g2, err := c.Get(context.Background(), key, "master", fail)
31 if err != nil || g2 == nil || len(g2.Rows) != 3 {
32 t.Fatalf("warm: %v %+v", err, g2)
33 }
34 hits, misses, entries, _ := c.Stats()
35 if hits != 1 || misses != 1 || entries != 1 {
36 t.Fatalf("stats hits=%d misses=%d entries=%d", hits, misses, entries)
37 }
38 }
39
40 func TestCacheDropOnPush(t *testing.T) {
41 c := NewCache(0)
42 key := Key(3, map[string]string{"refs/heads/master": "c"}, "master", 40)
43 _, err := c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {
44 return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil
45 })
46 if err != nil {
47 t.Fatal(err)
48 }
49 c.Drop(3)
50 var loads int
51 _, err = c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {
52 loads++
53 return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil
54 })
55 if err != nil || loads != 1 {
56 t.Fatalf("na drop opnieuw laden, loads=%d err=%v", loads, err)
57 }
58 c.Drop(99)
59 _, _, entries, _ := c.Stats()
60 if entries != 1 {
61 t.Fatalf("andere repo mag deze entry niet wissen, entries=%d", entries)
62 }
63 }
64
65 func TestCacheLRUEvicts(t *testing.T) {
66 c := NewCache(400) // klein: een paar grafieken
67 load := func(sha string) Loader {
68 return func(ctx context.Context) ([]Commit, []Ref, error) {
69 return []Commit{{SHA: sha, Subject: "lang onderwerp zodat de schatting meetelt " + sha, Parents: nil}}, nil, nil
70 }
71 }
72 for i := 0; i < 40; i++ {
73 key := Key(int64(i), map[string]string{"h": string(rune('a' + i%26))}, "master", 40)
74 if _, err := c.Get(context.Background(), key, "master", load("s")); err != nil {
75 t.Fatal(err)
76 }
77 }
78 _, _, entries, bytes := c.Stats()
79 if entries == 0 || entries == 40 {
80 t.Fatalf("verwacht eviction, entries=%d bytes=%d", entries, bytes)
81 }
82 if entries > 1 && bytes > 400 {
83 t.Fatalf("cache groter dan max: bytes=%d entries=%d", bytes, entries)
84 }
85 }
@@ -0,0 +1,85 @@
1package gitgraph
2
3import (
4 "context"
5 "errors"
6 "testing"
7)
8
9func TestCacheHitSkipsLoader(t *testing.T) {
10 c := NewCache(0)
11 commits := commits("c:b", "b:a", "a:")
12 refs := []Ref{{Name: "master", SHA: "c", Kind: "branch"}}
13 key := Key(7, map[string]string{"refs/heads/master": "c"}, "master", 40)
14 var loads int
15 load := func(ctx context.Context) ([]Commit, []Ref, error) {
16 loads++
17 return commits, refs, nil
18 }
19 g1, err := c.Get(context.Background(), key, "master", load)
20 if err != nil || g1 == nil || len(g1.Rows) != 3 {
21 t.Fatalf("koud: %v %+v", err, g1)
22 }
23 if loads != 1 {
24 t.Fatalf("eerste load=%d", loads)
25 }
26 fail := func(ctx context.Context) ([]Commit, []Ref, error) {
27 t.Fatal("loader mag bij een hit niet worden aangeroepen")
28 return nil, nil, errors.New("geen git")
29 }
30 g2, err := c.Get(context.Background(), key, "master", fail)
31 if err != nil || g2 == nil || len(g2.Rows) != 3 {
32 t.Fatalf("warm: %v %+v", err, g2)
33 }
34 hits, misses, entries, _ := c.Stats()
35 if hits != 1 || misses != 1 || entries != 1 {
36 t.Fatalf("stats hits=%d misses=%d entries=%d", hits, misses, entries)
37 }
38}
39
40func TestCacheDropOnPush(t *testing.T) {
41 c := NewCache(0)
42 key := Key(3, map[string]string{"refs/heads/master": "c"}, "master", 40)
43 _, err := c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {
44 return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil
45 })
46 if err != nil {
47 t.Fatal(err)
48 }
49 c.Drop(3)
50 var loads int
51 _, err = c.Get(context.Background(), key, "master", func(ctx context.Context) ([]Commit, []Ref, error) {
52 loads++
53 return commits("c:"), []Ref{{Name: "master", SHA: "c", Kind: "branch"}}, nil
54 })
55 if err != nil || loads != 1 {
56 t.Fatalf("na drop opnieuw laden, loads=%d err=%v", loads, err)
57 }
58 c.Drop(99)
59 _, _, entries, _ := c.Stats()
60 if entries != 1 {
61 t.Fatalf("andere repo mag deze entry niet wissen, entries=%d", entries)
62 }
63}
64
65func TestCacheLRUEvicts(t *testing.T) {
66 c := NewCache(400) // klein: een paar grafieken
67 load := func(sha string) Loader {
68 return func(ctx context.Context) ([]Commit, []Ref, error) {
69 return []Commit{{SHA: sha, Subject: "lang onderwerp zodat de schatting meetelt " + sha, Parents: nil}}, nil, nil
70 }
71 }
72 for i := 0; i < 40; i++ {
73 key := Key(int64(i), map[string]string{"h": string(rune('a' + i%26))}, "master", 40)
74 if _, err := c.Get(context.Background(), key, "master", load("s")); err != nil {
75 t.Fatal(err)
76 }
77 }
78 _, _, entries, bytes := c.Stats()
79 if entries == 0 || entries == 40 {
80 t.Fatalf("verwacht eviction, entries=%d bytes=%d", entries, bytes)
81 }
82 if entries > 1 && bytes > 400 {
83 t.Fatalf("cache groter dan max: bytes=%d entries=%d", bytes, entries)
84 }
85}
internal/gitgraph/graph.go added +468 −0
@@ -0,0 +1,468 @@
1 // Package gitgraph legt een commitgrafiek over branches en tags en
2 // bewaart die in een begrensde geheugencache.
3 package gitgraph
4
5 import (
6 "crypto/sha256"
7 "encoding/hex"
8 "fmt"
9 "sort"
10 "strings"
11 )
12
13 // DefaultLimit is het aantal recente commits dat in de grafiek past.
14 const DefaultLimit = 40
15
16 // PaletteSize is het aantal kleuren voor niet-hoofdbranches.
17 const PaletteSize = 8
18
19 // RowH, LaneW en DotR zijn de tekenmaten in pixels.
20 const (
21 RowH = 22
22 LaneW = 12
23 DotR = 4.0
24 RefW = 78
25 )
26
27 // Commit is één commit voor de grafiek, met ouders.
28 type Commit struct {
29 SHA, Short, Author, Email, Subject string
30 Unix int64
31 Parents []string
32 }
33
34 // Ref is een branch of tag die naar een commit wijst.
35 type Ref struct {
36 Name string
37 SHA string
38 Kind string // "branch" of "tag"
39 }
40
41 // Label is een verkorte branch- of tagnaam bij een commit.
42 type Label struct {
43 Name, Kind, Color, Class string
44 Default bool
45 }
46
47 // Row is één regel in de gelegde grafiek.
48 type Row struct {
49 Commit
50 Lane int
51 Color string
52 Class string
53 Labels []Label
54 Avatar string
55 Initial string
56 UserURL string
57 }
58
59 // Edge is een lijn van een kind naar een ouder (of het einde van het venster).
60 type Edge struct {
61 FromRow, FromLane, ToRow, ToLane int
62 Color string
63 }
64
65 // Graph is een gelegde commitgrafiek, klaar om te tekenen.
66 type Graph struct {
67 Rows []Row
68 Edges []Edge
69 Lanes int
70 Width int
71 Height int
72 }
73
74 // Color is de CSS-kleur van een branch. De hoofdbranch is altijd --blue.
75 func Color(branch, defaultBranch string) string {
76 if strings.TrimSpace(branch) != "" && branch == defaultBranch {
77 return "var(--blue)"
78 }
79 return fmt.Sprintf("var(--graph-%d)", hashName(branch)%PaletteSize)
80 }
81
82 // ColorClass is een CSS-klasse voor dezelfde kleur, veilig in templates
83 // (html/template weigert var(--…) in een style-attribuut).
84 func ColorClass(color string) string {
85 if color == "var(--blue)" {
86 return "is-main"
87 }
88 if strings.HasPrefix(color, "var(--graph-") && strings.HasSuffix(color, ")") {
89 mid := color[len("var(--graph-") : len(color)-1]
90 if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {
91 return "c" + mid
92 }
93 }
94 return ""
95 }
96
97 func hashName(name string) int {
98 n := 0
99 for _, r := range strings.ToLower(strings.TrimSpace(name)) {
100 n = n*33 + int(r)
101 }
102 if n < 0 {
103 n = -n
104 }
105 return n
106 }
107
108 // Key is de cachesleutel: repo plus de stand van alle branch- en tag-tips.
109 func Key(repoID int64, tips map[string]string, defaultBranch string, limit int) string {
110 if limit < 1 {
111 limit = DefaultLimit
112 }
113 names := make([]string, 0, len(tips))
114 for n := range tips {
115 names = append(names, n)
116 }
117 sort.Strings(names)
118 var b strings.Builder
119 fmt.Fprintf(&b, "%d\n%d\n%s\n", repoID, limit, defaultBranch)
120 for _, n := range names {
121 b.WriteString(n)
122 b.WriteByte('=')
123 b.WriteString(tips[n])
124 b.WriteByte('\n')
125 }
126 sum := sha256.Sum256([]byte(b.String()))
127 return fmt.Sprintf("%d:%s", repoID, hex.EncodeToString(sum[:16]))
128 }
129
130 type laneState struct {
131 sha string
132 color string
133 }
134
135 // Layout wijst lanes toe en legt lijnen voor merges en forks.
136 // commits staat nieuwste eerst. Ontbrekende ouders lopen tot de onderkant.
137 func Layout(commits []Commit, refs []Ref, defaultBranch string) *Graph {
138 g := &Graph{}
139 if len(commits) == 0 {
140 return g
141 }
142 bySHA := make(map[string]int, len(commits))
143 for i, c := range commits {
144 bySHA[c.SHA] = i
145 if c.Short == "" && len(c.SHA) >= 10 {
146 commits[i].Short = c.SHA[:10]
147 }
148 }
149 labels := labelsBySHA(refs, defaultBranch)
150 mainline := mainlineSHAs(commits, refs, defaultBranch)
151
152 var lanes []laneState
153 // Lane 0 is gereserveerd voor de hoofdbranch, zodat een nieuwere
154 // zijtak die kleur en kolom niet inpikt.
155 if def := defaultTip(refs, defaultBranch); def != "" {
156 lanes = []laneState{{sha: def, color: "var(--blue)"}}
157 }
158 g.Rows = make([]Row, len(commits))
159 occupancy := make([][]laneState, len(commits)+1)
160
161 for i, c := range commits {
162 incoming := findSHA(lanes, c.SHA)
163 if len(incoming) == 0 {
164 col := colorForCommit(c.SHA, labels, defaultBranch, "")
165 if mainline[c.SHA] {
166 col = "var(--blue)"
167 }
168 incoming = []int{allocLane(&lanes, c.SHA, col)}
169 }
170 primary := pickPrimary(incoming, lanes, c.SHA, labels, defaultBranch)
171 if mainline[c.SHA] {
172 // blijf op lane 0 als die op deze commit wacht
173 for _, li := range incoming {
174 if li == 0 {
175 primary = 0
176 break
177 }
178 }
179 }
180 row := Row{Commit: commits[i], Lane: primary, Labels: labels[c.SHA]}
181 if mainline[c.SHA] {
182 row.Color = "var(--blue)"
183 } else {
184 inherit := lanes[primary].color
185 if inherit == "var(--blue)" {
186 inherit = ""
187 }
188 col := colorForCommit(c.SHA, labels, defaultBranch, inherit)
189 if col == "" || col == "var(--blue)" {
190 col = Color(c.SHA, defaultBranch)
191 }
192 row.Color = col
193 }
194 if row.Color == "" {
195 row.Color = "var(--graph-0)"
196 }
197 row.Class = ColorClass(row.Color)
198 lanes[primary].color = row.Color
199 g.Rows[i] = row
200
201 for _, li := range incoming {
202 if li != primary {
203 lanes[li].sha = ""
204 }
205 }
206 if len(c.Parents) == 0 {
207 lanes[primary].sha = ""
208 } else {
209 first := c.Parents[0]
210 if idx := firstLane(lanes, first); idx >= 0 && idx != primary && !mainline[c.SHA] && !mainline[first] {
211 // zijtak: eerste ouder zit al in een andere lane, daarheen mergen
212 lanes[primary].sha = ""
213 } else {
214 lanes[primary].sha = first
215 }
216 for _, p := range c.Parents[1:] {
217 if firstLane(lanes, p) >= 0 {
218 continue
219 }
220 col := colorForCommit(p, labels, defaultBranch, "")
221 if col == "" || col == "var(--blue)" && !mainline[p] {
222 col = Color(p, defaultBranch)
223 }
224 allocLane(&lanes, p, col)
225 }
226 if lanes[primary].sha == "" {
227 if firstLane(lanes, first) < 0 && first != "" {
228 allocLane(&lanes, first, row.Color)
229 }
230 }
231 }
232 occupancy[i+1] = copyLanes(lanes)
233 trimTrailing(&lanes)
234 }
235 occupancy[0] = make([]laneState, len(occupancy[1]))
236 if len(occupancy[0]) > 0 && len(g.Rows) > 0 {
237 // bovenaan: de lane van de nieuwste commit is bezet
238 if g.Rows[0].Lane < len(occupancy[0]) {
239 occupancy[0][g.Rows[0].Lane] = laneState{sha: g.Rows[0].SHA, color: g.Rows[0].Color}
240 }
241 }
242 g.Edges = buildEdges(g.Rows, bySHA, occupancy)
243 g.Lanes = 1
244 for _, r := range g.Rows {
245 if r.Lane+1 > g.Lanes {
246 g.Lanes = r.Lane + 1
247 }
248 }
249 for _, e := range g.Edges {
250 if e.FromLane+1 > g.Lanes {
251 g.Lanes = e.FromLane + 1
252 }
253 if e.ToLane+1 > g.Lanes {
254 g.Lanes = e.ToLane + 1
255 }
256 }
257 g.Width = g.Lanes * LaneW
258 g.Height = len(g.Rows) * RowH
259 return g
260 }
261
262 func labelsBySHA(refs []Ref, defaultBranch string) map[string][]Label {
263 out := map[string][]Label{}
264 for _, r := range refs {
265 if r.SHA == "" || r.Name == "" {
266 continue
267 }
268 lb := Label{Name: shortName(r.Name), Kind: r.Kind, Color: Color(r.Name, defaultBranch), Default: r.Kind == "branch" && r.Name == defaultBranch}
269 if r.Kind == "tag" {
270 lb.Color = "var(--muted)"
271 lb.Class = "is-tag"
272 } else {
273 lb.Class = ColorClass(lb.Color)
274 }
275 out[r.SHA] = append(out[r.SHA], lb)
276 }
277 for sha, list := range out {
278 sort.Slice(list, func(i, j int) bool {
279 if list[i].Default != list[j].Default {
280 return list[i].Default
281 }
282 if list[i].Kind != list[j].Kind {
283 return list[i].Kind == "branch"
284 }
285 return list[i].Name < list[j].Name
286 })
287 out[sha] = list
288 }
289 return out
290 }
291
292 func shortName(name string) string {
293 const max = 18
294 if strings.HasPrefix(name, "refs/heads/") {
295 name = strings.TrimPrefix(name, "refs/heads/")
296 }
297 if strings.HasPrefix(name, "refs/tags/") {
298 name = strings.TrimPrefix(name, "refs/tags/")
299 }
300 runes := []rune(name)
301 if len(runes) <= max {
302 return name
303 }
304 return string(runes[:max-1]) + "…"
305 }
306
307 func colorForCommit(sha string, labels map[string][]Label, defaultBranch, fallback string) string {
308 for _, lb := range labels[sha] {
309 if lb.Default {
310 return "var(--blue)"
311 }
312 }
313 for _, lb := range labels[sha] {
314 if lb.Kind == "branch" {
315 return lb.Color
316 }
317 }
318 if fallback != "" {
319 return fallback
320 }
321 if defaultBranch != "" {
322 return Color(sha, defaultBranch) // stabiel, maar niet --blue
323 }
324 return "var(--graph-0)"
325 }
326
327 func findSHA(lanes []laneState, sha string) []int {
328 var out []int
329 for i, l := range lanes {
330 if l.sha == sha {
331 out = append(out, i)
332 }
333 }
334 return out
335 }
336
337 func firstLane(lanes []laneState, sha string) int {
338 for i, l := range lanes {
339 if l.sha == sha {
340 return i
341 }
342 }
343 return -1
344 }
345
346 func pickPrimary(incoming []int, lanes []laneState, sha string, labels map[string][]Label, defaultBranch string) int {
347 want := colorForCommit(sha, labels, defaultBranch, "")
348 for _, i := range incoming {
349 if lanes[i].color == want || (want == "var(--blue)" && lanes[i].color == "var(--blue)") {
350 return i
351 }
352 }
353 return incoming[0]
354 }
355
356 func allocLane(lanes *[]laneState, sha, color string) int {
357 for i, l := range *lanes {
358 if l.sha == "" {
359 (*lanes)[i] = laneState{sha: sha, color: color}
360 return i
361 }
362 }
363 *lanes = append(*lanes, laneState{sha: sha, color: color})
364 return len(*lanes) - 1
365 }
366
367 func copyLanes(lanes []laneState) []laneState {
368 out := make([]laneState, len(lanes))
369 copy(out, lanes)
370 return out
371 }
372
373 func trimTrailing(lanes *[]laneState) {
374 n := len(*lanes)
375 for n > 0 && (*lanes)[n-1].sha == "" {
376 n--
377 }
378 *lanes = (*lanes)[:n]
379 }
380
381 func buildEdges(rows []Row, bySHA map[string]int, occ [][]laneState) []Edge {
382 var edges []Edge
383 seen := map[[4]int]bool{}
384 add := func(e Edge) {
385 if e.FromRow < 0 || e.ToRow < e.FromRow {
386 return
387 }
388 k := [4]int{e.FromRow, e.FromLane, e.ToRow, e.ToLane}
389 if seen[k] {
390 return
391 }
392 seen[k] = true
393 edges = append(edges, e)
394 }
395 // Van elke commit naar zijn ouders in het venster, of naar de onderkant.
396 for i, r := range rows {
397 if len(r.Parents) == 0 {
398 continue
399 }
400 for pi, p := range r.Parents {
401 toRow, toLane := len(rows)-1, r.Lane
402 if j, ok := bySHA[p]; ok {
403 toRow = j
404 toLane = rows[j].Lane
405 } else {
406 // ouder buiten het venster: zoek de lane waarin we die sha bewaren
407 toLane = r.Lane
408 if i+1 < len(occ) {
409 if idx := firstLane(occ[i+1], p); idx >= 0 {
410 toLane = idx
411 }
412 }
413 toRow = len(rows) - 1
414 }
415 col := r.Color
416 if pi == 0 && r.Color != "" {
417 col = r.Color
418 }
419 // Tussenliggende verticale stukken volgen de gereserveerde lane.
420 fromLane := r.Lane
421 if pi > 0 && i+1 < len(occ) {
422 if idx := firstLane(occ[i+1], p); idx >= 0 {
423 fromLane = idx
424 // boog vanaf de merge-commit naar de ouder-lane op de volgende rij
425 add(Edge{FromRow: i, FromLane: r.Lane, ToRow: i + 1, ToLane: fromLane, Color: col})
426 if toRow > i+1 {
427 add(Edge{FromRow: i + 1, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})
428 }
429 continue
430 }
431 }
432 add(Edge{FromRow: i, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})
433 }
434 }
435 return edges
436 }
437
438 func defaultTip(refs []Ref, defaultBranch string) string {
439 for _, r := range refs {
440 if r.Kind == "branch" && r.Name == defaultBranch {
441 return r.SHA
442 }
443 }
444 return ""
445 }
446
447 func mainlineSHAs(commits []Commit, refs []Ref, defaultBranch string) map[string]bool {
448 out := map[string]bool{}
449 tip := defaultTip(refs, defaultBranch)
450 if tip == "" {
451 return out
452 }
453 parents := map[string][]string{}
454 for _, c := range commits {
455 parents[c.SHA] = c.Parents
456 }
457 seen := map[string]bool{}
458 for sha := tip; sha != "" && !seen[sha]; {
459 seen[sha] = true
460 out[sha] = true
461 ps := parents[sha]
462 if len(ps) == 0 {
463 break
464 }
465 sha = ps[0]
466 }
467 return out
468 }
@@ -0,0 +1,468 @@
1// Package gitgraph legt een commitgrafiek over branches en tags en
2// bewaart die in een begrensde geheugencache.
3package gitgraph
4
5import (
6 "crypto/sha256"
7 "encoding/hex"
8 "fmt"
9 "sort"
10 "strings"
11)
12
13// DefaultLimit is het aantal recente commits dat in de grafiek past.
14const DefaultLimit = 40
15
16// PaletteSize is het aantal kleuren voor niet-hoofdbranches.
17const PaletteSize = 8
18
19// RowH, LaneW en DotR zijn de tekenmaten in pixels.
20const (
21 RowH = 22
22 LaneW = 12
23 DotR = 4.0
24 RefW = 78
25)
26
27// Commit is één commit voor de grafiek, met ouders.
28type Commit struct {
29 SHA, Short, Author, Email, Subject string
30 Unix int64
31 Parents []string
32}
33
34// Ref is een branch of tag die naar een commit wijst.
35type Ref struct {
36 Name string
37 SHA string
38 Kind string // "branch" of "tag"
39}
40
41// Label is een verkorte branch- of tagnaam bij een commit.
42type Label struct {
43 Name, Kind, Color, Class string
44 Default bool
45}
46
47// Row is één regel in de gelegde grafiek.
48type Row struct {
49 Commit
50 Lane int
51 Color string
52 Class string
53 Labels []Label
54 Avatar string
55 Initial string
56 UserURL string
57}
58
59// Edge is een lijn van een kind naar een ouder (of het einde van het venster).
60type Edge struct {
61 FromRow, FromLane, ToRow, ToLane int
62 Color string
63}
64
65// Graph is een gelegde commitgrafiek, klaar om te tekenen.
66type Graph struct {
67 Rows []Row
68 Edges []Edge
69 Lanes int
70 Width int
71 Height int
72}
73
74// Color is de CSS-kleur van een branch. De hoofdbranch is altijd --blue.
75func Color(branch, defaultBranch string) string {
76 if strings.TrimSpace(branch) != "" && branch == defaultBranch {
77 return "var(--blue)"
78 }
79 return fmt.Sprintf("var(--graph-%d)", hashName(branch)%PaletteSize)
80}
81
82// ColorClass is een CSS-klasse voor dezelfde kleur, veilig in templates
83// (html/template weigert var(--…) in een style-attribuut).
84func ColorClass(color string) string {
85 if color == "var(--blue)" {
86 return "is-main"
87 }
88 if strings.HasPrefix(color, "var(--graph-") && strings.HasSuffix(color, ")") {
89 mid := color[len("var(--graph-") : len(color)-1]
90 if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {
91 return "c" + mid
92 }
93 }
94 return ""
95}
96
97func hashName(name string) int {
98 n := 0
99 for _, r := range strings.ToLower(strings.TrimSpace(name)) {
100 n = n*33 + int(r)
101 }
102 if n < 0 {
103 n = -n
104 }
105 return n
106}
107
108// Key is de cachesleutel: repo plus de stand van alle branch- en tag-tips.
109func Key(repoID int64, tips map[string]string, defaultBranch string, limit int) string {
110 if limit < 1 {
111 limit = DefaultLimit
112 }
113 names := make([]string, 0, len(tips))
114 for n := range tips {
115 names = append(names, n)
116 }
117 sort.Strings(names)
118 var b strings.Builder
119 fmt.Fprintf(&b, "%d\n%d\n%s\n", repoID, limit, defaultBranch)
120 for _, n := range names {
121 b.WriteString(n)
122 b.WriteByte('=')
123 b.WriteString(tips[n])
124 b.WriteByte('\n')
125 }
126 sum := sha256.Sum256([]byte(b.String()))
127 return fmt.Sprintf("%d:%s", repoID, hex.EncodeToString(sum[:16]))
128}
129
130type laneState struct {
131 sha string
132 color string
133}
134
135// Layout wijst lanes toe en legt lijnen voor merges en forks.
136// commits staat nieuwste eerst. Ontbrekende ouders lopen tot de onderkant.
137func Layout(commits []Commit, refs []Ref, defaultBranch string) *Graph {
138 g := &Graph{}
139 if len(commits) == 0 {
140 return g
141 }
142 bySHA := make(map[string]int, len(commits))
143 for i, c := range commits {
144 bySHA[c.SHA] = i
145 if c.Short == "" && len(c.SHA) >= 10 {
146 commits[i].Short = c.SHA[:10]
147 }
148 }
149 labels := labelsBySHA(refs, defaultBranch)
150 mainline := mainlineSHAs(commits, refs, defaultBranch)
151
152 var lanes []laneState
153 // Lane 0 is gereserveerd voor de hoofdbranch, zodat een nieuwere
154 // zijtak die kleur en kolom niet inpikt.
155 if def := defaultTip(refs, defaultBranch); def != "" {
156 lanes = []laneState{{sha: def, color: "var(--blue)"}}
157 }
158 g.Rows = make([]Row, len(commits))
159 occupancy := make([][]laneState, len(commits)+1)
160
161 for i, c := range commits {
162 incoming := findSHA(lanes, c.SHA)
163 if len(incoming) == 0 {
164 col := colorForCommit(c.SHA, labels, defaultBranch, "")
165 if mainline[c.SHA] {
166 col = "var(--blue)"
167 }
168 incoming = []int{allocLane(&lanes, c.SHA, col)}
169 }
170 primary := pickPrimary(incoming, lanes, c.SHA, labels, defaultBranch)
171 if mainline[c.SHA] {
172 // blijf op lane 0 als die op deze commit wacht
173 for _, li := range incoming {
174 if li == 0 {
175 primary = 0
176 break
177 }
178 }
179 }
180 row := Row{Commit: commits[i], Lane: primary, Labels: labels[c.SHA]}
181 if mainline[c.SHA] {
182 row.Color = "var(--blue)"
183 } else {
184 inherit := lanes[primary].color
185 if inherit == "var(--blue)" {
186 inherit = ""
187 }
188 col := colorForCommit(c.SHA, labels, defaultBranch, inherit)
189 if col == "" || col == "var(--blue)" {
190 col = Color(c.SHA, defaultBranch)
191 }
192 row.Color = col
193 }
194 if row.Color == "" {
195 row.Color = "var(--graph-0)"
196 }
197 row.Class = ColorClass(row.Color)
198 lanes[primary].color = row.Color
199 g.Rows[i] = row
200
201 for _, li := range incoming {
202 if li != primary {
203 lanes[li].sha = ""
204 }
205 }
206 if len(c.Parents) == 0 {
207 lanes[primary].sha = ""
208 } else {
209 first := c.Parents[0]
210 if idx := firstLane(lanes, first); idx >= 0 && idx != primary && !mainline[c.SHA] && !mainline[first] {
211 // zijtak: eerste ouder zit al in een andere lane, daarheen mergen
212 lanes[primary].sha = ""
213 } else {
214 lanes[primary].sha = first
215 }
216 for _, p := range c.Parents[1:] {
217 if firstLane(lanes, p) >= 0 {
218 continue
219 }
220 col := colorForCommit(p, labels, defaultBranch, "")
221 if col == "" || col == "var(--blue)" && !mainline[p] {
222 col = Color(p, defaultBranch)
223 }
224 allocLane(&lanes, p, col)
225 }
226 if lanes[primary].sha == "" {
227 if firstLane(lanes, first) < 0 && first != "" {
228 allocLane(&lanes, first, row.Color)
229 }
230 }
231 }
232 occupancy[i+1] = copyLanes(lanes)
233 trimTrailing(&lanes)
234 }
235 occupancy[0] = make([]laneState, len(occupancy[1]))
236 if len(occupancy[0]) > 0 && len(g.Rows) > 0 {
237 // bovenaan: de lane van de nieuwste commit is bezet
238 if g.Rows[0].Lane < len(occupancy[0]) {
239 occupancy[0][g.Rows[0].Lane] = laneState{sha: g.Rows[0].SHA, color: g.Rows[0].Color}
240 }
241 }
242 g.Edges = buildEdges(g.Rows, bySHA, occupancy)
243 g.Lanes = 1
244 for _, r := range g.Rows {
245 if r.Lane+1 > g.Lanes {
246 g.Lanes = r.Lane + 1
247 }
248 }
249 for _, e := range g.Edges {
250 if e.FromLane+1 > g.Lanes {
251 g.Lanes = e.FromLane + 1
252 }
253 if e.ToLane+1 > g.Lanes {
254 g.Lanes = e.ToLane + 1
255 }
256 }
257 g.Width = g.Lanes * LaneW
258 g.Height = len(g.Rows) * RowH
259 return g
260}
261
262func labelsBySHA(refs []Ref, defaultBranch string) map[string][]Label {
263 out := map[string][]Label{}
264 for _, r := range refs {
265 if r.SHA == "" || r.Name == "" {
266 continue
267 }
268 lb := Label{Name: shortName(r.Name), Kind: r.Kind, Color: Color(r.Name, defaultBranch), Default: r.Kind == "branch" && r.Name == defaultBranch}
269 if r.Kind == "tag" {
270 lb.Color = "var(--muted)"
271 lb.Class = "is-tag"
272 } else {
273 lb.Class = ColorClass(lb.Color)
274 }
275 out[r.SHA] = append(out[r.SHA], lb)
276 }
277 for sha, list := range out {
278 sort.Slice(list, func(i, j int) bool {
279 if list[i].Default != list[j].Default {
280 return list[i].Default
281 }
282 if list[i].Kind != list[j].Kind {
283 return list[i].Kind == "branch"
284 }
285 return list[i].Name < list[j].Name
286 })
287 out[sha] = list
288 }
289 return out
290}
291
292func shortName(name string) string {
293 const max = 18
294 if strings.HasPrefix(name, "refs/heads/") {
295 name = strings.TrimPrefix(name, "refs/heads/")
296 }
297 if strings.HasPrefix(name, "refs/tags/") {
298 name = strings.TrimPrefix(name, "refs/tags/")
299 }
300 runes := []rune(name)
301 if len(runes) <= max {
302 return name
303 }
304 return string(runes[:max-1]) + "…"
305}
306
307func colorForCommit(sha string, labels map[string][]Label, defaultBranch, fallback string) string {
308 for _, lb := range labels[sha] {
309 if lb.Default {
310 return "var(--blue)"
311 }
312 }
313 for _, lb := range labels[sha] {
314 if lb.Kind == "branch" {
315 return lb.Color
316 }
317 }
318 if fallback != "" {
319 return fallback
320 }
321 if defaultBranch != "" {
322 return Color(sha, defaultBranch) // stabiel, maar niet --blue
323 }
324 return "var(--graph-0)"
325}
326
327func findSHA(lanes []laneState, sha string) []int {
328 var out []int
329 for i, l := range lanes {
330 if l.sha == sha {
331 out = append(out, i)
332 }
333 }
334 return out
335}
336
337func firstLane(lanes []laneState, sha string) int {
338 for i, l := range lanes {
339 if l.sha == sha {
340 return i
341 }
342 }
343 return -1
344}
345
346func pickPrimary(incoming []int, lanes []laneState, sha string, labels map[string][]Label, defaultBranch string) int {
347 want := colorForCommit(sha, labels, defaultBranch, "")
348 for _, i := range incoming {
349 if lanes[i].color == want || (want == "var(--blue)" && lanes[i].color == "var(--blue)") {
350 return i
351 }
352 }
353 return incoming[0]
354}
355
356func allocLane(lanes *[]laneState, sha, color string) int {
357 for i, l := range *lanes {
358 if l.sha == "" {
359 (*lanes)[i] = laneState{sha: sha, color: color}
360 return i
361 }
362 }
363 *lanes = append(*lanes, laneState{sha: sha, color: color})
364 return len(*lanes) - 1
365}
366
367func copyLanes(lanes []laneState) []laneState {
368 out := make([]laneState, len(lanes))
369 copy(out, lanes)
370 return out
371}
372
373func trimTrailing(lanes *[]laneState) {
374 n := len(*lanes)
375 for n > 0 && (*lanes)[n-1].sha == "" {
376 n--
377 }
378 *lanes = (*lanes)[:n]
379}
380
381func buildEdges(rows []Row, bySHA map[string]int, occ [][]laneState) []Edge {
382 var edges []Edge
383 seen := map[[4]int]bool{}
384 add := func(e Edge) {
385 if e.FromRow < 0 || e.ToRow < e.FromRow {
386 return
387 }
388 k := [4]int{e.FromRow, e.FromLane, e.ToRow, e.ToLane}
389 if seen[k] {
390 return
391 }
392 seen[k] = true
393 edges = append(edges, e)
394 }
395 // Van elke commit naar zijn ouders in het venster, of naar de onderkant.
396 for i, r := range rows {
397 if len(r.Parents) == 0 {
398 continue
399 }
400 for pi, p := range r.Parents {
401 toRow, toLane := len(rows)-1, r.Lane
402 if j, ok := bySHA[p]; ok {
403 toRow = j
404 toLane = rows[j].Lane
405 } else {
406 // ouder buiten het venster: zoek de lane waarin we die sha bewaren
407 toLane = r.Lane
408 if i+1 < len(occ) {
409 if idx := firstLane(occ[i+1], p); idx >= 0 {
410 toLane = idx
411 }
412 }
413 toRow = len(rows) - 1
414 }
415 col := r.Color
416 if pi == 0 && r.Color != "" {
417 col = r.Color
418 }
419 // Tussenliggende verticale stukken volgen de gereserveerde lane.
420 fromLane := r.Lane
421 if pi > 0 && i+1 < len(occ) {
422 if idx := firstLane(occ[i+1], p); idx >= 0 {
423 fromLane = idx
424 // boog vanaf de merge-commit naar de ouder-lane op de volgende rij
425 add(Edge{FromRow: i, FromLane: r.Lane, ToRow: i + 1, ToLane: fromLane, Color: col})
426 if toRow > i+1 {
427 add(Edge{FromRow: i + 1, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})
428 }
429 continue
430 }
431 }
432 add(Edge{FromRow: i, FromLane: fromLane, ToRow: toRow, ToLane: toLane, Color: col})
433 }
434 }
435 return edges
436}
437
438func defaultTip(refs []Ref, defaultBranch string) string {
439 for _, r := range refs {
440 if r.Kind == "branch" && r.Name == defaultBranch {
441 return r.SHA
442 }
443 }
444 return ""
445}
446
447func mainlineSHAs(commits []Commit, refs []Ref, defaultBranch string) map[string]bool {
448 out := map[string]bool{}
449 tip := defaultTip(refs, defaultBranch)
450 if tip == "" {
451 return out
452 }
453 parents := map[string][]string{}
454 for _, c := range commits {
455 parents[c.SHA] = c.Parents
456 }
457 seen := map[string]bool{}
458 for sha := tip; sha != "" && !seen[sha]; {
459 seen[sha] = true
460 out[sha] = true
461 ps := parents[sha]
462 if len(ps) == 0 {
463 break
464 }
465 sha = ps[0]
466 }
467 return out
468}
internal/gitgraph/graph_test.go added +244 −0
@@ -0,0 +1,244 @@
1 package gitgraph
2
3 import (
4 "strings"
5 "testing"
6 )
7
8 func commits(pairs ...string) []Commit {
9 // pairs: "sha:parent,parent" or "sha:" for root. Order is newest first.
10 var out []Commit
11 for _, p := range pairs {
12 sha, rest, _ := strings.Cut(p, ":")
13 var parents []string
14 if rest != "" {
15 parents = strings.Split(rest, ",")
16 }
17 out = append(out, Commit{SHA: sha, Short: sha, Subject: "msg-" + sha, Parents: parents})
18 }
19 return out
20 }
21
22 func TestLayoutLinear(t *testing.T) {
23 g := Layout(commits("c:b", "b:a", "a:"), nil, "master")
24 if g.Lanes != 1 {
25 t.Fatalf("lanes=%d, wil 1", g.Lanes)
26 }
27 for i, want := range []string{"c", "b", "a"} {
28 if g.Rows[i].SHA != want || g.Rows[i].Lane != 0 {
29 t.Fatalf("rij %d: %+v", i, g.Rows[i])
30 }
31 }
32 }
33
34 func TestLayoutFork(t *testing.T) {
35 // feature (d) en master (c) splitsen vanaf b.
36 refs := []Ref{
37 {Name: "master", SHA: "c", Kind: "branch"},
38 {Name: "feature", SHA: "d", Kind: "branch"},
39 }
40 g := Layout(commits("d:b", "c:b", "b:a", "a:"), refs, "master")
41 if g.Lanes < 2 {
42 t.Fatalf("verwacht minstens 2 lanes, kreeg %d", g.Lanes)
43 }
44 laneOf := map[string]int{}
45 for _, r := range g.Rows {
46 laneOf[r.SHA] = r.Lane
47 }
48 if laneOf["d"] == laneOf["c"] {
49 t.Fatalf("forks moeten andere lanes hebben: %v", laneOf)
50 }
51 if laneOf["b"] != laneOf["a"] {
52 t.Fatalf("stam blijft op één lane: %v", laneOf)
53 }
54 // master is blauw
55 for _, r := range g.Rows {
56 if r.SHA == "c" && r.Color != "var(--blue)" {
57 t.Fatalf("master-tip kleur %s", r.Color)
58 }
59 }
60 // merge/fork-lijn van d of c naar b
61 if !hasEdgeTo(g, "b") {
62 t.Fatalf("geen lijn naar b: %+v", g.Edges)
63 }
64 }
65
66 func TestLayoutMerge(t *testing.T) {
67 // m merget feature (f) in master (c).
68 refs := []Ref{
69 {Name: "master", SHA: "m", Kind: "branch"},
70 {Name: "feature", SHA: "f", Kind: "branch"},
71 }
72 g := Layout(commits("m:c,f", "f:b", "c:b", "b:a", "a:"), refs, "master")
73 if g.Lanes < 2 {
74 t.Fatalf("merge heeft een tweede lane nodig, kreeg %d", g.Lanes)
75 }
76 laneOf := map[string]int{}
77 colorOf := map[string]string{}
78 for _, r := range g.Rows {
79 laneOf[r.SHA] = r.Lane
80 colorOf[r.SHA] = r.Color
81 }
82 if laneOf["f"] == laneOf["c"] {
83 t.Fatalf("feature en master voor de merge op dezelfde lane: %v", laneOf)
84 }
85 if colorOf["m"] != "var(--blue)" {
86 t.Fatalf("merge-commit op master moet blauw zijn, kreeg %s", colorOf["m"])
87 }
88 if !hasEdgeBetween(g, "m", "f") && !hasEdgeBetween(g, "m", "c") {
89 t.Fatalf("verwacht lijnen van de merge naar beide ouders: %+v", g.Edges)
90 }
91 }
92
93 func TestLayoutMergeAndForkTogether(t *testing.T) {
94 // master: a-b-c-m, feature: b-d-e, m merget e.
95 refs := []Ref{
96 {Name: "master", SHA: "m", Kind: "branch"},
97 {Name: "feature", SHA: "e", Kind: "branch"},
98 {Name: "v1", SHA: "c", Kind: "tag"},
99 }
100 g := Layout(commits("m:c,e", "e:d", "d:b", "c:b", "b:a", "a:"), refs, "master")
101 if len(g.Rows) != 6 {
102 t.Fatalf("rijen=%d", len(g.Rows))
103 }
104 var hasTag, hasMaster, hasFeature bool
105 for _, r := range g.Rows {
106 for _, lb := range r.Labels {
107 switch {
108 case lb.Kind == "tag" && lb.Name == "v1":
109 hasTag = true
110 case lb.Default && lb.Name == "master":
111 hasMaster = true
112 case lb.Name == "feature":
113 hasFeature = true
114 }
115 }
116 }
117 if !hasTag || !hasMaster || !hasFeature {
118 t.Fatalf("labels ontbreken: tag=%v master=%v feature=%v", hasTag, hasMaster, hasFeature)
119 }
120 }
121
122 func TestColorDeterministicAndMainIsBlue(t *testing.T) {
123 if Color("master", "master") != "var(--blue)" {
124 t.Fatal("hoofdbranch moet --blue zijn")
125 }
126 if Color("main", "main") != "var(--blue)" {
127 t.Fatal("hoofdbranch main moet --blue zijn")
128 }
129 if Color("feature", "master") == "var(--blue)" {
130 t.Fatal("andere branch mag niet de hoofd-blauw zijn")
131 }
132 if Color("feature", "master") != Color("feature", "master") {
133 t.Fatal("kleur moet deterministisch zijn")
134 }
135 if Color("feature", "master") != Color("FEATURE", "master") {
136 t.Fatal("kleur is case-insensitive")
137 }
138 if Color("feature", "master") == Color("other", "master") {
139 t.Fatal("verschillende namen moeten meestal een andere kleur krijgen")
140 }
141 seen := map[string]bool{}
142 for _, n := range []string{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"} {
143 seen[Color(n, "master")] = true
144 }
145 if len(seen) < 2 {
146 t.Fatalf("palet wordt niet gebruikt: %v", seen)
147 }
148 for c := range seen {
149 if !strings.HasPrefix(c, "var(--graph-") {
150 t.Fatalf("onverwachte kleur %s", c)
151 }
152 }
153 }
154
155 func TestKeyChangesWithTips(t *testing.T) {
156 a := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)
157 b := Key(1, map[string]string{"refs/heads/master": "bbb"}, "master", 40)
158 c := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)
159 if a == b {
160 t.Fatal("andere tip moet andere sleutel geven")
161 }
162 if a != c {
163 t.Fatal("zelfde stand moet dezelfde sleutel geven")
164 }
165 if Key(2, map[string]string{"refs/heads/master": "aaa"}, "master", 40) == a {
166 t.Fatal("andere repo moet andere sleutel geven")
167 }
168 }
169
170 func hasEdgeTo(g *Graph, sha string) bool {
171 idx := -1
172 for i, r := range g.Rows {
173 if r.SHA == sha {
174 idx = i
175 break
176 }
177 }
178 if idx < 0 {
179 return false
180 }
181 for _, e := range g.Edges {
182 if e.ToRow == idx {
183 return true
184 }
185 }
186 return false
187 }
188
189 func hasEdgeBetween(g *Graph, from, to string) bool {
190 fi, ti := -1, -1
191 for i, r := range g.Rows {
192 if r.SHA == from {
193 fi = i
194 }
195 if r.SHA == to {
196 ti = i
197 }
198 }
199 if fi < 0 || ti < 0 {
200 return false
201 }
202 for _, e := range g.Edges {
203 if e.FromRow == fi && e.ToRow == ti {
204 return true
205 }
206 }
207 // via een tussenliggende lane (merge-boog plus verticaal)
208 for _, e := range g.Edges {
209 if e.FromRow == fi && e.ToLane == g.Rows[ti].Lane {
210 return true
211 }
212 }
213 return false
214 }
215
216 func TestMainlineStaysBlueOnLaneZero(t *testing.T) {
217 // Nieuwere zijtak docs bovenop master-merge mag lane 0 en blauw niet inpikken.
218 refs := []Ref{
219 {Name: "master", SHA: "m", Kind: "branch"},
220 {Name: "docs", SHA: "d", Kind: "branch"},
221 }
222 g := Layout(commits("d:m", "m:c,f", "f:b", "c:b", "b:"), refs, "master")
223 for _, r := range g.Rows {
224 switch r.SHA {
225 case "m", "c", "b":
226 if r.Color != "var(--blue)" {
227 t.Fatalf("%s moet blauw zijn, kreeg %s (class %s)", r.SHA, r.Color, r.Class)
228 }
229 if r.Lane != 0 {
230 t.Fatalf("%s moet op lane 0, kreeg %d", r.SHA, r.Lane)
231 }
232 if r.Class != "is-main" {
233 t.Fatalf("%s class=%s", r.SHA, r.Class)
234 }
235 case "d":
236 if r.Lane == 0 {
237 t.Fatalf("zijtak docs mag lane 0 niet stelen")
238 }
239 if r.Color == "var(--blue)" {
240 t.Fatalf("zijtak mag niet de hoofd-blauw zijn")
241 }
242 }
243 }
244 }
@@ -0,0 +1,244 @@
1package gitgraph
2
3import (
4 "strings"
5 "testing"
6)
7
8func commits(pairs ...string) []Commit {
9 // pairs: "sha:parent,parent" or "sha:" for root. Order is newest first.
10 var out []Commit
11 for _, p := range pairs {
12 sha, rest, _ := strings.Cut(p, ":")
13 var parents []string
14 if rest != "" {
15 parents = strings.Split(rest, ",")
16 }
17 out = append(out, Commit{SHA: sha, Short: sha, Subject: "msg-" + sha, Parents: parents})
18 }
19 return out
20}
21
22func TestLayoutLinear(t *testing.T) {
23 g := Layout(commits("c:b", "b:a", "a:"), nil, "master")
24 if g.Lanes != 1 {
25 t.Fatalf("lanes=%d, wil 1", g.Lanes)
26 }
27 for i, want := range []string{"c", "b", "a"} {
28 if g.Rows[i].SHA != want || g.Rows[i].Lane != 0 {
29 t.Fatalf("rij %d: %+v", i, g.Rows[i])
30 }
31 }
32}
33
34func TestLayoutFork(t *testing.T) {
35 // feature (d) en master (c) splitsen vanaf b.
36 refs := []Ref{
37 {Name: "master", SHA: "c", Kind: "branch"},
38 {Name: "feature", SHA: "d", Kind: "branch"},
39 }
40 g := Layout(commits("d:b", "c:b", "b:a", "a:"), refs, "master")
41 if g.Lanes < 2 {
42 t.Fatalf("verwacht minstens 2 lanes, kreeg %d", g.Lanes)
43 }
44 laneOf := map[string]int{}
45 for _, r := range g.Rows {
46 laneOf[r.SHA] = r.Lane
47 }
48 if laneOf["d"] == laneOf["c"] {
49 t.Fatalf("forks moeten andere lanes hebben: %v", laneOf)
50 }
51 if laneOf["b"] != laneOf["a"] {
52 t.Fatalf("stam blijft op één lane: %v", laneOf)
53 }
54 // master is blauw
55 for _, r := range g.Rows {
56 if r.SHA == "c" && r.Color != "var(--blue)" {
57 t.Fatalf("master-tip kleur %s", r.Color)
58 }
59 }
60 // merge/fork-lijn van d of c naar b
61 if !hasEdgeTo(g, "b") {
62 t.Fatalf("geen lijn naar b: %+v", g.Edges)
63 }
64}
65
66func TestLayoutMerge(t *testing.T) {
67 // m merget feature (f) in master (c).
68 refs := []Ref{
69 {Name: "master", SHA: "m", Kind: "branch"},
70 {Name: "feature", SHA: "f", Kind: "branch"},
71 }
72 g := Layout(commits("m:c,f", "f:b", "c:b", "b:a", "a:"), refs, "master")
73 if g.Lanes < 2 {
74 t.Fatalf("merge heeft een tweede lane nodig, kreeg %d", g.Lanes)
75 }
76 laneOf := map[string]int{}
77 colorOf := map[string]string{}
78 for _, r := range g.Rows {
79 laneOf[r.SHA] = r.Lane
80 colorOf[r.SHA] = r.Color
81 }
82 if laneOf["f"] == laneOf["c"] {
83 t.Fatalf("feature en master voor de merge op dezelfde lane: %v", laneOf)
84 }
85 if colorOf["m"] != "var(--blue)" {
86 t.Fatalf("merge-commit op master moet blauw zijn, kreeg %s", colorOf["m"])
87 }
88 if !hasEdgeBetween(g, "m", "f") && !hasEdgeBetween(g, "m", "c") {
89 t.Fatalf("verwacht lijnen van de merge naar beide ouders: %+v", g.Edges)
90 }
91}
92
93func TestLayoutMergeAndForkTogether(t *testing.T) {
94 // master: a-b-c-m, feature: b-d-e, m merget e.
95 refs := []Ref{
96 {Name: "master", SHA: "m", Kind: "branch"},
97 {Name: "feature", SHA: "e", Kind: "branch"},
98 {Name: "v1", SHA: "c", Kind: "tag"},
99 }
100 g := Layout(commits("m:c,e", "e:d", "d:b", "c:b", "b:a", "a:"), refs, "master")
101 if len(g.Rows) != 6 {
102 t.Fatalf("rijen=%d", len(g.Rows))
103 }
104 var hasTag, hasMaster, hasFeature bool
105 for _, r := range g.Rows {
106 for _, lb := range r.Labels {
107 switch {
108 case lb.Kind == "tag" && lb.Name == "v1":
109 hasTag = true
110 case lb.Default && lb.Name == "master":
111 hasMaster = true
112 case lb.Name == "feature":
113 hasFeature = true
114 }
115 }
116 }
117 if !hasTag || !hasMaster || !hasFeature {
118 t.Fatalf("labels ontbreken: tag=%v master=%v feature=%v", hasTag, hasMaster, hasFeature)
119 }
120}
121
122func TestColorDeterministicAndMainIsBlue(t *testing.T) {
123 if Color("master", "master") != "var(--blue)" {
124 t.Fatal("hoofdbranch moet --blue zijn")
125 }
126 if Color("main", "main") != "var(--blue)" {
127 t.Fatal("hoofdbranch main moet --blue zijn")
128 }
129 if Color("feature", "master") == "var(--blue)" {
130 t.Fatal("andere branch mag niet de hoofd-blauw zijn")
131 }
132 if Color("feature", "master") != Color("feature", "master") {
133 t.Fatal("kleur moet deterministisch zijn")
134 }
135 if Color("feature", "master") != Color("FEATURE", "master") {
136 t.Fatal("kleur is case-insensitive")
137 }
138 if Color("feature", "master") == Color("other", "master") {
139 t.Fatal("verschillende namen moeten meestal een andere kleur krijgen")
140 }
141 seen := map[string]bool{}
142 for _, n := range []string{"a", "b", "c", "d", "e", "f", "g", "h", "i", "j"} {
143 seen[Color(n, "master")] = true
144 }
145 if len(seen) < 2 {
146 t.Fatalf("palet wordt niet gebruikt: %v", seen)
147 }
148 for c := range seen {
149 if !strings.HasPrefix(c, "var(--graph-") {
150 t.Fatalf("onverwachte kleur %s", c)
151 }
152 }
153}
154
155func TestKeyChangesWithTips(t *testing.T) {
156 a := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)
157 b := Key(1, map[string]string{"refs/heads/master": "bbb"}, "master", 40)
158 c := Key(1, map[string]string{"refs/heads/master": "aaa"}, "master", 40)
159 if a == b {
160 t.Fatal("andere tip moet andere sleutel geven")
161 }
162 if a != c {
163 t.Fatal("zelfde stand moet dezelfde sleutel geven")
164 }
165 if Key(2, map[string]string{"refs/heads/master": "aaa"}, "master", 40) == a {
166 t.Fatal("andere repo moet andere sleutel geven")
167 }
168}
169
170func hasEdgeTo(g *Graph, sha string) bool {
171 idx := -1
172 for i, r := range g.Rows {
173 if r.SHA == sha {
174 idx = i
175 break
176 }
177 }
178 if idx < 0 {
179 return false
180 }
181 for _, e := range g.Edges {
182 if e.ToRow == idx {
183 return true
184 }
185 }
186 return false
187}
188
189func hasEdgeBetween(g *Graph, from, to string) bool {
190 fi, ti := -1, -1
191 for i, r := range g.Rows {
192 if r.SHA == from {
193 fi = i
194 }
195 if r.SHA == to {
196 ti = i
197 }
198 }
199 if fi < 0 || ti < 0 {
200 return false
201 }
202 for _, e := range g.Edges {
203 if e.FromRow == fi && e.ToRow == ti {
204 return true
205 }
206 }
207 // via een tussenliggende lane (merge-boog plus verticaal)
208 for _, e := range g.Edges {
209 if e.FromRow == fi && e.ToLane == g.Rows[ti].Lane {
210 return true
211 }
212 }
213 return false
214}
215
216func TestMainlineStaysBlueOnLaneZero(t *testing.T) {
217 // Nieuwere zijtak docs bovenop master-merge mag lane 0 en blauw niet inpikken.
218 refs := []Ref{
219 {Name: "master", SHA: "m", Kind: "branch"},
220 {Name: "docs", SHA: "d", Kind: "branch"},
221 }
222 g := Layout(commits("d:m", "m:c,f", "f:b", "c:b", "b:"), refs, "master")
223 for _, r := range g.Rows {
224 switch r.SHA {
225 case "m", "c", "b":
226 if r.Color != "var(--blue)" {
227 t.Fatalf("%s moet blauw zijn, kreeg %s (class %s)", r.SHA, r.Color, r.Class)
228 }
229 if r.Lane != 0 {
230 t.Fatalf("%s moet op lane 0, kreeg %d", r.SHA, r.Lane)
231 }
232 if r.Class != "is-main" {
233 t.Fatalf("%s class=%s", r.SHA, r.Class)
234 }
235 case "d":
236 if r.Lane == 0 {
237 t.Fatalf("zijtak docs mag lane 0 niet stelen")
238 }
239 if r.Color == "var(--blue)" {
240 t.Fatalf("zijtak mag niet de hoofd-blauw zijn")
241 }
242 }
243 }
244}
internal/gitgraph/svg.go added +63 −0
@@ -0,0 +1,63 @@
1 package gitgraph
2
3 import (
4 "fmt"
5 "html"
6 "strings"
7 )
8
9 // SVG tekent de lanelijnen. Alleen getallen en paletkleuren, veilig als HTML.
10 func (g *Graph) SVG() string {
11 if g == nil || len(g.Rows) == 0 || g.Lanes < 1 {
12 return ""
13 }
14 w, h := g.Width, g.Height
15 var b strings.Builder
16 b.WriteString(fmt.Sprintf(`<svg class="commitgraph-svg" viewBox="0 0 %d %d" width="%d" height="%d" aria-hidden="true">`, w, h, w, h))
17 for _, e := range g.Edges {
18 col := safeColor(e.Color)
19 x1, y1 := laneX(e.FromLane), rowY(e.FromRow)
20 x2, y2 := laneX(e.ToLane), rowY(e.ToRow)
21 if e.FromLane == e.ToLane {
22 fmt.Fprintf(&b, `<path d="M %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`, x1, y1, y2, col)
23 continue
24 }
25 // Boog tussen lanes: horizontaal op halve rij, dan verticaal.
26 midY := y1 + float64(RowH)/2
27 if e.ToRow == e.FromRow+1 {
28 // korte merge/fork naar de volgende rij
29 fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,
30 x1, y1, x1, midY, x2, midY, x2, y2, col)
31 continue
32 }
33 fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,
34 x1, y1, x1, midY, x2, midY, x2, y1+float64(RowH), y2, col)
35 }
36 for i, r := range g.Rows {
37 fmt.Fprintf(&b, `<circle cx="%.1f" cy="%.1f" r="%.1f" fill="%s"/>`, laneX(r.Lane), rowY(i), DotR, safeColor(r.Color))
38 }
39 b.WriteString(`</svg>`)
40 return b.String()
41 }
42
43 func laneX(lane int) float64 {
44 return float64(lane)*float64(LaneW) + float64(LaneW)/2
45 }
46
47 func rowY(row int) float64 {
48 return float64(row)*float64(RowH) + float64(RowH)/2
49 }
50
51 func safeColor(c string) string {
52 c = strings.TrimSpace(c)
53 if c == "var(--blue)" || c == "var(--muted)" {
54 return html.EscapeString(c)
55 }
56 if strings.HasPrefix(c, "var(--graph-") && strings.HasSuffix(c, ")") {
57 mid := c[len("var(--graph-") : len(c)-1]
58 if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {
59 return html.EscapeString(c)
60 }
61 }
62 return "var(--muted)"
63 }
@@ -0,0 +1,63 @@
1package gitgraph
2
3import (
4 "fmt"
5 "html"
6 "strings"
7)
8
9// SVG tekent de lanelijnen. Alleen getallen en paletkleuren, veilig als HTML.
10func (g *Graph) SVG() string {
11 if g == nil || len(g.Rows) == 0 || g.Lanes < 1 {
12 return ""
13 }
14 w, h := g.Width, g.Height
15 var b strings.Builder
16 b.WriteString(fmt.Sprintf(`<svg class="commitgraph-svg" viewBox="0 0 %d %d" width="%d" height="%d" aria-hidden="true">`, w, h, w, h))
17 for _, e := range g.Edges {
18 col := safeColor(e.Color)
19 x1, y1 := laneX(e.FromLane), rowY(e.FromRow)
20 x2, y2 := laneX(e.ToLane), rowY(e.ToRow)
21 if e.FromLane == e.ToLane {
22 fmt.Fprintf(&b, `<path d="M %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`, x1, y1, y2, col)
23 continue
24 }
25 // Boog tussen lanes: horizontaal op halve rij, dan verticaal.
26 midY := y1 + float64(RowH)/2
27 if e.ToRow == e.FromRow+1 {
28 // korte merge/fork naar de volgende rij
29 fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,
30 x1, y1, x1, midY, x2, midY, x2, y2, col)
31 continue
32 }
33 fmt.Fprintf(&b, `<path d="M %.1f %.1f C %.1f %.1f, %.1f %.1f, %.1f %.1f V %.1f" fill="none" stroke="%s" stroke-width="2" stroke-linecap="round"/>`,
34 x1, y1, x1, midY, x2, midY, x2, y1+float64(RowH), y2, col)
35 }
36 for i, r := range g.Rows {
37 fmt.Fprintf(&b, `<circle cx="%.1f" cy="%.1f" r="%.1f" fill="%s"/>`, laneX(r.Lane), rowY(i), DotR, safeColor(r.Color))
38 }
39 b.WriteString(`</svg>`)
40 return b.String()
41}
42
43func laneX(lane int) float64 {
44 return float64(lane)*float64(LaneW) + float64(LaneW)/2
45}
46
47func rowY(row int) float64 {
48 return float64(row)*float64(RowH) + float64(RowH)/2
49}
50
51func safeColor(c string) string {
52 c = strings.TrimSpace(c)
53 if c == "var(--blue)" || c == "var(--muted)" {
54 return html.EscapeString(c)
55 }
56 if strings.HasPrefix(c, "var(--graph-") && strings.HasSuffix(c, ")") {
57 mid := c[len("var(--graph-") : len(c)-1]
58 if len(mid) == 1 && mid[0] >= '0' && mid[0] < '0'+byte(PaletteSize) {
59 return html.EscapeString(c)
60 }
61 }
62 return "var(--muted)"
63}
internal/gitrepo/graph.go added +99 −0
@@ -0,0 +1,99 @@
1 package gitrepo
2
3 import (
4 "context"
5 "strconv"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/gitgraph"
9 )
10
11 // GraphHistory leest de recente commits over alle branches en tags, met ouders.
12 func GraphHistory(ctx context.Context, gitBin, dir string, limit int) ([]gitgraph.Commit, []gitgraph.Ref, error) {
13 if limit < 1 {
14 limit = gitgraph.DefaultLimit
15 }
16 out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--all", "--date-order",
17 "--format=%H%x1f%P%x1f%an%x1f%ae%x1f%at%x1f%s%x1e",
18 "-n"+strconv.Itoa(limit))
19 if err != nil {
20 msg := err.Error()
21 if strings.Contains(msg, "does not have any commits") || strings.Contains(msg, "bad default revision") || strings.Contains(msg, "ambiguous argument") || strings.Contains(msg, "does not have any refs") {
22 return nil, nil, nil
23 }
24 return nil, nil, err
25 }
26 commits := parseGraphLog(out)
27 refs, err := graphRefs(ctx, gitBin, dir)
28 if err != nil {
29 return commits, nil, err
30 }
31 return commits, refs, nil
32 }
33
34 func parseGraphLog(out string) []gitgraph.Commit {
35 var commits []gitgraph.Commit
36 for _, rec := range strings.Split(out, "\x1e") {
37 rec = strings.TrimSpace(rec)
38 if rec == "" {
39 continue
40 }
41 parts := strings.Split(rec, "\x1f")
42 if len(parts) < 6 {
43 continue
44 }
45 c := gitgraph.Commit{
46 SHA: parts[0],
47 Author: parts[2],
48 Email: parts[3],
49 Subject: parts[5],
50 }
51 c.Unix, _ = strconv.ParseInt(parts[4], 10, 64)
52 if len(c.SHA) >= 10 {
53 c.Short = c.SHA[:10]
54 }
55 if parts[1] != "" {
56 c.Parents = strings.Fields(parts[1])
57 }
58 commits = append(commits, c)
59 }
60 return commits
61 }
62
63 func graphRefs(ctx context.Context, gitBin, dir string) ([]gitgraph.Ref, error) {
64 out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref",
65 "--format=%(objectname)%00%(*objectname)%00%(refname)",
66 "refs/heads", "refs/tags")
67 if err != nil {
68 return nil, err
69 }
70 var refs []gitgraph.Ref
71 for _, line := range strings.Split(out, "\n") {
72 line = strings.TrimRight(line, "\r")
73 if line == "" {
74 continue
75 }
76 parts := strings.Split(line, "\x00")
77 if len(parts) < 3 {
78 continue
79 }
80 sha, peeled, name := parts[0], parts[1], parts[2]
81 if peeled != "" {
82 sha = peeled
83 }
84 kind := "branch"
85 if strings.HasPrefix(name, "refs/tags/") {
86 kind = "tag"
87 name = strings.TrimPrefix(name, "refs/tags/")
88 } else if strings.HasPrefix(name, "refs/heads/") {
89 name = strings.TrimPrefix(name, "refs/heads/")
90 } else {
91 continue
92 }
93 if sha == "" || name == "" {
94 continue
95 }
96 refs = append(refs, gitgraph.Ref{Name: name, SHA: sha, Kind: kind})
97 }
98 return refs, nil
99 }
@@ -0,0 +1,99 @@
1package gitrepo
2
3import (
4 "context"
5 "strconv"
6 "strings"
7
8 "gitlab.com/Timfa/bluegit/internal/gitgraph"
9)
10
11// GraphHistory leest de recente commits over alle branches en tags, met ouders.
12func GraphHistory(ctx context.Context, gitBin, dir string, limit int) ([]gitgraph.Commit, []gitgraph.Ref, error) {
13 if limit < 1 {
14 limit = gitgraph.DefaultLimit
15 }
16 out, err := run(ctx, gitBin, nil, "-C", dir, "log", "--all", "--date-order",
17 "--format=%H%x1f%P%x1f%an%x1f%ae%x1f%at%x1f%s%x1e",
18 "-n"+strconv.Itoa(limit))
19 if err != nil {
20 msg := err.Error()
21 if strings.Contains(msg, "does not have any commits") || strings.Contains(msg, "bad default revision") || strings.Contains(msg, "ambiguous argument") || strings.Contains(msg, "does not have any refs") {
22 return nil, nil, nil
23 }
24 return nil, nil, err
25 }
26 commits := parseGraphLog(out)
27 refs, err := graphRefs(ctx, gitBin, dir)
28 if err != nil {
29 return commits, nil, err
30 }
31 return commits, refs, nil
32}
33
34func parseGraphLog(out string) []gitgraph.Commit {
35 var commits []gitgraph.Commit
36 for _, rec := range strings.Split(out, "\x1e") {
37 rec = strings.TrimSpace(rec)
38 if rec == "" {
39 continue
40 }
41 parts := strings.Split(rec, "\x1f")
42 if len(parts) < 6 {
43 continue
44 }
45 c := gitgraph.Commit{
46 SHA: parts[0],
47 Author: parts[2],
48 Email: parts[3],
49 Subject: parts[5],
50 }
51 c.Unix, _ = strconv.ParseInt(parts[4], 10, 64)
52 if len(c.SHA) >= 10 {
53 c.Short = c.SHA[:10]
54 }
55 if parts[1] != "" {
56 c.Parents = strings.Fields(parts[1])
57 }
58 commits = append(commits, c)
59 }
60 return commits
61}
62
63func graphRefs(ctx context.Context, gitBin, dir string) ([]gitgraph.Ref, error) {
64 out, err := run(ctx, gitBin, nil, "-C", dir, "for-each-ref",
65 "--format=%(objectname)%00%(*objectname)%00%(refname)",
66 "refs/heads", "refs/tags")
67 if err != nil {
68 return nil, err
69 }
70 var refs []gitgraph.Ref
71 for _, line := range strings.Split(out, "\n") {
72 line = strings.TrimRight(line, "\r")
73 if line == "" {
74 continue
75 }
76 parts := strings.Split(line, "\x00")
77 if len(parts) < 3 {
78 continue
79 }
80 sha, peeled, name := parts[0], parts[1], parts[2]
81 if peeled != "" {
82 sha = peeled
83 }
84 kind := "branch"
85 if strings.HasPrefix(name, "refs/tags/") {
86 kind = "tag"
87 name = strings.TrimPrefix(name, "refs/tags/")
88 } else if strings.HasPrefix(name, "refs/heads/") {
89 name = strings.TrimPrefix(name, "refs/heads/")
90 } else {
91 continue
92 }
93 if sha == "" || name == "" {
94 continue
95 }
96 refs = append(refs, gitgraph.Ref{Name: name, SHA: sha, Kind: kind})
97 }
98 return refs, nil
99}
internal/gitrepo/graph_test.go added +79 −0
@@ -0,0 +1,79 @@
1 package gitrepo
2
3 import (
4 "context"
5 "os"
6 "path/filepath"
7 "testing"
8
9 "gitlab.com/Timfa/bluegit/internal/gitgraph"
10 )
11
12 func TestGraphHistoryMergeAndTag(t *testing.T) {
13 bare, work := testRepo(t)
14 gitOK(t, work, "checkout", "-qb", "feature")
15 if err := os.WriteFile(filepath.Join(work, "f"), []byte("b\n"), 0o644); err != nil {
16 t.Fatal(err)
17 }
18 gitOK(t, work, "add", "f")
19 gitOK(t, work, "commit", "-qm", "feature-work")
20 gitOK(t, work, "push", "-q", "origin", "feature")
21 gitOK(t, work, "checkout", "-q", "master")
22 if err := os.WriteFile(filepath.Join(work, "g"), []byte("c\n"), 0o644); err != nil {
23 t.Fatal(err)
24 }
25 gitOK(t, work, "add", "g")
26 gitOK(t, work, "commit", "-qm", "on-master")
27 gitOK(t, work, "tag", "v1")
28 gitOK(t, work, "merge", "-q", "--no-ff", "-m", "merge feature", "feature")
29 gitOK(t, work, "push", "-q", "origin", "master", "--tags")
30 gitOK(t, work, "push", "-q", "origin", "feature")
31
32 commits, refs, err := GraphHistory(context.Background(), "git", bare, 20)
33 if err != nil {
34 t.Fatal(err)
35 }
36 if len(commits) < 3 {
37 t.Fatalf("te weinig commits: %+v", commits)
38 }
39 var hasMerge, hasFeature, hasMaster, hasTag bool
40 for _, c := range commits {
41 if len(c.Parents) == 2 && c.Subject == "merge feature" {
42 hasMerge = true
43 }
44 }
45 for _, r := range refs {
46 switch {
47 case r.Kind == "branch" && r.Name == "master":
48 hasMaster = true
49 case r.Kind == "branch" && r.Name == "feature":
50 hasFeature = true
51 case r.Kind == "tag" && r.Name == "v1":
52 hasTag = true
53 }
54 }
55 if !hasMerge || !hasFeature || !hasMaster || !hasTag {
56 t.Fatalf("history onvolledig: merge=%v feature=%v master=%v tag=%v refs=%+v", hasMerge, hasFeature, hasMaster, hasTag, refs)
57 }
58 g := gitgraph.Layout(commits, refs, "master")
59 if g.Lanes < 2 {
60 t.Fatalf("verwacht meerdere lanes, kreeg %d", g.Lanes)
61 }
62 if g.Rows[0].Color != "var(--blue)" {
63 t.Fatalf("nieuwste (master) moet blauw zijn, kreeg %s", g.Rows[0].Color)
64 }
65 }
66
67 func TestGraphHistoryEmpty(t *testing.T) {
68 dir := t.TempDir()
69 if err := Init("git", dir, "master", "/bin/true"); err != nil {
70 t.Fatal(err)
71 }
72 commits, refs, err := GraphHistory(context.Background(), "git", dir, 10)
73 if err != nil {
74 t.Fatal(err)
75 }
76 if len(commits) != 0 || len(refs) != 0 {
77 t.Fatalf("lege repo: commits=%v refs=%v", commits, refs)
78 }
79 }
@@ -0,0 +1,79 @@
1package gitrepo
2
3import (
4 "context"
5 "os"
6 "path/filepath"
7 "testing"
8
9 "gitlab.com/Timfa/bluegit/internal/gitgraph"
10)
11
12func TestGraphHistoryMergeAndTag(t *testing.T) {
13 bare, work := testRepo(t)
14 gitOK(t, work, "checkout", "-qb", "feature")
15 if err := os.WriteFile(filepath.Join(work, "f"), []byte("b\n"), 0o644); err != nil {
16 t.Fatal(err)
17 }
18 gitOK(t, work, "add", "f")
19 gitOK(t, work, "commit", "-qm", "feature-work")
20 gitOK(t, work, "push", "-q", "origin", "feature")
21 gitOK(t, work, "checkout", "-q", "master")
22 if err := os.WriteFile(filepath.Join(work, "g"), []byte("c\n"), 0o644); err != nil {
23 t.Fatal(err)
24 }
25 gitOK(t, work, "add", "g")
26 gitOK(t, work, "commit", "-qm", "on-master")
27 gitOK(t, work, "tag", "v1")
28 gitOK(t, work, "merge", "-q", "--no-ff", "-m", "merge feature", "feature")
29 gitOK(t, work, "push", "-q", "origin", "master", "--tags")
30 gitOK(t, work, "push", "-q", "origin", "feature")
31
32 commits, refs, err := GraphHistory(context.Background(), "git", bare, 20)
33 if err != nil {
34 t.Fatal(err)
35 }
36 if len(commits) < 3 {
37 t.Fatalf("te weinig commits: %+v", commits)
38 }
39 var hasMerge, hasFeature, hasMaster, hasTag bool
40 for _, c := range commits {
41 if len(c.Parents) == 2 && c.Subject == "merge feature" {
42 hasMerge = true
43 }
44 }
45 for _, r := range refs {
46 switch {
47 case r.Kind == "branch" && r.Name == "master":
48 hasMaster = true
49 case r.Kind == "branch" && r.Name == "feature":
50 hasFeature = true
51 case r.Kind == "tag" && r.Name == "v1":
52 hasTag = true
53 }
54 }
55 if !hasMerge || !hasFeature || !hasMaster || !hasTag {
56 t.Fatalf("history onvolledig: merge=%v feature=%v master=%v tag=%v refs=%+v", hasMerge, hasFeature, hasMaster, hasTag, refs)
57 }
58 g := gitgraph.Layout(commits, refs, "master")
59 if g.Lanes < 2 {
60 t.Fatalf("verwacht meerdere lanes, kreeg %d", g.Lanes)
61 }
62 if g.Rows[0].Color != "var(--blue)" {
63 t.Fatalf("nieuwste (master) moet blauw zijn, kreeg %s", g.Rows[0].Color)
64 }
65}
66
67func TestGraphHistoryEmpty(t *testing.T) {
68 dir := t.TempDir()
69 if err := Init("git", dir, "master", "/bin/true"); err != nil {
70 t.Fatal(err)
71 }
72 commits, refs, err := GraphHistory(context.Background(), "git", dir, 10)
73 if err != nil {
74 t.Fatal(err)
75 }
76 if len(commits) != 0 || len(refs) != 0 {
77 t.Fatalf("lege repo: commits=%v refs=%v", commits, refs)
78 }
79}
internal/i18n/catalog_graph.go added +24 −0
@@ -0,0 +1,24 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, graphEN)
5 addCatalog(nl, graphNL)
6 addCatalog(de, graphDE)
7 addCatalog(fr, graphFR)
8 }
9
10 var graphEN = map[string]string{
11 "graph.label": "Commit graph",
12 }
13
14 var graphNL = map[string]string{
15 "graph.label": "Commitgrafiek",
16 }
17
18 var graphDE = map[string]string{
19 "graph.label": "Commit-Grafik",
20 }
21
22 var graphFR = map[string]string{
23 "graph.label": "Graphe des commits",
24 }
@@ -0,0 +1,24 @@
1package i18n
2
3func init() {
4 addCatalog(en, graphEN)
5 addCatalog(nl, graphNL)
6 addCatalog(de, graphDE)
7 addCatalog(fr, graphFR)
8}
9
10var graphEN = map[string]string{
11 "graph.label": "Commit graph",
12}
13
14var graphNL = map[string]string{
15 "graph.label": "Commitgrafiek",
16}
17
18var graphDE = map[string]string{
19 "graph.label": "Commit-Grafik",
20}
21
22var graphFR = map[string]string{
23 "graph.label": "Graphe des commits",
24}
internal/server/commitgraph.go added +92 −0
@@ -0,0 +1,92 @@
1 package server
2
3 import (
4 "context"
5 "html/template"
6 "net/http"
7
8 "gitlab.com/Timfa/bluegit/internal/gitgraph"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/store"
12 )
13
14 // GraphView is de commitgrafiek op de project-overzichtspagina.
15 type GraphView struct {
16 Rows []gitgraph.Row
17 Lanes int
18 Width, Height int
19 SVG template.HTML
20 }
21
22 func (s *Server) graphs() *gitgraph.Cache {
23 s.graphOnce.Do(func() {
24 s.graphCache = gitgraph.NewCache(gitgraph.DefaultMaxBytes)
25 })
26 return s.graphCache
27 }
28
29 func (s *Server) fillGraph(r *http.Request, v *View, repo store.Repo) {
30 g, err := s.repoGraph(r.Context(), repo)
31 if err != nil || g == nil || len(g.Rows) == 0 {
32 return
33 }
34 v.Graph = presentGraph(r.Context(), s, repo.ID, g, i18n.Parse(v.Lang))
35 }
36
37 func (s *Server) repoGraph(ctx context.Context, repo store.Repo) (*gitgraph.Graph, error) {
38 def := repo.DefaultBranch
39 // Sleutel op repo + hoofdbranch + limiet. De tip-stand zit niet in de
40 // lookup: die zou bij elke pageview git- of schijf-I/O vragen. Bij een
41 // push wist refsChanged de entry (Drop) en vult refreshCache hem opnieuw.
42 key := gitgraph.Key(repo.ID, nil, def, gitgraph.DefaultLimit)
43 return s.graphs().Get(ctx, key, def, func(ctx context.Context) ([]gitgraph.Commit, []gitgraph.Ref, error) {
44 return gitrepo.GraphHistory(ctx, s.Git, s.gdir(repo), gitgraph.DefaultLimit)
45 })
46 }
47
48 func presentGraph(ctx context.Context, s *Server, repoID int64, g *gitgraph.Graph, lang i18n.Lang) *GraphView {
49 rows := make([]gitgraph.Row, len(g.Rows))
50 copy(rows, g.Rows)
51 if s != nil {
52 in := make([]gitrepo.Commit, 0, len(rows))
53 for _, r := range rows {
54 in = append(in, gitrepo.Commit{
55 SHA: r.SHA, Short: r.Short, Author: r.Author, Email: r.Email,
56 Unix: r.Unix, Subject: r.Subject,
57 })
58 }
59 people := s.presentCommits(ctx, repoID, in, lang)
60 for i := range rows {
61 if i >= len(people) {
62 break
63 }
64 p := people[i]
65 rows[i].Avatar = p.Avatar
66 rows[i].Initial = p.Initial
67 rows[i].UserURL = p.UserURL
68 if rows[i].Initial == "" {
69 rows[i].Initial = initialOf(rows[i].Author)
70 }
71 }
72 }
73 for i := range rows {
74 if rows[i].Initial == "" {
75 rows[i].Initial = initialOf(rows[i].Author)
76 }
77 }
78 return &GraphView{
79 Rows: rows,
80 Lanes: g.Lanes,
81 Width: g.Width,
82 Height: g.Height,
83 SVG: template.HTML(g.SVG()),
84 }
85 }
86
87 func (s *Server) dropGraph(repo store.Repo) {
88 if s == nil {
89 return
90 }
91 s.graphs().Drop(repo.ID)
92 }
@@ -0,0 +1,92 @@
1package server
2
3import (
4 "context"
5 "html/template"
6 "net/http"
7
8 "gitlab.com/Timfa/bluegit/internal/gitgraph"
9 "gitlab.com/Timfa/bluegit/internal/gitrepo"
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/store"
12)
13
14// GraphView is de commitgrafiek op de project-overzichtspagina.
15type GraphView struct {
16 Rows []gitgraph.Row
17 Lanes int
18 Width, Height int
19 SVG template.HTML
20}
21
22func (s *Server) graphs() *gitgraph.Cache {
23 s.graphOnce.Do(func() {
24 s.graphCache = gitgraph.NewCache(gitgraph.DefaultMaxBytes)
25 })
26 return s.graphCache
27}
28
29func (s *Server) fillGraph(r *http.Request, v *View, repo store.Repo) {
30 g, err := s.repoGraph(r.Context(), repo)
31 if err != nil || g == nil || len(g.Rows) == 0 {
32 return
33 }
34 v.Graph = presentGraph(r.Context(), s, repo.ID, g, i18n.Parse(v.Lang))
35}
36
37func (s *Server) repoGraph(ctx context.Context, repo store.Repo) (*gitgraph.Graph, error) {
38 def := repo.DefaultBranch
39 // Sleutel op repo + hoofdbranch + limiet. De tip-stand zit niet in de
40 // lookup: die zou bij elke pageview git- of schijf-I/O vragen. Bij een
41 // push wist refsChanged de entry (Drop) en vult refreshCache hem opnieuw.
42 key := gitgraph.Key(repo.ID, nil, def, gitgraph.DefaultLimit)
43 return s.graphs().Get(ctx, key, def, func(ctx context.Context) ([]gitgraph.Commit, []gitgraph.Ref, error) {
44 return gitrepo.GraphHistory(ctx, s.Git, s.gdir(repo), gitgraph.DefaultLimit)
45 })
46}
47
48func presentGraph(ctx context.Context, s *Server, repoID int64, g *gitgraph.Graph, lang i18n.Lang) *GraphView {
49 rows := make([]gitgraph.Row, len(g.Rows))
50 copy(rows, g.Rows)
51 if s != nil {
52 in := make([]gitrepo.Commit, 0, len(rows))
53 for _, r := range rows {
54 in = append(in, gitrepo.Commit{
55 SHA: r.SHA, Short: r.Short, Author: r.Author, Email: r.Email,
56 Unix: r.Unix, Subject: r.Subject,
57 })
58 }
59 people := s.presentCommits(ctx, repoID, in, lang)
60 for i := range rows {
61 if i >= len(people) {
62 break
63 }
64 p := people[i]
65 rows[i].Avatar = p.Avatar
66 rows[i].Initial = p.Initial
67 rows[i].UserURL = p.UserURL
68 if rows[i].Initial == "" {
69 rows[i].Initial = initialOf(rows[i].Author)
70 }
71 }
72 }
73 for i := range rows {
74 if rows[i].Initial == "" {
75 rows[i].Initial = initialOf(rows[i].Author)
76 }
77 }
78 return &GraphView{
79 Rows: rows,
80 Lanes: g.Lanes,
81 Width: g.Width,
82 Height: g.Height,
83 SVG: template.HTML(g.SVG()),
84 }
85}
86
87func (s *Server) dropGraph(repo store.Repo) {
88 if s == nil {
89 return
90 }
91 s.graphs().Drop(repo.ID)
92}
internal/server/commitgraph_test.go added +226 −0
@@ -0,0 +1,226 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "path/filepath"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/gitgraph"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 )
19
20 func TestOverviewRendersCommitGraph(t *testing.T) {
21 ts, client, repo := graphTestRepo(t)
22 page := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
23 if !strings.Contains(page, `class="commitgraph"`) {
24 t.Fatalf("geen grafiek op het overzicht:\n%s", page)
25 }
26 if !strings.Contains(page, `aria-label="Commit graph"`) && !strings.Contains(page, `aria-label="Commitgrafiek"`) {
27 t.Fatalf("geen toegankelijk label:\n%s", page)
28 }
29 if !strings.Contains(page, "is-default") || !strings.Contains(page, ">master<") {
30 t.Fatalf("hoofdbranch-label ontbreekt:\n%s", page)
31 }
32 if !strings.Contains(page, ">feature<") || !strings.Contains(page, "is-tag") || !strings.Contains(page, ">v1<") {
33 t.Fatalf("feature of tag ontbreekt:\n%s", page)
34 }
35 if !strings.Contains(page, `stroke="var(--blue)"`) && !strings.Contains(page, `fill="var(--blue)"`) {
36 t.Fatalf("hoofdbranch is niet blauw:\n%s", page)
37 }
38 if strings.Contains(page, "ZgotmplZ") {
39 t.Fatalf("css-kleur werd weggestreept:\n%s", page)
40 }
41 if !strings.Contains(page, "/tim/grafiek/-/commit/") {
42 t.Fatalf("geen commitlinks")
43 }
44 if !strings.Contains(page, "merge feature") && !strings.Contains(page, "feature-work") {
45 t.Fatalf("commitberichten ontbreken")
46 }
47 // Tweede request: nog steeds dezelfde grafiek (cache).
48 page2 := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
49 if !strings.Contains(page2, `class="commitgraph"`) {
50 t.Fatal("grafiek verdween bij herladen")
51 }
52 _ = repo
53 }
54
55 func TestGraphCacheHitSkipsGit(t *testing.T) {
56 ts, client, repo := graphTestRepo(t)
57 // Eerste opbouw via de pagina, daarna git-binary onbruikbaar maken.
58 _ = read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
59 srv := repo
60 srv.Git = filepath.Join(t.TempDir(), "niet-bestaande-git")
61 g, err := srv.repoGraph(context.Background(), mustStoreRepo(t, srv))
62 if err != nil || g == nil || len(g.Rows) == 0 {
63 t.Fatalf("cache-hit had geen git nodig, kreeg err=%v g=%v", err, g)
64 }
65 hits, misses, _, _ := srv.graphs().Stats()
66 if hits < 1 || misses < 1 {
67 t.Fatalf("verwacht miss+hit, hits=%d misses=%d", hits, misses)
68 }
69 }
70
71 func TestGraphColdWarmTimes(t *testing.T) {
72 storage := t.TempDir()
73 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
74 if err != nil {
75 t.Fatal(err)
76 }
77 t.Cleanup(func() { _ = st.Close() })
78 cfg := config.Config{
79 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
80 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
81 Git: config.Git{Binary: "git", DefaultBranch: "master"},
82 }
83 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
84 ts := httptest.NewServer(srv.Handler())
85 t.Cleanup(ts.Close)
86 jar, _ := cookiejar.New(nil)
87 client := &http.Client{Jar: jar}
88 page := read(t, mustGet(t, client, ts.URL+"/login"))
89 page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tijden"}, "visibility": {"public"}}))
90 page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
91 token := between(page, `<p class="code">`, "</p>")
92
93 work := t.TempDir()
94 git(t, work, "init", "-b", "master")
95 git(t, work, "config", "user.email", "tim@example")
96 git(t, work, "config", "user.name", "tim")
97 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/tijden.git"
98 git(t, work, "remote", "add", "origin", remote)
99 for i := 0; i < 24; i++ {
100 writeFile(t, filepath.Join(work, "f"), string(rune('a'+i%26))+"\n")
101 git(t, work, "add", "f")
102 git(t, work, "commit", "-m", "c"+string(rune('a'+i%26)))
103 }
104 git(t, work, "checkout", "-b", "feature")
105 for i := 0; i < 8; i++ {
106 writeFile(t, filepath.Join(work, "g"), "g"+string(rune('a'+i))+"\n")
107 git(t, work, "add", "g")
108 git(t, work, "commit", "-m", "f"+string(rune('a'+i)))
109 }
110 git(t, work, "checkout", "master")
111 git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")
112 git(t, work, "push", "-u", "origin", "master")
113 git(t, work, "push", "origin", "feature")
114
115 row, err := st.RepoByPath(context.Background(), "tim", "tijden")
116 if err != nil {
117 t.Fatal(err)
118 }
119 ctx := context.Background()
120 // De push heeft de cache al via refsChanged gevuld; eerst legen voor een echte koude meting.
121 time.Sleep(50 * time.Millisecond)
122 srv.dropGraph(row)
123 start := time.Now()
124 g, err := srv.repoGraph(ctx, row)
125 cold := time.Since(start)
126 if err != nil || g == nil || len(g.Rows) == 0 {
127 t.Fatalf("koud: %v", err)
128 }
129 start = time.Now()
130 g2, err := srv.repoGraph(ctx, row)
131 warm := time.Since(start)
132 if err != nil || g2 == nil {
133 t.Fatalf("warm: %v", err)
134 }
135 t.Logf("commitgrafiek koud=%s warm=%s rijen=%d lanes=%d", cold, warm, len(g.Rows), g.Lanes)
136 if warm > cold && warm > 20*time.Millisecond {
137 t.Fatalf("warm (%s) zou ruim onder koud (%s) moeten liggen", warm, cold)
138 }
139 // Alleen rapporteren; een minieme warm-meting kan door ruis iets hoger zijn
140 // als beide sub-milliseconde zijn. Dan is het alsnog een cache-hit.
141 hits, _, _, _ := srv.graphs().Stats()
142 if hits < 1 {
143 t.Fatal("geen cache-hit bij de warme meting")
144 }
145 }
146
147 func graphTestRepo(t *testing.T) (*httptest.Server, *http.Client, *Server) {
148 t.Helper()
149 storage := t.TempDir()
150 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
151 if err != nil {
152 t.Fatal(err)
153 }
154 t.Cleanup(func() { _ = st.Close() })
155 cfg := config.Config{
156 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
157 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
158 Git: config.Git{Binary: "git", DefaultBranch: "master"},
159 }
160 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
161 ts := httptest.NewServer(srv.Handler())
162 t.Cleanup(ts.Close)
163 jar, _ := cookiejar.New(nil)
164 client := &http.Client{Jar: jar}
165 page := read(t, mustGet(t, client, ts.URL+"/login"))
166 page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"grafiek"}, "visibility": {"public"}}))
167 page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
168 token := between(page, `<p class="code">`, "</p>")
169
170 work := t.TempDir()
171 git(t, work, "init", "-b", "master")
172 git(t, work, "config", "user.email", "tim@example")
173 git(t, work, "config", "user.name", "tim")
174 writeFile(t, filepath.Join(work, "README.md"), "start\n")
175 git(t, work, "add", ".")
176 git(t, work, "commit", "-m", "start")
177 git(t, work, "checkout", "-b", "feature")
178 writeFile(t, filepath.Join(work, "extra.txt"), "meer\n")
179 git(t, work, "add", "extra.txt")
180 git(t, work, "commit", "-m", "feature-work")
181 git(t, work, "checkout", "master")
182 writeFile(t, filepath.Join(work, "on-master.txt"), "c\n")
183 git(t, work, "add", "on-master.txt")
184 git(t, work, "commit", "-m", "on-master")
185 git(t, work, "tag", "v1")
186 git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")
187 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/grafiek.git"
188 git(t, work, "remote", "add", "origin", remote)
189 git(t, work, "push", "-u", "origin", "master", "--tags")
190 git(t, work, "push", "-u", "origin", "feature")
191 return ts, client, srv
192 }
193
194 func mustStoreRepo(t *testing.T, s *Server) store.Repo {
195 t.Helper()
196 row, err := s.Store.RepoByPath(context.Background(), "tim", "grafiek")
197 if err != nil {
198 t.Fatal(err)
199 }
200 return row
201 }
202
203 func TestSVGColorsAreSafe(t *testing.T) {
204 g := gitgraph.Layout(
205 []gitgraph.Commit{
206 {SHA: "m", Subject: `<script>`, Parents: []string{"c", "f"}},
207 {SHA: "f", Subject: "x", Parents: []string{"b"}},
208 {SHA: "c", Subject: "y", Parents: []string{"b"}},
209 {SHA: "b", Subject: "z", Parents: nil},
210 },
211 []gitgraph.Ref{{Name: "master", SHA: "m", Kind: "branch"}, {Name: "feature", SHA: "f", Kind: "branch"}},
212 "master",
213 )
214 svg := g.SVG()
215 if strings.Contains(svg, "<script") || strings.Contains(svg, `subject`) {
216 t.Fatalf("svg lekt tekst: %s", svg)
217 }
218 if !strings.Contains(svg, "var(--blue)") {
219 t.Fatalf("blauw ontbreekt: %s", svg)
220 }
221 for _, token := range []string{"stroke=\"var(--", "fill=\"var(--"} {
222 if !strings.Contains(svg, token) {
223 t.Fatalf("verwacht %s in %s", token, svg)
224 }
225 }
226 }
@@ -0,0 +1,226 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "path/filepath"
10 "strings"
11 "testing"
12 "time"
13
14 "gitlab.com/Timfa/bluegit/internal/auth"
15 "gitlab.com/Timfa/bluegit/internal/config"
16 "gitlab.com/Timfa/bluegit/internal/gitgraph"
17 "gitlab.com/Timfa/bluegit/internal/store"
18)
19
20func TestOverviewRendersCommitGraph(t *testing.T) {
21 ts, client, repo := graphTestRepo(t)
22 page := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
23 if !strings.Contains(page, `class="commitgraph"`) {
24 t.Fatalf("geen grafiek op het overzicht:\n%s", page)
25 }
26 if !strings.Contains(page, `aria-label="Commit graph"`) && !strings.Contains(page, `aria-label="Commitgrafiek"`) {
27 t.Fatalf("geen toegankelijk label:\n%s", page)
28 }
29 if !strings.Contains(page, "is-default") || !strings.Contains(page, ">master<") {
30 t.Fatalf("hoofdbranch-label ontbreekt:\n%s", page)
31 }
32 if !strings.Contains(page, ">feature<") || !strings.Contains(page, "is-tag") || !strings.Contains(page, ">v1<") {
33 t.Fatalf("feature of tag ontbreekt:\n%s", page)
34 }
35 if !strings.Contains(page, `stroke="var(--blue)"`) && !strings.Contains(page, `fill="var(--blue)"`) {
36 t.Fatalf("hoofdbranch is niet blauw:\n%s", page)
37 }
38 if strings.Contains(page, "ZgotmplZ") {
39 t.Fatalf("css-kleur werd weggestreept:\n%s", page)
40 }
41 if !strings.Contains(page, "/tim/grafiek/-/commit/") {
42 t.Fatalf("geen commitlinks")
43 }
44 if !strings.Contains(page, "merge feature") && !strings.Contains(page, "feature-work") {
45 t.Fatalf("commitberichten ontbreken")
46 }
47 // Tweede request: nog steeds dezelfde grafiek (cache).
48 page2 := read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
49 if !strings.Contains(page2, `class="commitgraph"`) {
50 t.Fatal("grafiek verdween bij herladen")
51 }
52 _ = repo
53}
54
55func TestGraphCacheHitSkipsGit(t *testing.T) {
56 ts, client, repo := graphTestRepo(t)
57 // Eerste opbouw via de pagina, daarna git-binary onbruikbaar maken.
58 _ = read(t, mustGet(t, client, ts.URL+"/tim/grafiek"))
59 srv := repo
60 srv.Git = filepath.Join(t.TempDir(), "niet-bestaande-git")
61 g, err := srv.repoGraph(context.Background(), mustStoreRepo(t, srv))
62 if err != nil || g == nil || len(g.Rows) == 0 {
63 t.Fatalf("cache-hit had geen git nodig, kreeg err=%v g=%v", err, g)
64 }
65 hits, misses, _, _ := srv.graphs().Stats()
66 if hits < 1 || misses < 1 {
67 t.Fatalf("verwacht miss+hit, hits=%d misses=%d", hits, misses)
68 }
69}
70
71func TestGraphColdWarmTimes(t *testing.T) {
72 storage := t.TempDir()
73 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
74 if err != nil {
75 t.Fatal(err)
76 }
77 t.Cleanup(func() { _ = st.Close() })
78 cfg := config.Config{
79 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
80 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
81 Git: config.Git{Binary: "git", DefaultBranch: "master"},
82 }
83 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
84 ts := httptest.NewServer(srv.Handler())
85 t.Cleanup(ts.Close)
86 jar, _ := cookiejar.New(nil)
87 client := &http.Client{Jar: jar}
88 page := read(t, mustGet(t, client, ts.URL+"/login"))
89 page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tijden"}, "visibility": {"public"}}))
90 page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
91 token := between(page, `<p class="code">`, "</p>")
92
93 work := t.TempDir()
94 git(t, work, "init", "-b", "master")
95 git(t, work, "config", "user.email", "tim@example")
96 git(t, work, "config", "user.name", "tim")
97 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/tijden.git"
98 git(t, work, "remote", "add", "origin", remote)
99 for i := 0; i < 24; i++ {
100 writeFile(t, filepath.Join(work, "f"), string(rune('a'+i%26))+"\n")
101 git(t, work, "add", "f")
102 git(t, work, "commit", "-m", "c"+string(rune('a'+i%26)))
103 }
104 git(t, work, "checkout", "-b", "feature")
105 for i := 0; i < 8; i++ {
106 writeFile(t, filepath.Join(work, "g"), "g"+string(rune('a'+i))+"\n")
107 git(t, work, "add", "g")
108 git(t, work, "commit", "-m", "f"+string(rune('a'+i)))
109 }
110 git(t, work, "checkout", "master")
111 git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")
112 git(t, work, "push", "-u", "origin", "master")
113 git(t, work, "push", "origin", "feature")
114
115 row, err := st.RepoByPath(context.Background(), "tim", "tijden")
116 if err != nil {
117 t.Fatal(err)
118 }
119 ctx := context.Background()
120 // De push heeft de cache al via refsChanged gevuld; eerst legen voor een echte koude meting.
121 time.Sleep(50 * time.Millisecond)
122 srv.dropGraph(row)
123 start := time.Now()
124 g, err := srv.repoGraph(ctx, row)
125 cold := time.Since(start)
126 if err != nil || g == nil || len(g.Rows) == 0 {
127 t.Fatalf("koud: %v", err)
128 }
129 start = time.Now()
130 g2, err := srv.repoGraph(ctx, row)
131 warm := time.Since(start)
132 if err != nil || g2 == nil {
133 t.Fatalf("warm: %v", err)
134 }
135 t.Logf("commitgrafiek koud=%s warm=%s rijen=%d lanes=%d", cold, warm, len(g.Rows), g.Lanes)
136 if warm > cold && warm > 20*time.Millisecond {
137 t.Fatalf("warm (%s) zou ruim onder koud (%s) moeten liggen", warm, cold)
138 }
139 // Alleen rapporteren; een minieme warm-meting kan door ruis iets hoger zijn
140 // als beide sub-milliseconde zijn. Dan is het alsnog een cache-hit.
141 hits, _, _, _ := srv.graphs().Stats()
142 if hits < 1 {
143 t.Fatal("geen cache-hit bij de warme meting")
144 }
145}
146
147func graphTestRepo(t *testing.T) (*httptest.Server, *http.Client, *Server) {
148 t.Helper()
149 storage := t.TempDir()
150 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
151 if err != nil {
152 t.Fatal(err)
153 }
154 t.Cleanup(func() { _ = st.Close() })
155 cfg := config.Config{
156 BaseURL: "http://git.example", Listen: "127.0.0.1:0", StoragePath: storage,
157 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
158 Git: config.Git{Binary: "git", DefaultBranch: "master"},
159 }
160 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
161 ts := httptest.NewServer(srv.Handler())
162 t.Cleanup(ts.Close)
163 jar, _ := cookiejar.New(nil)
164 client := &http.Client{Jar: jar}
165 page := read(t, mustGet(t, client, ts.URL+"/login"))
166 page = read(t, mustPost(t, client, ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"grafiek"}, "visibility": {"public"}}))
167 page = read(t, mustPost(t, client, ts.URL+"/settings/tokens", url.Values{"csrf": {csrfOf(t, page)}, "name": {"tim"}}))
168 token := between(page, `<p class="code">`, "</p>")
169
170 work := t.TempDir()
171 git(t, work, "init", "-b", "master")
172 git(t, work, "config", "user.email", "tim@example")
173 git(t, work, "config", "user.name", "tim")
174 writeFile(t, filepath.Join(work, "README.md"), "start\n")
175 git(t, work, "add", ".")
176 git(t, work, "commit", "-m", "start")
177 git(t, work, "checkout", "-b", "feature")
178 writeFile(t, filepath.Join(work, "extra.txt"), "meer\n")
179 git(t, work, "add", "extra.txt")
180 git(t, work, "commit", "-m", "feature-work")
181 git(t, work, "checkout", "master")
182 writeFile(t, filepath.Join(work, "on-master.txt"), "c\n")
183 git(t, work, "add", "on-master.txt")
184 git(t, work, "commit", "-m", "on-master")
185 git(t, work, "tag", "v1")
186 git(t, work, "merge", "--no-ff", "-m", "merge feature", "feature")
187 remote := strings.Replace(ts.URL, "http://", "http://tim:"+token+"@", 1) + "/tim/grafiek.git"
188 git(t, work, "remote", "add", "origin", remote)
189 git(t, work, "push", "-u", "origin", "master", "--tags")
190 git(t, work, "push", "-u", "origin", "feature")
191 return ts, client, srv
192}
193
194func mustStoreRepo(t *testing.T, s *Server) store.Repo {
195 t.Helper()
196 row, err := s.Store.RepoByPath(context.Background(), "tim", "grafiek")
197 if err != nil {
198 t.Fatal(err)
199 }
200 return row
201}
202
203func TestSVGColorsAreSafe(t *testing.T) {
204 g := gitgraph.Layout(
205 []gitgraph.Commit{
206 {SHA: "m", Subject: `<script>`, Parents: []string{"c", "f"}},
207 {SHA: "f", Subject: "x", Parents: []string{"b"}},
208 {SHA: "c", Subject: "y", Parents: []string{"b"}},
209 {SHA: "b", Subject: "z", Parents: nil},
210 },
211 []gitgraph.Ref{{Name: "master", SHA: "m", Kind: "branch"}, {Name: "feature", SHA: "f", Kind: "branch"}},
212 "master",
213 )
214 svg := g.SVG()
215 if strings.Contains(svg, "<script") || strings.Contains(svg, `subject`) {
216 t.Fatalf("svg lekt tekst: %s", svg)
217 }
218 if !strings.Contains(svg, "var(--blue)") {
219 t.Fatalf("blauw ontbreekt: %s", svg)
220 }
221 for _, token := range []string{"stroke=\"var(--", "fill=\"var(--"} {
222 if !strings.Contains(svg, token) {
223 t.Fatalf("verwacht %s in %s", token, svg)
224 }
225 }
226}
internal/server/gitcache.go +5 −4
@@ -171,18 +171,19 @@ func (s *Server) cDoc(ctx context.Context, repo store.Repo, rev, path string, ma
171 171 // op de achtergrond opnieuw.
172 172 func (s *Server) refsChanged(repo store.Repo) {
173 173 c := s.ReadCache()
174 if c == nil {
175 return
174 if c != nil {
175 c.DropRefs(repo.ID)
176 176 }
177 c.DropRefs(repo.ID)
177 s.dropGraph(repo)
178 178 go s.refreshCache(repo)
179 179 }
180 180
181 181 func (s *Server) refreshCache(repo store.Repo) {
182 ctx := context.Background()
183 _, _ = s.repoGraph(ctx, repo)
182 184 if s.ReadCache() == nil {
183 185 return
184 186 }
185 ctx := context.Background()
186 187 _, _ = s.cRefs(ctx, repo)
187 188 _, _ = s.cBranches(ctx, repo)
188 189 _, _ = s.cBranchTips(ctx, repo)
@@ -171,18 +171,19 @@ func (s *Server) cDoc(ctx context.Context, repo store.Repo, rev, path string, ma
171// op de achtergrond opnieuw.
171// op de achtergrond opnieuw.
172func (s *Server) refsChanged(repo store.Repo) {
172func (s *Server) refsChanged(repo store.Repo) {
173 c := s.ReadCache()
173 c := s.ReadCache()
174 if c == nil {
174 if c != nil {
175 return
175 c.DropRefs(repo.ID)
176 }
176 }
177 c.DropRefs(repo.ID)
177 s.dropGraph(repo)
178 go s.refreshCache(repo)
178 go s.refreshCache(repo)
179}
179}
180
180
181func (s *Server) refreshCache(repo store.Repo) {
181func (s *Server) refreshCache(repo store.Repo) {
182 ctx := context.Background()
183 _, _ = s.repoGraph(ctx, repo)
182 if s.ReadCache() == nil {
184 if s.ReadCache() == nil {
183 return
185 return
184 }
186 }
185 ctx := context.Background()
186 _, _ = s.cRefs(ctx, repo)
187 _, _ = s.cRefs(ctx, repo)
187 _, _ = s.cBranches(ctx, repo)
188 _, _ = s.cBranches(ctx, repo)
188 _, _ = s.cBranchTips(ctx, repo)
189 _, _ = s.cBranchTips(ctx, repo)
internal/server/project.go +1 −0
@@ -20,6 +20,7 @@ import (
20 20 func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
21 21 v.Page = "overview"
22 22 s.branchList(r, v, repo)
23 s.fillGraph(r, v, repo)
23 24 lang := i18n.Parse(v.Lang)
24 25 if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {
25 26 if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
@@ -20,6 +20,7 @@ import (
20func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
20func (s *Server) fillOverview(r *http.Request, v *View, repo store.Repo) {
21 v.Page = "overview"
21 v.Page = "overview"
22 s.branchList(r, v, repo)
22 s.branchList(r, v, repo)
23 s.fillGraph(r, v, repo)
23 lang := i18n.Parse(v.Lang)
24 lang := i18n.Parse(v.Lang)
24 if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {
25 if c, err := s.cLastCommit(r.Context(), repo, v.Rev, ""); err == nil && c.SHA != "" {
25 if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
26 if rows := s.presentCommits(r.Context(), repo.ID, []gitrepo.Commit{c}, lang); len(rows) > 0 {
internal/server/server.go +5 −0
@@ -26,6 +26,7 @@ import (
26 26 "gitlab.com/Timfa/bluegit/internal/card"
27 27 "gitlab.com/Timfa/bluegit/internal/cispec"
28 28 "gitlab.com/Timfa/bluegit/internal/config"
29 "gitlab.com/Timfa/bluegit/internal/gitgraph"
29 30 "gitlab.com/Timfa/bluegit/internal/i18n"
30 31 "gitlab.com/Timfa/bluegit/internal/realip"
31 32 "gitlab.com/Timfa/bluegit/internal/runner"
@@ -71,6 +72,9 @@ type Server struct {
71 72
72 73 cacheMu sync.RWMutex
73 74 rcache *readcache.Cache
75
76 graphOnce sync.Once
77 graphCache *gitgraph.Cache
74 78 }
75 79
76 80 type principal struct {
@@ -752,6 +756,7 @@ type View struct {
752 756 IsImage bool // rasterafbeelding met kloppende magic bytes
753 757 FileName string
754 758 RevProtected bool
759 Graph *GraphView
755 760 Heat *activity.Calendar
756 761 Notes []NoteRow
757 762 Profile *store.User
@@ -26,6 +26,7 @@ import (
26 "gitlab.com/Timfa/bluegit/internal/card"
26 "gitlab.com/Timfa/bluegit/internal/card"
27 "gitlab.com/Timfa/bluegit/internal/cispec"
27 "gitlab.com/Timfa/bluegit/internal/cispec"
28 "gitlab.com/Timfa/bluegit/internal/config"
28 "gitlab.com/Timfa/bluegit/internal/config"
29 "gitlab.com/Timfa/bluegit/internal/gitgraph"
29 "gitlab.com/Timfa/bluegit/internal/i18n"
30 "gitlab.com/Timfa/bluegit/internal/i18n"
30 "gitlab.com/Timfa/bluegit/internal/realip"
31 "gitlab.com/Timfa/bluegit/internal/realip"
31 "gitlab.com/Timfa/bluegit/internal/runner"
32 "gitlab.com/Timfa/bluegit/internal/runner"
@@ -71,6 +72,9 @@ type Server struct {
71
72
72 cacheMu sync.RWMutex
73 cacheMu sync.RWMutex
73 rcache *readcache.Cache
74 rcache *readcache.Cache
75
76 graphOnce sync.Once
77 graphCache *gitgraph.Cache
74}
78}
75
79
76type principal struct {
80type principal struct {
@@ -752,6 +756,7 @@ type View struct {
752 IsImage bool // rasterafbeelding met kloppende magic bytes
756 IsImage bool // rasterafbeelding met kloppende magic bytes
753 FileName string
757 FileName string
754 RevProtected bool
758 RevProtected bool
759 Graph *GraphView
755 Heat *activity.Calendar
760 Heat *activity.Calendar
756 Notes []NoteRow
761 Notes []NoteRow
757 Profile *store.User
762 Profile *store.User
internal/server/static/style.css +117 −1
@@ -27,6 +27,19 @@
27 27 --sidebar: 240px;
28 28 --content: 1180px;
29 29 --top-h: 48px;
30 --graph-w: 236px;
31 --graph-gap: 12px;
32 --graph-ref-w: 78px;
33 --graph-row: 22px;
34 --graph-lane: 12px;
35 --graph-0: #0e7490;
36 --graph-1: #6f42c1;
37 --graph-2: #1f6b3a;
38 --graph-3: #9d174d;
39 --graph-4: #b45309;
40 --graph-5: #0f766e;
41 --graph-6: #7c3aed;
42 --graph-7: #9a3412;
30 43 font-family: var(--font);
31 44 }
32 45 * { box-sizing: border-box; }
@@ -53,7 +66,7 @@ h2 { font-size: 16px; font-weight: 600; }
53 66 .top button { background: transparent; border: 1px solid rgba(255,255,255,.35); color: white; }
54 67 .frame { display: flex; align-items: flex-start; min-height: calc(100vh - var(--top-h)); }
55 68 .frame.with-side .content { flex: 1; min-width: 0; }
56 .content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; }
69 .content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; container-type: inline-size; container-name: maincol; }
57 70 main, main.wide {
58 71 width: min(100%, var(--content));
59 72 max-width: var(--content);
@@ -1515,3 +1528,106 @@ li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center;
1515 1528 .pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }
1516 1529 .status.waiting_for_job { background: #fff4e0; color: #8a5a00; }
1517 1530 form.cancelform { display: inline; }
1531
1532 /* Commitgrafiek in de lege ruimte naast de centrale kolom. Buiten de
1533 flow (slotbreedte 0), zodat de bestaande kolom niet verschuift. */
1534 .commitgraph-slot {
1535 display: none;
1536 position: sticky;
1537 top: calc(var(--top-h) + var(--sp-4));
1538 width: 0;
1539 flex: none;
1540 align-self: flex-start;
1541 z-index: 5;
1542 }
1543 .commitgraph {
1544 position: relative;
1545 left: calc(-1 * var(--graph-w) - var(--graph-gap) + 8px);
1546 width: var(--graph-w);
1547 max-height: calc(100vh - var(--top-h) - var(--sp-6));
1548 overflow: hidden;
1549 font-size: var(--fs-sm);
1550 color: var(--ink);
1551 }
1552 .commitgraph-list { list-style: none; margin: 0; padding: 0; position: relative; }
1553 .commitgraph-svg {
1554 position: absolute;
1555 top: 0;
1556 left: var(--graph-ref-w);
1557 pointer-events: none;
1558 z-index: 0;
1559 }
1560 .commitgraph-row {
1561 display: grid;
1562 grid-template-columns: var(--graph-ref-w) calc(var(--lanes, 1) * var(--graph-lane) + 16px) minmax(0, 1fr);
1563 align-items: center;
1564 height: var(--graph-row);
1565 position: relative;
1566 }
1567 .commitgraph-refs {
1568 display: flex; gap: 2px; justify-content: flex-end; align-items: center;
1569 min-width: 0; overflow: hidden; padding-right: 4px;
1570 }
1571 .commitgraph-ref {
1572 flex: 0 1 auto;
1573 min-width: 0;
1574 max-width: 100%;
1575 font-size: 10px; font-weight: 600; line-height: 15px;
1576 white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
1577 border: 1px solid currentColor; border-radius: 999px;
1578 padding: 0 5px; background: var(--card);
1579 }
1580 .commitgraph-ref.is-tag, .commitgraph-ref.tag { border-style: dashed; font-weight: 500; color: var(--muted); }
1581 .commitgraph-ref.is-default { background: var(--blue-soft); }
1582 .commitgraph-node.is-main, .commitgraph-ref.is-main { --c: var(--blue); color: var(--blue); }
1583 .commitgraph-node.c0, .commitgraph-ref.c0 { --c: var(--graph-0); color: var(--graph-0); }
1584 .commitgraph-node.c1, .commitgraph-ref.c1 { --c: var(--graph-1); color: var(--graph-1); }
1585 .commitgraph-node.c2, .commitgraph-ref.c2 { --c: var(--graph-2); color: var(--graph-2); }
1586 .commitgraph-node.c3, .commitgraph-ref.c3 { --c: var(--graph-3); color: var(--graph-3); }
1587 .commitgraph-node.c4, .commitgraph-ref.c4 { --c: var(--graph-4); color: var(--graph-4); }
1588 .commitgraph-node.c5, .commitgraph-ref.c5 { --c: var(--graph-5); color: var(--graph-5); }
1589 .commitgraph-node.c6, .commitgraph-ref.c6 { --c: var(--graph-6); color: var(--graph-6); }
1590 .commitgraph-node.c7, .commitgraph-ref.c7 { --c: var(--graph-7); color: var(--graph-7); }
1591 .commitgraph-node {
1592 position: absolute;
1593 left: calc(var(--graph-ref-w) + var(--lane, 0) * var(--graph-lane) + var(--graph-lane) / 2 - 8px);
1594 width: 16px; height: 16px; border-radius: 50%;
1595 z-index: 1;
1596 overflow: hidden;
1597 background: var(--c, var(--blue));
1598 color: #fff;
1599 font-size: 9px; font-weight: 700;
1600 display: grid; place-items: center;
1601 text-decoration: none;
1602 box-shadow: 0 0 0 2px var(--paper);
1603 }
1604 .commitgraph-node img { width: 16px; height: 16px; object-fit: cover; display: block; }
1605 .commitgraph-msg {
1606 min-width: 0;
1607 color: var(--ink);
1608 text-decoration: none;
1609 white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
1610 }
1611 .commitgraph-msg:hover { color: var(--blue-deep); text-decoration: underline; }
1612 /* Toon links als er naast de 1180px-kolom ruimte is voor de grafiek.
1613 Beide zijden van de gecentreerde kolom zijn even breed; rechts is
1614 dezelfde drempel, dus links wint altijd als er plek is. */
1615 /* De centrale kolom blijft gecentreerd, dus de vrije ruimte is
1616 aan twee kanten gelijk. De grafiek past links als
1617 (content - 1180) / 2 >= --graph-w + --graph-gap - 8px ≈ 240px,
1618 dus content >= 1660px. Met sidebar (240px) is dat 1900px breedte. */
1619 @container maincol (min-width: 1660px) {
1620 .commitgraph-slot { display: block; }
1621 }
1622 @media (min-width: 1900px) {
1623 .frame.with-side .commitgraph-slot { display: block; }
1624 }
1625 @media (min-width: 1660px) {
1626 .frame:not(.with-side) .commitgraph-slot { display: block; }
1627 }
1628 @media (max-width: 1659px) {
1629 .frame:not(.with-side) .commitgraph-slot { display: none; }
1630 }
1631 @media (max-width: 1899px) {
1632 .frame.with-side .commitgraph-slot { display: none; }
1633 }
@@ -27,6 +27,19 @@
27 --sidebar: 240px;
27 --sidebar: 240px;
28 --content: 1180px;
28 --content: 1180px;
29 --top-h: 48px;
29 --top-h: 48px;
30 --graph-w: 236px;
31 --graph-gap: 12px;
32 --graph-ref-w: 78px;
33 --graph-row: 22px;
34 --graph-lane: 12px;
35 --graph-0: #0e7490;
36 --graph-1: #6f42c1;
37 --graph-2: #1f6b3a;
38 --graph-3: #9d174d;
39 --graph-4: #b45309;
40 --graph-5: #0f766e;
41 --graph-6: #7c3aed;
42 --graph-7: #9a3412;
30 font-family: var(--font);
43 font-family: var(--font);
31}
44}
32* { box-sizing: border-box; }
45* { box-sizing: border-box; }
@@ -53,7 +66,7 @@ h2 { font-size: 16px; font-weight: 600; }
53.top button { background: transparent; border: 1px solid rgba(255,255,255,.35); color: white; }
66.top button { background: transparent; border: 1px solid rgba(255,255,255,.35); color: white; }
54.frame { display: flex; align-items: flex-start; min-height: calc(100vh - var(--top-h)); }
67.frame { display: flex; align-items: flex-start; min-height: calc(100vh - var(--top-h)); }
55.frame.with-side .content { flex: 1; min-width: 0; }
68.frame.with-side .content { flex: 1; min-width: 0; }
56.content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; }
69.content { flex: 1; min-width: 0; display: flex; justify-content: center; align-items: flex-start; container-type: inline-size; container-name: maincol; }
57main, main.wide {
70main, main.wide {
58 width: min(100%, var(--content));
71 width: min(100%, var(--content));
59 max-width: var(--content);
72 max-width: var(--content);
@@ -1515,3 +1528,106 @@ li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center;
1515.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }
1528.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }
1516.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }
1529.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }
1517form.cancelform { display: inline; }
1530form.cancelform { display: inline; }
1531
1532/* Commitgrafiek in de lege ruimte naast de centrale kolom. Buiten de
1533 flow (slotbreedte 0), zodat de bestaande kolom niet verschuift. */
1534.commitgraph-slot {
1535 display: none;
1536 position: sticky;
1537 top: calc(var(--top-h) + var(--sp-4));
1538 width: 0;
1539 flex: none;
1540 align-self: flex-start;
1541 z-index: 5;
1542}
1543.commitgraph {
1544 position: relative;
1545 left: calc(-1 * var(--graph-w) - var(--graph-gap) + 8px);
1546 width: var(--graph-w);
1547 max-height: calc(100vh - var(--top-h) - var(--sp-6));
1548 overflow: hidden;
1549 font-size: var(--fs-sm);
1550 color: var(--ink);
1551}
1552.commitgraph-list { list-style: none; margin: 0; padding: 0; position: relative; }
1553.commitgraph-svg {
1554 position: absolute;
1555 top: 0;
1556 left: var(--graph-ref-w);
1557 pointer-events: none;
1558 z-index: 0;
1559}
1560.commitgraph-row {
1561 display: grid;
1562 grid-template-columns: var(--graph-ref-w) calc(var(--lanes, 1) * var(--graph-lane) + 16px) minmax(0, 1fr);
1563 align-items: center;
1564 height: var(--graph-row);
1565 position: relative;
1566}
1567.commitgraph-refs {
1568 display: flex; gap: 2px; justify-content: flex-end; align-items: center;
1569 min-width: 0; overflow: hidden; padding-right: 4px;
1570}
1571.commitgraph-ref {
1572 flex: 0 1 auto;
1573 min-width: 0;
1574 max-width: 100%;
1575 font-size: 10px; font-weight: 600; line-height: 15px;
1576 white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
1577 border: 1px solid currentColor; border-radius: 999px;
1578 padding: 0 5px; background: var(--card);
1579}
1580.commitgraph-ref.is-tag, .commitgraph-ref.tag { border-style: dashed; font-weight: 500; color: var(--muted); }
1581.commitgraph-ref.is-default { background: var(--blue-soft); }
1582.commitgraph-node.is-main, .commitgraph-ref.is-main { --c: var(--blue); color: var(--blue); }
1583.commitgraph-node.c0, .commitgraph-ref.c0 { --c: var(--graph-0); color: var(--graph-0); }
1584.commitgraph-node.c1, .commitgraph-ref.c1 { --c: var(--graph-1); color: var(--graph-1); }
1585.commitgraph-node.c2, .commitgraph-ref.c2 { --c: var(--graph-2); color: var(--graph-2); }
1586.commitgraph-node.c3, .commitgraph-ref.c3 { --c: var(--graph-3); color: var(--graph-3); }
1587.commitgraph-node.c4, .commitgraph-ref.c4 { --c: var(--graph-4); color: var(--graph-4); }
1588.commitgraph-node.c5, .commitgraph-ref.c5 { --c: var(--graph-5); color: var(--graph-5); }
1589.commitgraph-node.c6, .commitgraph-ref.c6 { --c: var(--graph-6); color: var(--graph-6); }
1590.commitgraph-node.c7, .commitgraph-ref.c7 { --c: var(--graph-7); color: var(--graph-7); }
1591.commitgraph-node {
1592 position: absolute;
1593 left: calc(var(--graph-ref-w) + var(--lane, 0) * var(--graph-lane) + var(--graph-lane) / 2 - 8px);
1594 width: 16px; height: 16px; border-radius: 50%;
1595 z-index: 1;
1596 overflow: hidden;
1597 background: var(--c, var(--blue));
1598 color: #fff;
1599 font-size: 9px; font-weight: 700;
1600 display: grid; place-items: center;
1601 text-decoration: none;
1602 box-shadow: 0 0 0 2px var(--paper);
1603}
1604.commitgraph-node img { width: 16px; height: 16px; object-fit: cover; display: block; }
1605.commitgraph-msg {
1606 min-width: 0;
1607 color: var(--ink);
1608 text-decoration: none;
1609 white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
1610}
1611.commitgraph-msg:hover { color: var(--blue-deep); text-decoration: underline; }
1612/* Toon links als er naast de 1180px-kolom ruimte is voor de grafiek.
1613 Beide zijden van de gecentreerde kolom zijn even breed; rechts is
1614 dezelfde drempel, dus links wint altijd als er plek is. */
1615/* De centrale kolom blijft gecentreerd, dus de vrije ruimte is
1616 aan twee kanten gelijk. De grafiek past links als
1617 (content - 1180) / 2 >= --graph-w + --graph-gap - 8px ≈ 240px,
1618 dus content >= 1660px. Met sidebar (240px) is dat 1900px breedte. */
1619@container maincol (min-width: 1660px) {
1620 .commitgraph-slot { display: block; }
1621}
1622@media (min-width: 1900px) {
1623 .frame.with-side .commitgraph-slot { display: block; }
1624}
1625@media (min-width: 1660px) {
1626 .frame:not(.with-side) .commitgraph-slot { display: block; }
1627}
1628@media (max-width: 1659px) {
1629 .frame:not(.with-side) .commitgraph-slot { display: none; }
1630}
1631@media (max-width: 1899px) {
1632 .frame.with-side .commitgraph-slot { display: none; }
1633}
internal/server/templates/commitgraph.html added +17 −0
@@ -0,0 +1,17 @@
1 {{define "commitgraph"}}
2 <div class="commitgraph-slot">
3 <aside class="commitgraph" aria-label="{{t "graph.label"}}" style="--lanes: {{.Graph.Lanes}}">
4 {{.Graph.SVG}}
5 <ol class="commitgraph-list">
6 {{range .Graph.Rows}}
7 <li class="commitgraph-row" style="--lane: {{.Lane}}">
8 <span class="commitgraph-refs">{{range .Labels}}<span class="commitgraph-ref {{.Kind}}{{if .Default}} is-default{{end}} {{.Class}}" title="{{.Name}}">{{.Name}}</span>{{end}}</span>
9 <span class="commitgraph-lanes" aria-hidden="true"></span>
10 <a class="commitgraph-msg" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Subject}}">{{.Subject}}</a>
11 <a class="commitgraph-node {{.Class}}" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Short}}">{{if .Avatar}}<img src="{{.Avatar}}" alt="">{{else}}<span>{{.Initial}}</span>{{end}}</a>
12 </li>
13 {{end}}
14 </ol>
15 </aside>
16 </div>
17 {{end}}
@@ -0,0 +1,17 @@
1{{define "commitgraph"}}
2<div class="commitgraph-slot">
3<aside class="commitgraph" aria-label="{{t "graph.label"}}" style="--lanes: {{.Graph.Lanes}}">
4 {{.Graph.SVG}}
5 <ol class="commitgraph-list">
6 {{range .Graph.Rows}}
7 <li class="commitgraph-row" style="--lane: {{.Lane}}">
8 <span class="commitgraph-refs">{{range .Labels}}<span class="commitgraph-ref {{.Kind}}{{if .Default}} is-default{{end}} {{.Class}}" title="{{.Name}}">{{.Name}}</span>{{end}}</span>
9 <span class="commitgraph-lanes" aria-hidden="true"></span>
10 <a class="commitgraph-msg" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Subject}}">{{.Subject}}</a>
11 <a class="commitgraph-node {{.Class}}" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}" title="{{.Short}}">{{if .Avatar}}<img src="{{.Avatar}}" alt="">{{else}}<span>{{.Initial}}</span>{{end}}</a>
12 </li>
13 {{end}}
14 </ol>
15</aside>
16</div>
17{{end}}
internal/server/templates/layout.html +1 −0
@@ -50,6 +50,7 @@
50 50 <div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">
51 51 {{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
52 52 <div class="content">
53 {{if and (eq .Page "overview") .Graph}}{{template "commitgraph" .}}{{end}}
53 54 <main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
54 55 {{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
55 56 {{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
@@ -50,6 +50,7 @@
50<div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">
50<div class="frame{{if or .Repo .Group .Info .Help .User}} with-side{{end}}">
51{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
51{{if .Repo}}{{template "reposide" .}}{{else if .Group}}{{template "groupside" .}}{{else if .Info}}{{template "infoside" .}}{{else if .Help}}{{template "helpside" .}}{{else if .User}}{{template "dashside" .}}{{end}}
52<div class="content">
52<div class="content">
53{{if and (eq .Page "overview") .Graph}}{{template "commitgraph" .}}{{end}}
53<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
54<main{{if eq .Page "files"}} class="fill"{{else if .Wide}} class="wide"{{end}}>
54{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
55{{if .Notice}}<p class="flash">{{.Notice}}</p>{{end}}
55{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}
56{{if .Err}}<p class="flash bad">{{.Err}}</p>{{end}}