cel
/
legit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git, templates: diff view

This commit is contained in:
Anirudh Oppiliappan 2022-12-17 22:35:48 +05:30
parent 5091695e75
commit 3e6a720154
No known key found for this signature in database
GPG Key ID: 8A93F96F78C5D4C4
8 changed files with 88 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/diff.go
View File

@ -69,9 +69,9 @@ func (g *GitRepo) Diff() (*NiceDiff, error) {
nd.Commit.Parent = parent.Hash.String() nd.Commit.Parent = parent.Hash.String()
nd.Commit.Author = c.Author nd.Commit.Author = c.Author
nd.Commit.Message = c.Message nd.Commit.Message = c.Message
ndiff := Diff{}
for _, d := range diffs { for _, d := range diffs {
ndiff := Diff{}
ndiff.Name.New = d.NewName ndiff.Name.New = d.NewName
ndiff.Name.Old = d.OldName ndiff.Name.Old = d.OldName

6
go.mod
View File

@ -7,6 +7,7 @@ require (
github.com/bluekeyes/go-gitdiff v0.7.0 github.com/bluekeyes/go-gitdiff v0.7.0
github.com/dustin/go-humanize v1.0.0 github.com/dustin/go-humanize v1.0.0
github.com/go-git/go-git/v5 v5.5.1 github.com/go-git/go-git/v5 v5.5.1
github.com/sosedoff/gitkit v0.3.0
gopkg.in/yaml.v3 v3.0.0 gopkg.in/yaml.v3 v3.0.0
) )
@ -23,9 +24,8 @@ require (
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect
github.com/pjbgf/sha1cd v0.2.3 // indirect github.com/pjbgf/sha1cd v0.2.3 // indirect
github.com/sergi/go-diff v1.2.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect
github.com/skeema/knownhosts v1.1.0 // indirect github.com/skeema/knownhosts v1.1.0 // indirect
github.com/sosedoff/gitkit v0.3.0 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect
golang.org/x/crypto v0.4.0 // indirect golang.org/x/crypto v0.4.0 // indirect
golang.org/x/mod v0.7.0 // indirect golang.org/x/mod v0.7.0 // indirect
@ -34,3 +34,5 @@ require (
golang.org/x/tools v0.4.0 // indirect golang.org/x/tools v0.4.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect
) )
exclude github.com/sergi/go-diff v1.2.0

3
go.sum
View File

@ -62,9 +62,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0= github.com/skeema/knownhosts v1.1.0 h1:Wvr9V0MxhjRbl3f9nMnKnFfiWTJmtECJ9Njkea3ysW0=
github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag= github.com/skeema/knownhosts v1.1.0/go.mod h1:sKFq3RD6/TKZkSWn8boUbDC7Qkgcv+8XXijpFO6roag=

1
routes/routes.go
View File

@ -188,6 +188,7 @@ func (d *deps) Log(w http.ResponseWriter, r *http.Request) {
} }
commits, err := gr.Commits() commits, err := gr.Commits()
log.Println(len(commits))
if err != nil { if err != nil {
d.Write500(w) d.Write500(w)
log.Println(err) log.Println(err)

38
static/style.css
View File

@ -146,6 +146,44 @@ a:hover {
white-space: pre-wrap; white-space: pre-wrap;
} }
.diff {
padding-top: 1rem;
}
.diff pre {
overflow: scroll;
}
.diff-stat {
padding: 1rem 0 1rem 0;
}
.commit-email {
color: var(--gray);
}
.commit pre {
padding-bottom: 1rem;
white-space: pre-wrap;
}
.diff-stat ul li {
list-style: none;
padding-left: 0.5em;
}
.diff-add {
color: green;
}
.diff-del {
color: red;
}
.diff-noop {
color: var(--gray);
}
@media (max-width: 600px) { @media (max-width: 600px) {
.index { .index {
grid-row-gap: 0.8em; grid-row-gap: 0.8em;

42
templates/commit.html
View File

@ -9,8 +9,12 @@
<body> <body>
{{ template "nav" . }} {{ template "nav" . }}
<main> <main>
<section> <section class="commit">
<p>author: {{ .commit.Author.Name }} <{{ .commit.Author.Email}}> on {{ .commit.Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</p> <pre>
{{- .commit.Message -}}
</pre>
<p>{{ .commit.Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</p>
<p>{{ .commit.Author.Name }} <span class="commit-email">{{ .commit.Author.Email}}</span></p>
<p>commit: <a href="/{{ .name }}/commit/{{ .commit.This }}"> <p>commit: <a href="/{{ .name }}/commit/{{ .commit.This }}">
{{ .commit.This }} {{ .commit.This }}
</a> </a>
@ -19,34 +23,54 @@
{{ .commit.Parent }} {{ .commit.Parent }}
</a> </a>
</p> </p>
<p>{{ .stat.FilesChanged }} files changed, <div class="diff-stat">
<div>
{{ .stat.FilesChanged }} files changed,
{{ .stat.Insertions }} insertions(+), {{ .stat.Insertions }} insertions(+),
{{ .stat.Deletions }} deletions(-) {{ .stat.Deletions }} deletions(-)
</p> </div>
<div>
<br>
<p>jump to:</p>
{{ range .diff }}
<ul>
<li><a href="#{{ .Name.New }}">{{ .Name.New }}</a></li>
</ul>
{{ end }}
</div>
</div>
</section> </section>
<section> <section>
{{ $repo := .name }}
{{ $this := .commit.This }}
{{ range .diff }} {{ range .diff }}
<div class="diff">
<div id="{{ .Name.New }}">
{{ if .Name.Old }} {{ if .Name.Old }}
<p>{{ .Name.Old }} → {{ .Name.New }}</p> <a href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}">{{ .Name.Old }}</a> &#8594;
<a href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}">{{ .Name.New }}</a>
{{ else }} {{ else }}
<p>{{.Name.New }}</p> <a href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}">{{ .Name.New }}</a>
{{- end -}} {{- end -}}
</div>
<pre> <pre>
{{- range .TextFragments -}} {{- range .TextFragments -}}
<p>{{- .Header -}}</p> <p>{{- .Header -}}</p>
{{- range .Lines -}} {{- range .Lines -}}
{{- if eq .Op.String "+" -}} {{- if eq .Op.String "+" -}}
<span style="color: green">{{ .String }}</span> <span class="diff-add">{{ .String }}</span>
{{- end -}} {{- end -}}
{{- if eq .Op.String "-" -}} {{- if eq .Op.String "-" -}}
<span style="color: red">{{ .String }}</span> <span class="diff-del">{{ .String }}</span>
{{- end -}} {{- end -}}
{{- if eq .Op.String " " -}} {{- if eq .Op.String " " -}}
<span style="color: gray">{{ .String }}</span> <span class="diff-noop">{{ .String }}</span>
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
</pre> </pre>
</div>
{{ end }} {{ end }}
</section> </section>
</main> </main>

4
templates/log.html
View File

@ -9,7 +9,7 @@
<body> <body>
{{ template "nav" . }} {{ template "nav" . }}
<main> <main>
{{ $repo := .repo }} {{ $repo := .name }}
<div class="log"> <div class="log">
{{ range .commits }} {{ range .commits }}
<div> <div>
@ -17,7 +17,7 @@
<div>{{ .Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div> <div>{{ .Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div>
<pre>{{ .Message }}</pre> <pre>{{ .Message }}</pre>
</div> </div>
<div class="commit-info">{{ .Author.Name }} <span style="color: var(--gray);">{{ .Author.Email }}</span></div> <div class="commit-info">{{ .Author.Name }} <span class="commit-email">{{ .Author.Email }}</span></div>
{{ end }} {{ end }}
</div> </div>
</main> </main>

2
templates/repo.html
View File

@ -25,7 +25,7 @@
<div>{{ .Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div> <div>{{ .Author.When.Format "Mon, 02 Jan 2006 15:04:05 -0700" }}</div>
<pre>{{ .Message }}</pre> <pre>{{ .Message }}</pre>
</div> </div>
<div class="commit-info">{{ .Author.Name }} <span style="color: var(--gray);">{{ .Author.Email }}</span></div> <div class="commit-info">{{ .Author.Name }} <span class="commit-email">{{ .Author.Email }}</span></div>
{{ end }} {{ end }}
</div> </div>
<article class="readme"> <article class="readme">