1diff --git a/pkg/ext/router.go b/pkg/ext/router.go
2index e12a40c781d81e4d59fe9dfe2d9b985888e91f8a..ce4c126ea26f2c5b65529daf028e8931f250e863 100644
3--- a/pkg/ext/router.go
4+++ b/pkg/ext/router.go
5@@ -8,6 +8,7 @@ "net/http"
6
7 "git.gabrielgio.me/cerrado/pkg/service"
8 "git.gabrielgio.me/cerrado/templates"
9+ "github.com/go-git/go-git/v5/plumbing"
10 )
11
12 type (
13@@ -36,7 +37,8 @@
14 func wrapError(next ErrorRequestHandler) http.HandlerFunc {
15 return func(w http.ResponseWriter, r *http.Request) {
16 if err := next(w, r); err != nil {
17- if errors.Is(err, service.ErrRepositoryNotFound) {
18+ if errors.Is(err, service.ErrRepositoryNotFound) ||
19+ errors.Is(err, plumbing.ErrReferenceNotFound) {
20 NotFound(w, r)
21 } else {
22 slog.Error("Internal Server Error", "error", err)
23diff --git a/pkg/git/git.go b/pkg/git/git.go
24index d72e56101dab92141b4dd22c55202eabc330c660..64c721a49be34538ddf32be507231e2eec6b38a5 100644
25--- a/pkg/git/git.go
26+++ b/pkg/git/git.go
27@@ -19,6 +19,7 @@
28 var (
29 MissingRefErr = errors.New("Reference not found")
30 TreeForFileErr = errors.New("Trying to get tree of a file")
31+ eofIter = errors.New("End of a iterator")
32 )
33
34 type (
35@@ -196,6 +197,54 @@ }
36
37 func (g *GitRepository) Head() (*plumbing.Reference, error) {
38 return g.repository.Head()
39+}
40+
41+func (g *GitRepository) Tag() (*object.Commit, *TagReference, error) {
42+ err := g.validateRef()
43+ if err != nil {
44+ return nil, nil, err
45+ }
46+
47+ c, err := g.repository.CommitObject(g.ref)
48+ if err != nil {
49+ return nil, nil, err
50+ }
51+
52+ var tagReference *TagReference
53+
54+ iter, err := g.repository.Tags()
55+ if err != nil {
56+ return nil, nil, err
57+ }
58+
59+ if err := iter.ForEach(func(ref *plumbing.Reference) error {
60+ obj, err := g.repository.TagObject(ref.Hash())
61+ switch err {
62+ case nil:
63+ if obj.Target == c.Hash {
64+ tagReference = &TagReference{
65+ ref: ref,
66+ tag: obj,
67+ }
68+ return eofIter
69+ }
70+ return nil
71+ case plumbing.ErrObjectNotFound:
72+ if c.Hash == ref.Hash() {
73+ tagReference = &TagReference{
74+ ref: ref,
75+ }
76+ return eofIter
77+ }
78+ return nil
79+ default:
80+ return err
81+ }
82+ }); err != nil && !errors.Is(eofIter, err) {
83+ return nil, nil, err
84+ }
85+
86+ return c, tagReference, nil
87 }
88
89 func (g *GitRepository) Tags() ([]*TagReference, error) {
90diff --git a/pkg/handler/git/handler.go b/pkg/handler/git/handler.go
91index 034d5c26ae2de0d48a5d46c47bde77da4735c2fa..a9be54cb3938c347e46d52a37a73f0732cfe9a12 100644
92--- a/pkg/handler/git/handler.go
93+++ b/pkg/handler/git/handler.go
94@@ -350,6 +350,28 @@ templates.WritePageTemplate(w, gitList, r.Context())
95 return nil
96 }
97
98+func (g *GitHandler) Ref(w http.ResponseWriter, r *http.Request) error {
99+ ext.SetHTML(w)
100+ name := r.PathValue("name")
101+ ref := r.PathValue("ref")
102+
103+ commit, tag, err := g.gitService.GetTag(ref, name)
104+ if err != nil {
105+ return err
106+ }
107+
108+ gitList := &templates.GitItemPage{
109+ Name: name,
110+ Ref: ref,
111+ GitItemBase: &templates.GitItemRefPage{
112+ Commit: commit,
113+ Reference: tag,
114+ },
115+ }
116+ templates.WritePageTemplate(w, gitList, r.Context())
117+ return nil
118+}
119+
120 func (g *GitHandler) Commit(w http.ResponseWriter, r *http.Request) error {
121 ext.SetHTML(w)
122 name := r.PathValue("name")
123diff --git a/pkg/handler/router.go b/pkg/handler/router.go
124index 8d27b743bf46ad25bd31a4a984ceffdd2626bc0c..e461922aa785bf61778e46a13b5f32479b312a26 100644
125--- a/pkg/handler/router.go
126+++ b/pkg/handler/router.go
127@@ -52,6 +52,7 @@ mux.HandleFunc("/{name}/tree/{ref}/{rest...}", gitHandler.Tree)
128 mux.HandleFunc("/{name}/blob/{ref}/{rest...}", gitHandler.Blob)
129 mux.HandleFunc("/{name}/log/{ref}/", gitHandler.Log)
130 mux.HandleFunc("/{name}/commit/{ref}/", gitHandler.Commit)
131+ mux.HandleFunc("/{name}/ref/{ref}/", gitHandler.Ref)
132 mux.HandleFunc("/{name}/archive/{file}", gitHandler.Archive)
133 mux.HandleFunc("/about", aboutHandler.About)
134 mux.HandleFunc("/", gitHandler.List)
135diff --git a/pkg/service/git.go b/pkg/service/git.go
136index 8642b5b12a356548b60ec831e1463d93b5dc75b2..5410d7a7c3b20f084208b754d767b3e10b9e97f0 100644
137--- a/pkg/service/git.go
138+++ b/pkg/service/git.go
139@@ -241,6 +241,25 @@
140 return file, nil
141 }
142
143+func (g *GitService) GetTag(ref, name string) (*object.Commit, *git.TagReference, error) {
144+ r := g.configRepo.GetByName(name)
145+ if r == nil {
146+ return nil, nil, ErrRepositoryNotFound
147+ }
148+
149+ repo, err := git.OpenRepository(r.Path)
150+ if err != nil {
151+ return nil, nil, err
152+ }
153+
154+ err = repo.SetRef(ref)
155+ if err != nil {
156+ return nil, nil, err
157+ }
158+
159+ return repo.Tag()
160+}
161+
162 func (g *GitService) ListTags(name string) ([]*git.TagReference, error) {
163 r := g.configRepo.GetByName(name)
164 if r == nil {
165diff --git a/templates/commit.qtpl b/templates/commit.qtpl
166index b58b2386c8c0edd9957826b5f187d689d603dc71..4fe92e9a582d60f9fbdf8ca37beb049605ba2cea 100644
167--- a/templates/commit.qtpl
168+++ b/templates/commit.qtpl
169@@ -13,7 +13,7 @@ {% for _, r := range c.References() %}
170 {% if r.Name().IsBranch() %}
171 <a class="ref branch" title="{%s c.Commit().Hash.String() %}" href="/{%s name %}/tree/{%s r.Name().Short() %}/">{%s r.Name().Short() %}</a>
172 {% else %}
173- <a class="ref tag" title="{%s c.Commit().Hash.String() %}" href="/{%s name %}/commit/{%s c.Commit().Hash.String() %}/">{%s r.Name().Short() %}</a>
174+ <a class="ref tag" title="{%s c.Commit().Hash.String() %}" href="/{%s name %}/ref/{%s r.Name().Short() %}/">{%s r.Name().Short() %}</a>
175 {% endif %}
176 {% endfor %}
177 {%endif%}
178diff --git a/templates/commit.qtpl.go b/templates/commit.qtpl.go
179index 5017880b3d69771bff2f8e7f1d05e98dd18ae398..0aefbb878c1277cea4adb16aa01454df7dcce903 100644
180--- a/templates/commit.qtpl.go
181+++ b/templates/commit.qtpl.go
182@@ -106,9 +106,9 @@ qw422016.N().S(`" href="/`)
183 //line templates/commit.qtpl:16
184 qw422016.E().S(name)
185 //line templates/commit.qtpl:16
186- qw422016.N().S(`/commit/`)
187+ qw422016.N().S(`/ref/`)
188 //line templates/commit.qtpl:16
189- qw422016.E().S(c.Commit().Hash.String())
190+ qw422016.E().S(r.Name().Short())
191 //line templates/commit.qtpl:16
192 qw422016.N().S(`/">`)
193 //line templates/commit.qtpl:16
194diff --git a/templates/gititemref.qtpl b/templates/gititemref.qtpl
195new file mode 100644
196index 0000000000000000000000000000000000000000..9e1c776f675c868dd5464a0a4ae4d8c6761ba1f5
197--- /dev/null
198+++ b/templates/gititemref.qtpl
199@@ -0,0 +1,34 @@
200+{% import "git.gabrielgio.me/cerrado/pkg/git" %}
201+{% import "git.gabrielgio.me/cerrado/pkg/humanize" %}
202+{% import "github.com/go-git/go-git/v5/plumbing/object" %}
203+
204+{% code
205+type GitItemRefPage struct {
206+ Reference *git.TagReference
207+ Commit *object.Commit
208+}
209+%}
210+
211+{% func (g *GitItemRefPage) Nav(name, ref string) %}{%= GitItemNav(name, ref, Refs) %}{% endfunc %}
212+
213+{% func (g *GitItemRefPage) GitContent(name, ref string) %}
214+<div class="event-list">
215+ <div class="row event">
216+ <div class="row">
217+ <div class="col-md">
218+ <a title="{%s g.Commit.Hash.String() %}" href="/{%s name %}/commit/{%s g.Commit.Hash.String() %}/">{%s g.Commit.Hash.String()[0:8] %}</a> —
219+ <a title="{%s g.Commit.Committer.Email %}" href="mailto:{%s g.Commit.Author.Email %}">{%s g.Commit.Author.Name %}</a>
220+ </div>
221+ <div class="col-md text-md-center">
222+ <a title="tar.gz for {%s g.Reference.ShortName() %}" href="/{%s name %}/archive/{%s g.Reference.ShortName() %}.tar.gz">tar.gz</a>
223+ </div>
224+ <div class="col-md text-md-end">
225+ <a title="{%s g.Commit.Author.When.UTC().Format("2006-01-02 15:04:05")%} UTC">{%s humanize.Time(g.Commit.Author.When) %}</a>
226+ </div>
227+ </div>
228+ <div class="code-view">
229+ <pre>{%s g.Reference.Message() %}</pre>
230+ </div>
231+ </div>
232+</div>
233+{% endfunc %}
234diff --git a/templates/gititemref.qtpl.go b/templates/gititemref.qtpl.go
235new file mode 100644
236index 0000000000000000000000000000000000000000..53ca1ec4b386191b15c19d68bdfd030eb7dad9e4
237--- /dev/null
238+++ b/templates/gititemref.qtpl.go
239@@ -0,0 +1,171 @@
240+// Code generated by qtc from "gititemref.qtpl". DO NOT EDIT.
241+// See https://github.com/valyala/quicktemplate for details.
242+
243+//line templates/gititemref.qtpl:1
244+package templates
245+
246+//line templates/gititemref.qtpl:1
247+import "git.gabrielgio.me/cerrado/pkg/git"
248+
249+//line templates/gititemref.qtpl:2
250+import "git.gabrielgio.me/cerrado/pkg/humanize"
251+
252+//line templates/gititemref.qtpl:3
253+import "github.com/go-git/go-git/v5/plumbing/object"
254+
255+//line templates/gititemref.qtpl:5
256+import (
257+ qtio422016 "io"
258+
259+ qt422016 "github.com/valyala/quicktemplate"
260+)
261+
262+//line templates/gititemref.qtpl:5
263+var (
264+ _ = qtio422016.Copy
265+ _ = qt422016.AcquireByteBuffer
266+)
267+
268+//line templates/gititemref.qtpl:6
269+type GitItemRefPage struct {
270+ Reference *git.TagReference
271+ Commit *object.Commit
272+}
273+
274+//line templates/gititemref.qtpl:12
275+func (g *GitItemRefPage) StreamNav(qw422016 *qt422016.Writer, name, ref string) {
276+//line templates/gititemref.qtpl:12
277+ StreamGitItemNav(qw422016, name, ref, Refs)
278+//line templates/gititemref.qtpl:12
279+}
280+
281+//line templates/gititemref.qtpl:12
282+func (g *GitItemRefPage) WriteNav(qq422016 qtio422016.Writer, name, ref string) {
283+//line templates/gititemref.qtpl:12
284+ qw422016 := qt422016.AcquireWriter(qq422016)
285+//line templates/gititemref.qtpl:12
286+ g.StreamNav(qw422016, name, ref)
287+//line templates/gititemref.qtpl:12
288+ qt422016.ReleaseWriter(qw422016)
289+//line templates/gititemref.qtpl:12
290+}
291+
292+//line templates/gititemref.qtpl:12
293+func (g *GitItemRefPage) Nav(name, ref string) string {
294+//line templates/gititemref.qtpl:12
295+ qb422016 := qt422016.AcquireByteBuffer()
296+//line templates/gititemref.qtpl:12
297+ g.WriteNav(qb422016, name, ref)
298+//line templates/gititemref.qtpl:12
299+ qs422016 := string(qb422016.B)
300+//line templates/gititemref.qtpl:12
301+ qt422016.ReleaseByteBuffer(qb422016)
302+//line templates/gititemref.qtpl:12
303+ return qs422016
304+//line templates/gititemref.qtpl:12
305+}
306+
307+//line templates/gititemref.qtpl:14
308+func (g *GitItemRefPage) StreamGitContent(qw422016 *qt422016.Writer, name, ref string) {
309+//line templates/gititemref.qtpl:14
310+ qw422016.N().S(`
311+<div class="event-list">
312+ <div class="row event">
313+ <div class="row">
314+ <div class="col-md">
315+ <a title="`)
316+//line templates/gititemref.qtpl:19
317+ qw422016.E().S(g.Commit.Hash.String())
318+//line templates/gititemref.qtpl:19
319+ qw422016.N().S(`" href="/`)
320+//line templates/gititemref.qtpl:19
321+ qw422016.E().S(name)
322+//line templates/gititemref.qtpl:19
323+ qw422016.N().S(`/commit/`)
324+//line templates/gititemref.qtpl:19
325+ qw422016.E().S(g.Commit.Hash.String())
326+//line templates/gititemref.qtpl:19
327+ qw422016.N().S(`/">`)
328+//line templates/gititemref.qtpl:19
329+ qw422016.E().S(g.Commit.Hash.String()[0:8])
330+//line templates/gititemref.qtpl:19
331+ qw422016.N().S(`</a> —
332+ <a title="`)
333+//line templates/gititemref.qtpl:20
334+ qw422016.E().S(g.Commit.Committer.Email)
335+//line templates/gititemref.qtpl:20
336+ qw422016.N().S(`" href="mailto:`)
337+//line templates/gititemref.qtpl:20
338+ qw422016.E().S(g.Commit.Author.Email)
339+//line templates/gititemref.qtpl:20
340+ qw422016.N().S(`">`)
341+//line templates/gititemref.qtpl:20
342+ qw422016.E().S(g.Commit.Author.Name)
343+//line templates/gititemref.qtpl:20
344+ qw422016.N().S(`</a>
345+ </div>
346+ <div class="col-md text-md-center">
347+ <a title="tar.gz for `)
348+//line templates/gititemref.qtpl:23
349+ qw422016.E().S(g.Reference.ShortName())
350+//line templates/gititemref.qtpl:23
351+ qw422016.N().S(`" href="/`)
352+//line templates/gititemref.qtpl:23
353+ qw422016.E().S(name)
354+//line templates/gititemref.qtpl:23
355+ qw422016.N().S(`/archive/`)
356+//line templates/gititemref.qtpl:23
357+ qw422016.E().S(g.Reference.ShortName())
358+//line templates/gititemref.qtpl:23
359+ qw422016.N().S(`.tar.gz">tar.gz</a>
360+ </div>
361+ <div class="col-md text-md-end">
362+ <a title="`)
363+//line templates/gititemref.qtpl:26
364+ qw422016.E().S(g.Commit.Author.When.UTC().Format("2006-01-02 15:04:05"))
365+//line templates/gititemref.qtpl:26
366+ qw422016.N().S(` UTC">`)
367+//line templates/gititemref.qtpl:26
368+ qw422016.E().S(humanize.Time(g.Commit.Author.When))
369+//line templates/gititemref.qtpl:26
370+ qw422016.N().S(`</a>
371+ </div>
372+ </div>
373+ <div class="code-view">
374+ <pre>`)
375+//line templates/gititemref.qtpl:30
376+ qw422016.E().S(g.Reference.Message())
377+//line templates/gititemref.qtpl:30
378+ qw422016.N().S(`</pre>
379+ </div>
380+ </div>
381+</div>
382+`)
383+//line templates/gititemref.qtpl:34
384+}
385+
386+//line templates/gititemref.qtpl:34
387+func (g *GitItemRefPage) WriteGitContent(qq422016 qtio422016.Writer, name, ref string) {
388+//line templates/gititemref.qtpl:34
389+ qw422016 := qt422016.AcquireWriter(qq422016)
390+//line templates/gititemref.qtpl:34
391+ g.StreamGitContent(qw422016, name, ref)
392+//line templates/gititemref.qtpl:34
393+ qt422016.ReleaseWriter(qw422016)
394+//line templates/gititemref.qtpl:34
395+}
396+
397+//line templates/gititemref.qtpl:34
398+func (g *GitItemRefPage) GitContent(name, ref string) string {
399+//line templates/gititemref.qtpl:34
400+ qb422016 := qt422016.AcquireByteBuffer()
401+//line templates/gititemref.qtpl:34
402+ g.WriteGitContent(qb422016, name, ref)
403+//line templates/gititemref.qtpl:34
404+ qs422016 := string(qb422016.B)
405+//line templates/gititemref.qtpl:34
406+ qt422016.ReleaseByteBuffer(qb422016)
407+//line templates/gititemref.qtpl:34
408+ return qs422016
409+//line templates/gititemref.qtpl:34
410+}
411diff --git a/templates/tags.qtpl b/templates/tags.qtpl
412index 5cd617fc26b94a2513c0b1fc86d89c9d6e8b8132..5b7c39bafb8beb6ed6fb98dd51127c695ad63b5c 100644
413--- a/templates/tags.qtpl
414+++ b/templates/tags.qtpl
415@@ -7,7 +7,7 @@ {% for _, t := range tags %}
416 <div class="event me-md-2">
417 <div class="row ">
418 <div class="col-4">
419- <a title="{%s t.HashString() %}" href="/{%s name %}/commit/{%s t.HashString() %}">{%s t.ShortName() %}</a>
420+ <a title="{%s t.HashString() %}" href="/{%s name %}/ref/{%s t.ShortName() %}">{%s t.ShortName() %}</a>
421 </div>
422 <div class="col-8">
423 <div class="float-end">
424diff --git a/templates/tags.qtpl.go b/templates/tags.qtpl.go
425index a89ddd3d9cc785f08d07597c5bc495b0a2aa73d0..5aedd7893e894a955a2f2d6bf8abaaf4d00e7dce 100644
426--- a/templates/tags.qtpl.go
427+++ b/templates/tags.qtpl.go
428@@ -46,9 +46,9 @@ qw422016.N().S(`" href="/`)
429 //line templates/tags.qtpl:10
430 qw422016.E().S(name)
431 //line templates/tags.qtpl:10
432- qw422016.N().S(`/commit/`)
433+ qw422016.N().S(`/ref/`)
434 //line templates/tags.qtpl:10
435- qw422016.E().S(t.HashString())
436+ qw422016.E().S(t.ShortName())
437 //line templates/tags.qtpl:10
438 qw422016.N().S(`">`)
439 //line templates/tags.qtpl:10