From 27400b0fce5d4ef3b7fd5ef4d25bac8f00754e33 Mon Sep 17 00:00:00 2001
From: "Gabriel A. Giovanini" <mail@gabrielgio.me>
Date: Sat, 15 Feb 2025 17:33:24 +0100
Subject: feat: Add wrapper for commit

Add a wrapper to the commit log that also contains possible reference.
This will be useful once to later display the reference in the commit
log.
---
 templates/gititemlog.qtpl        |   5 +-
 templates/gititemlog.qtpl.go     | 105 ++++++++++++++++----------------
 templates/gititemsummary.qtpl    |   5 +-
 templates/gititemsummary.qtpl.go | 125 +++++++++++++++++++--------------------
 templates/gitlist.qtpl           |   6 +-
 templates/gitlist.qtpl.go        |  12 ++--
 6 files changed, 129 insertions(+), 129 deletions(-)

(limited to 'templates')

diff --git a/templates/gititemlog.qtpl b/templates/gititemlog.qtpl
index b0c8cec..93efb24 100644
--- a/templates/gititemlog.qtpl
+++ b/templates/gititemlog.qtpl
@@ -1,8 +1,9 @@
+{% import "git.gabrielgio.me/cerrado/pkg/git" %}
 {% import "github.com/go-git/go-git/v5/plumbing/object" %}
 
 {% code
 type GitItemLogPage struct {
-    Commits []*object.Commit
+    Commits []*git.CommitReference
     Next *object.Commit
 }
 %}
@@ -12,7 +13,7 @@ type GitItemLogPage struct {
 {% func (g *GitItemLogPage) GitContent(name, ref string) %}
 <div class="event-list">
   {% for _, c := range g.Commits %}
-  {%= Commit(name, c, false) %}
+  {%= Commit(name, c.Commit(), false) %}
   {% endfor %}
   {% if g.Next != nil %}
   <a href="/{%s name %}/log/{%s ref %}/?from={%s g.Next.Hash.String() %}"  class="btn btn-primary">Next</a>
diff --git a/templates/gititemlog.qtpl.go b/templates/gititemlog.qtpl.go
index 719b71f..05950ed 100644
--- a/templates/gititemlog.qtpl.go
+++ b/templates/gititemlog.qtpl.go
@@ -5,131 +5,134 @@
 package templates
 
 //line templates/gititemlog.qtpl:1
+import "git.gabrielgio.me/cerrado/pkg/git"
+
+//line templates/gititemlog.qtpl:2
 import "github.com/go-git/go-git/v5/plumbing/object"
 
-//line templates/gititemlog.qtpl:3
+//line templates/gititemlog.qtpl:4
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line templates/gititemlog.qtpl:3
+//line templates/gititemlog.qtpl:4
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line templates/gititemlog.qtpl:4
+//line templates/gititemlog.qtpl:5
 type GitItemLogPage struct {
-	Commits []*object.Commit
+	Commits []*git.CommitReference
 	Next    *object.Commit
 }
 
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 func (g *GitItemLogPage) StreamNav(qw422016 *qt422016.Writer, name, ref string) {
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	StreamGitItemNav(qw422016, name, ref, Log)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 }
 
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 func (g *GitItemLogPage) WriteNav(qq422016 qtio422016.Writer, name, ref string) {
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	g.StreamNav(qw422016, name, ref)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	qt422016.ReleaseWriter(qw422016)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 }
 
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 func (g *GitItemLogPage) Nav(name, ref string) string {
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	g.WriteNav(qb422016, name, ref)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	qs422016 := string(qb422016.B)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 	return qs422016
-//line templates/gititemlog.qtpl:10
+//line templates/gititemlog.qtpl:11
 }
 
-//line templates/gititemlog.qtpl:12
+//line templates/gititemlog.qtpl:13
 func (g *GitItemLogPage) StreamGitContent(qw422016 *qt422016.Writer, name, ref string) {
-//line templates/gititemlog.qtpl:12
+//line templates/gititemlog.qtpl:13
 	qw422016.N().S(`
 <div class="event-list">
   `)
-//line templates/gititemlog.qtpl:14
-	for _, c := range g.Commits {
-//line templates/gititemlog.qtpl:14
-		qw422016.N().S(`
-  `)
 //line templates/gititemlog.qtpl:15
-		StreamCommit(qw422016, name, c, false)
+	for _, c := range g.Commits {
 //line templates/gititemlog.qtpl:15
 		qw422016.N().S(`
   `)
 //line templates/gititemlog.qtpl:16
-	}
+		StreamCommit(qw422016, name, c.Commit(), false)
 //line templates/gititemlog.qtpl:16
-	qw422016.N().S(`
+		qw422016.N().S(`
   `)
 //line templates/gititemlog.qtpl:17
-	if g.Next != nil {
+	}
 //line templates/gititemlog.qtpl:17
+	qw422016.N().S(`
+  `)
+//line templates/gititemlog.qtpl:18
+	if g.Next != nil {
+//line templates/gititemlog.qtpl:18
 		qw422016.N().S(`
   <a href="/`)
-//line templates/gititemlog.qtpl:18
+//line templates/gititemlog.qtpl:19
 		qw422016.E().S(name)
-//line templates/gititemlog.qtpl:18
+//line templates/gititemlog.qtpl:19
 		qw422016.N().S(`/log/`)
-//line templates/gititemlog.qtpl:18
+//line templates/gititemlog.qtpl:19
 		qw422016.E().S(ref)
-//line templates/gititemlog.qtpl:18
+//line templates/gititemlog.qtpl:19
 		qw422016.N().S(`/?from=`)
-//line templates/gititemlog.qtpl:18
+//line templates/gititemlog.qtpl:19
 		qw422016.E().S(g.Next.Hash.String())
-//line templates/gititemlog.qtpl:18
+//line templates/gititemlog.qtpl:19
 		qw422016.N().S(`"  class="btn btn-primary">Next</a>
   `)
-//line templates/gititemlog.qtpl:19
+//line templates/gititemlog.qtpl:20
 	}
-//line templates/gititemlog.qtpl:19
+//line templates/gititemlog.qtpl:20
 	qw422016.N().S(`
 
 </div>
 `)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 }
 
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 func (g *GitItemLogPage) WriteGitContent(qq422016 qtio422016.Writer, name, ref string) {
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	g.StreamGitContent(qw422016, name, ref)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	qt422016.ReleaseWriter(qw422016)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 }
 
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 func (g *GitItemLogPage) GitContent(name, ref string) string {
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	g.WriteGitContent(qb422016, name, ref)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	qs422016 := string(qb422016.B)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 	return qs422016
-//line templates/gititemlog.qtpl:22
+//line templates/gititemlog.qtpl:23
 }
diff --git a/templates/gititemsummary.qtpl b/templates/gititemsummary.qtpl
index f2de5be..5d07680 100644
--- a/templates/gititemsummary.qtpl
+++ b/templates/gititemsummary.qtpl
@@ -1,12 +1,11 @@
 {% import "github.com/go-git/go-git/v5/plumbing" %}
-{% import "github.com/go-git/go-git/v5/plumbing/object" %}
 {% import "git.gabrielgio.me/cerrado/pkg/git" %}
 
 {% code
 type GitItemSummaryPage struct {
     Tags []*git.TagReference
     Branches []*plumbing.Reference
-    Commits []*object.Commit
+    Commits []*git.CommitReference
 }
 %}
 
@@ -39,7 +38,7 @@ type GitItemSummaryPage struct {
 <div class="row">
   <div class="event-list">
     {% for _, c := range g.Commits %}
-    {%= Commit(name, c, false) %}
+    {%= Commit(name, c.Commit(), false) %}
     {% endfor %}
   </div>
 </div>
diff --git a/templates/gititemsummary.qtpl.go b/templates/gititemsummary.qtpl.go
index 41d5b67..e17ec7c 100644
--- a/templates/gititemsummary.qtpl.go
+++ b/templates/gititemsummary.qtpl.go
@@ -8,127 +8,124 @@ package templates
 import "github.com/go-git/go-git/v5/plumbing"
 
 //line templates/gititemsummary.qtpl:2
-import "github.com/go-git/go-git/v5/plumbing/object"
-
-//line templates/gititemsummary.qtpl:3
 import "git.gabrielgio.me/cerrado/pkg/git"
 
-//line templates/gititemsummary.qtpl:5
+//line templates/gititemsummary.qtpl:4
 import (
 	qtio422016 "io"
 
 	qt422016 "github.com/valyala/quicktemplate"
 )
 
-//line templates/gititemsummary.qtpl:5
+//line templates/gititemsummary.qtpl:4
 var (
 	_ = qtio422016.Copy
 	_ = qt422016.AcquireByteBuffer
 )
 
-//line templates/gititemsummary.qtpl:6
+//line templates/gititemsummary.qtpl:5
 type GitItemSummaryPage struct {
 	Tags     []*git.TagReference
 	Branches []*plumbing.Reference
-	Commits  []*object.Commit
+	Commits  []*git.CommitReference
 }
 
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 func (g *GitItemSummaryPage) StreamNav(qw422016 *qt422016.Writer, name, ref string) {
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	StreamGitItemNav(qw422016, name, ref, Summary)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 }
 
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 func (g *GitItemSummaryPage) WriteNav(qq422016 qtio422016.Writer, name, ref string) {
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	g.StreamNav(qw422016, name, ref)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	qt422016.ReleaseWriter(qw422016)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 }
 
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 func (g *GitItemSummaryPage) Nav(name, ref string) string {
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	g.WriteNav(qb422016, name, ref)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	qs422016 := string(qb422016.B)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 	return qs422016
-//line templates/gititemsummary.qtpl:13
+//line templates/gititemsummary.qtpl:12
 }
 
-//line templates/gititemsummary.qtpl:15
+//line templates/gititemsummary.qtpl:14
 func (g *GitItemSummaryPage) StreamGitContent(qw422016 *qt422016.Writer, name, ref string) {
-//line templates/gititemsummary.qtpl:15
+//line templates/gititemsummary.qtpl:14
 	qw422016.N().S(`
 <div class="row">
   <div class="col-md-8">
     `)
-//line templates/gititemsummary.qtpl:18
+//line templates/gititemsummary.qtpl:17
 	StreamListTags(qw422016, name, g.Tags)
-//line templates/gititemsummary.qtpl:18
+//line templates/gititemsummary.qtpl:17
 	qw422016.N().S(`
   </div>
   <div class="col-md-4">
     <div class="event-list">
       `)
-//line templates/gititemsummary.qtpl:22
+//line templates/gititemsummary.qtpl:21
 	for _, b := range g.Branches {
-//line templates/gititemsummary.qtpl:22
+//line templates/gititemsummary.qtpl:21
 		qw422016.N().S(`
       <div class="row event">
           <div class="col-4">
            `)
-//line templates/gititemsummary.qtpl:25
+//line templates/gititemsummary.qtpl:24
 		qw422016.E().S(b.Name().Short())
-//line templates/gititemsummary.qtpl:25
+//line templates/gititemsummary.qtpl:24
 		qw422016.N().S(`
           </div>
           <div class="col-8">
             <div class="float-end">
               <a href="/`)
-//line templates/gititemsummary.qtpl:29
+//line templates/gititemsummary.qtpl:28
 		qw422016.E().S(name)
-//line templates/gititemsummary.qtpl:29
+//line templates/gititemsummary.qtpl:28
 		qw422016.N().S(`/archive/`)
-//line templates/gititemsummary.qtpl:29
+//line templates/gititemsummary.qtpl:28
 		qw422016.E().S(b.Name().Short())
-//line templates/gititemsummary.qtpl:29
+//line templates/gititemsummary.qtpl:28
 		qw422016.N().S(`.tar.gz">tar.gz</a>
               <a href="/`)
-//line templates/gititemsummary.qtpl:30
+//line templates/gititemsummary.qtpl:29
 		qw422016.E().S(name)
-//line templates/gititemsummary.qtpl:30
+//line templates/gititemsummary.qtpl:29
 		qw422016.N().S(`/tree/`)
-//line templates/gititemsummary.qtpl:30
+//line templates/gititemsummary.qtpl:29
 		qw422016.E().S(b.Name().Short())
-//line templates/gititemsummary.qtpl:30
+//line templates/gititemsummary.qtpl:29
 		qw422016.N().S(`/">tree</a>
               <a href="/`)
-//line templates/gititemsummary.qtpl:31
+//line templates/gititemsummary.qtpl:30
 		qw422016.E().S(name)
-//line templates/gititemsummary.qtpl:31
+//line templates/gititemsummary.qtpl:30
 		qw422016.N().S(`/log/`)
-//line templates/gititemsummary.qtpl:31
+//line templates/gititemsummary.qtpl:30
 		qw422016.E().S(b.Name().Short())
-//line templates/gititemsummary.qtpl:31
+//line templates/gititemsummary.qtpl:30
 		qw422016.N().S(`/">log</a>
             </div>
           </div>
       </div>
       `)
-//line templates/gititemsummary.qtpl:35
+//line templates/gititemsummary.qtpl:34
 	}
-//line templates/gititemsummary.qtpl:35
+//line templates/gititemsummary.qtpl:34
 	qw422016.N().S(`
     </div>
   </div>
@@ -136,48 +133,48 @@ func (g *GitItemSummaryPage) StreamGitContent(qw422016 *qt422016.Writer, name, r
 <div class="row">
   <div class="event-list">
     `)
-//line templates/gititemsummary.qtpl:41
+//line templates/gititemsummary.qtpl:40
 	for _, c := range g.Commits {
-//line templates/gititemsummary.qtpl:41
+//line templates/gititemsummary.qtpl:40
 		qw422016.N().S(`
     `)
-//line templates/gititemsummary.qtpl:42
-		StreamCommit(qw422016, name, c, false)
-//line templates/gititemsummary.qtpl:42
+//line templates/gititemsummary.qtpl:41
+		StreamCommit(qw422016, name, c.Commit(), false)
+//line templates/gititemsummary.qtpl:41
 		qw422016.N().S(`
     `)
-//line templates/gititemsummary.qtpl:43
+//line templates/gititemsummary.qtpl:42
 	}
-//line templates/gititemsummary.qtpl:43
+//line templates/gititemsummary.qtpl:42
 	qw422016.N().S(`
   </div>
 </div>
 `)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 }
 
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 func (g *GitItemSummaryPage) WriteGitContent(qq422016 qtio422016.Writer, name, ref string) {
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	g.StreamGitContent(qw422016, name, ref)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	qt422016.ReleaseWriter(qw422016)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 }
 
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 func (g *GitItemSummaryPage) GitContent(name, ref string) string {
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	qb422016 := qt422016.AcquireByteBuffer()
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	g.WriteGitContent(qb422016, name, ref)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	qs422016 := string(qb422016.B)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	qt422016.ReleaseByteBuffer(qb422016)
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 	return qs422016
-//line templates/gititemsummary.qtpl:46
+//line templates/gititemsummary.qtpl:45
 }
diff --git a/templates/gitlist.qtpl b/templates/gitlist.qtpl
index 3cd133f..e62e68a 100644
--- a/templates/gitlist.qtpl
+++ b/templates/gitlist.qtpl
@@ -41,9 +41,9 @@ type GitListPage struct {
         </hr>
         <p>{%s r.Description %}</p>
         <div class="event-commit row">
-            <a class="col-xl-2" title="{%s r.LastCommit.Hash.String() %}" href="/{%s r.Name %}/commit/{%s r.LastCommit.Hash.String() %}/">{%s r.LastCommit.Hash.String()[0:8] %}</a>
-            <a class="col-xl-7"> {%s firstLine(r.LastCommit.Message) %}</a>
-            <a class="col-xl-3" title="{%s r.LastCommit.Author.When.UTC().Format("2006-01-02 15:04:05")%} UTC">{%s humanize.Time(r.LastCommit.Author.When) %}</a>
+            <a class="col-xl-2" title="{%s r.LastCommit.Commit().Hash.String() %}" href="/{%s r.Name %}/commit/{%s r.LastCommit.Commit().Hash.String() %}/">{%s r.LastCommit.Commit().Hash.String()[0:8] %}</a>
+            <a class="col-xl-7"> {%s firstLine(r.LastCommit.Commit().Message) %}</a>
+            <a class="col-xl-3" title="{%s r.LastCommit.Commit().Author.When.UTC().Format("2006-01-02 15:04:05")%} UTC">{%s humanize.Time(r.LastCommit.Commit().Author.When) %}</a>
         </div>
         <p>
           <a href="/{%s r.Name %}/log/{%s r.Ref %}/">log</a>
diff --git a/templates/gitlist.qtpl.go b/templates/gitlist.qtpl.go
index 1c0fdac..d2b28d9 100644
--- a/templates/gitlist.qtpl.go
+++ b/templates/gitlist.qtpl.go
@@ -156,7 +156,7 @@ func (p *GitListPage) StreamContent(qw422016 *qt422016.Writer, ctx context.Conte
         <div class="event-commit row">
             <a class="col-xl-2" title="`)
 //line templates/gitlist.qtpl:44
-		qw422016.E().S(r.LastCommit.Hash.String())
+		qw422016.E().S(r.LastCommit.Commit().Hash.String())
 //line templates/gitlist.qtpl:44
 		qw422016.N().S(`" href="/`)
 //line templates/gitlist.qtpl:44
@@ -164,25 +164,25 @@ func (p *GitListPage) StreamContent(qw422016 *qt422016.Writer, ctx context.Conte
 //line templates/gitlist.qtpl:44
 		qw422016.N().S(`/commit/`)
 //line templates/gitlist.qtpl:44
-		qw422016.E().S(r.LastCommit.Hash.String())
+		qw422016.E().S(r.LastCommit.Commit().Hash.String())
 //line templates/gitlist.qtpl:44
 		qw422016.N().S(`/">`)
 //line templates/gitlist.qtpl:44
-		qw422016.E().S(r.LastCommit.Hash.String()[0:8])
+		qw422016.E().S(r.LastCommit.Commit().Hash.String()[0:8])
 //line templates/gitlist.qtpl:44
 		qw422016.N().S(`</a>
             <a class="col-xl-7"> `)
 //line templates/gitlist.qtpl:45
-		qw422016.E().S(firstLine(r.LastCommit.Message))
+		qw422016.E().S(firstLine(r.LastCommit.Commit().Message))
 //line templates/gitlist.qtpl:45
 		qw422016.N().S(`</a>
             <a class="col-xl-3" title="`)
 //line templates/gitlist.qtpl:46
-		qw422016.E().S(r.LastCommit.Author.When.UTC().Format("2006-01-02 15:04:05"))
+		qw422016.E().S(r.LastCommit.Commit().Author.When.UTC().Format("2006-01-02 15:04:05"))
 //line templates/gitlist.qtpl:46
 		qw422016.N().S(` UTC">`)
 //line templates/gitlist.qtpl:46
-		qw422016.E().S(humanize.Time(r.LastCommit.Author.When))
+		qw422016.E().S(humanize.Time(r.LastCommit.Commit().Author.When))
 //line templates/gitlist.qtpl:46
 		qw422016.N().S(`</a>
         </div>
-- 
cgit v1.2.3