changes - pgit@c0b0fe0

Commit `c0b0fe0`

Eric Bower · 2023-08-06 10:32:20 -0400 EDT

parent ad355eb

changes

2 files changed, +20, -15

M html/refs.page.tmpl

M main.go

M html/refs.page.tmpl

+8, -4

......@@ -5,13 +5,17 @@
{{define "content"}}
  {{template "header" .}}

  <h2>branches</h2>
  <h2 class="text-md">branches</h2>
  <ol>
  {{range .Data.Branches}}
    <p>{{.Refspec}}</p>
    <li>{{.Refspec}}</li>
  {{end}}
  </ol>

  <h2>tags</h2>
  <h2 class="text-md">tags</h2>
  <ol>
  {{range .Data.Tags}}
    <p>{{.Refspec}}</p>
    <li>{{.Refspec}}</li>
  {{end}}
  </ol>
{{end}}

M main.go

+12, -11

......@@ -20,7 +20,7 @@ var defaultBranches = []string{"main", "master"}
type RepoItemData struct {
	URL        string
	Name       string
	Desc string
	Desc       string
	CommitDate string
	LastCommit *git.Commit
}

......@@ -46,13 +46,13 @@ type CommitData struct {
}

type TreeItem struct {
	NumLines int
	URL      string
	Path     string
	Entry    *git.TreeEntry
	NumLines  int
	URL       string
	Path      string
	Entry     *git.TreeEntry
	CommitURL string
	Desc string
	When string
	Desc      string
	When      string
}

type PageData struct {

......@@ -68,7 +68,7 @@ type PageData struct {

type CommitPageData struct {
	CommitMsg template.HTML
	CommitID string
	CommitID  string
	Commit    *CommitData
	Diff      *DiffRender
	Repo      *RepoData

......@@ -348,6 +348,7 @@ func (c *Config) writeLogDiffs(repo *git.Repository, pageData *PageData) {
					content += fmt.Sprintf("%s\n", line.Content)
				}
			}
			// set filename to something our `ParseText` recognizes (e.g. `.diff`)
			finContent, err := pastes.ParseText("commit.diff", content)
			bail(err)

......@@ -358,7 +359,7 @@ func (c *Config) writeLogDiffs(repo *git.Repository, pageData *PageData) {

		commitData := &CommitPageData{
			Commit:    commit,
			CommitID: commit.ID.String()[:7],
			CommitID:  commit.ID.String()[:7],
			Diff:      rnd,
			Repo:      pageData.Repo,
			Parent:    parentID[:7],

......@@ -482,7 +483,7 @@ func (c *Config) writeBranch(repo *git.Repository, pageData *PageData) *BranchOu
		bail(err)

		var lc *git.Commit
		if (len(lastCommits) > 0) {
		if len(lastCommits) > 0 {
			lc = lastCommits[0]
		}
		entry.CommitURL = commitURL(pageData.Repo.Name, lc.ID.String())

......@@ -545,7 +546,7 @@ func main() {
		repoList = append(repoList, &RepoItemData{
			URL:        url,
			Name:       name,
			Desc: r.Desc,
			Desc:       r.Desc,
			CommitDate: timediff.TimeDiff(mainOutput.LastCommit.Author.When),
			LastCommit: mainOutput.LastCommit,
		})

...	...		@@ -348,6 +348,7 @@ func (c Config) writeLogDiffs(repo git.Repository, pageData *PageData) {
348	348		content += fmt.Sprintf("%s\n", line.Content)
349	349		}
350	350		}
	351	+	// set filename to something our `ParseText` recognizes (e.g. `.diff`)
351	352		finContent, err := pastes.ParseText("commit.diff", content)
352	353		bail(err)
353	354

...	...		@@ -5,13 +5,17 @@
5	5		{{define "content"}}
6	6		{{template "header" .}}
7	7
8		-	<h2>branches</h2>
	8	+	<h2 class="text-md">branches</h2>
	9	+	<ol>
9	10		{{range .Data.Branches}}
10		-	<p>{{.Refspec}}</p>
	11	+	<li>{{.Refspec}}</li>
11	12		{{end}}
	13	+	</ol>
12	14
13		-	<h2>tags</h2>
	15	+	<h2 class="text-md">tags</h2>
	16	+	<ol>
14	17		{{range .Data.Tags}}
15		-	<p>{{.Refspec}}</p>
	18	+	<li>{{.Refspec}}</li>
16	19		{{end}}
	20	+	</ol>
17	21		{{end}}

...	...		@@ -20,7 +20,7 @@ var defaultBranches = []string{"main", "master"}
20	20		type RepoItemData struct {
21	21		URL string
22	22		Name string
23		-	Desc string
	23	+	Desc string
24	24		CommitDate string
25	25		LastCommit *git.Commit
26	26		}

...	...		@@ -46,13 +46,13 @@ type CommitData struct {
46	46		}
47	47
48	48		type TreeItem struct {
49		-	NumLines int
50		-	URL string
51		-	Path string
52		-	Entry *git.TreeEntry
	49	+	NumLines int
	50	+	URL string
	51	+	Path string
	52	+	Entry *git.TreeEntry
53	53		CommitURL string
54		-	Desc string
55		-	When string
	54	+	Desc string
	55	+	When string
56	56		}
57	57
58	58		type PageData struct {

...	...		@@ -68,7 +68,7 @@ type PageData struct {
68	68
69	69		type CommitPageData struct {
70	70		CommitMsg template.HTML
71		-	CommitID string
	71	+	CommitID string
72	72		Commit *CommitData
73	73		Diff *DiffRender
74	74		Repo *RepoData

...	...		@@ -358,7 +359,7 @@ func (c Config) writeLogDiffs(repo git.Repository, pageData *PageData) {
358	359
359	360		commitData := &CommitPageData{
360	361		Commit: commit,
361		-	CommitID: commit.ID.String()[:7],
	362	+	CommitID: commit.ID.String()[:7],
362	363		Diff: rnd,
363	364		Repo: pageData.Repo,
364	365		Parent: parentID[:7],

...	...		@@ -482,7 +483,7 @@ func (c Config) writeBranch(repo git.Repository, pageData PageData) BranchOu
482	483		bail(err)
483	484
484	485		var lc *git.Commit
485		-	if (len(lastCommits) > 0) {
	486	+	if len(lastCommits) > 0 {
486	487		lc = lastCommits[0]
487	488		}
488	489		entry.CommitURL = commitURL(pageData.Repo.Name, lc.ID.String())

...	...		@@ -545,7 +546,7 @@ func main() {
545	546		repoList = append(repoList, &RepoItemData{
546	547		URL: url,
547	548		Name: name,
548		-	Desc: r.Desc,
	549	+	Desc: r.Desc,
549	550		CommitDate: timediff.TimeDiff(mainOutput.LastCommit.Author.When),
550	551		LastCommit: mainOutput.LastCommit,
551	552		})

Commit c0b0fe0

Commit `c0b0fe0`