diff --git a/flake.nix b/flake.nix --- a/flake.nix +++ b/flake.nix @@ -320,6 +320,9 @@ rootDir=$(jj --ignore-working-copy root || git rev-parse --show-toplevel) || (echo "error: can't find repo root?"; exit 1) cd "$rootDir" + # Reset TMPDIR in case it points to a stale nix-shell temp dir + export TMPDIR=/tmp + mkdir -p nix/vm-data/{knot,repos,spindle,spindle-logs} export TANGLED_VM_DATA_DIR="$rootDir/nix/vm-data" diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go --- a/appview/pages/funcmap.go +++ b/appview/pages/funcmap.go @@ -104,6 +104,13 @@ } return s[:30] + "…" }, + // short prefix of a commit hash or jj change id, safe on short input + "shortId": func(s string) string { + if len(s) <= 8 { + return s + } + return s[:8] + }, "splitOn": func(s, sep string) []string { return strings.Split(s, sep) }, diff --git a/appview/pages/templates/repo/commit.html b/appview/pages/templates/repo/commit.html --- a/appview/pages/templates/repo/commit.html +++ b/appview/pages/templates/repo/commit.html @@ -28,25 +28,67 @@ -
-

- {{ template "attribution" . }} +

+ {{ $showCommitter := ne $commit.Author.Email $commit.Committer.Email }} +
+ + author + {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid) }} + - - - {{ template "repo/fragments/time" $commit.Committer.When }} - ({{ $commit.Committer.When | longTimeFmt }}) - - + {{ range $commit.CoAuthors }} + + co-author + {{ template "attributedUser" (list .Email .Name $.EmailToDid) }} + + {{ end }} - {{ slice $commit.This 0 8 }} + {{ if $showCommitter }} + + committer + {{ template "attributedUser" (list $commit.Committer.Email $commit.Committer.Name $.EmailToDid) }} + + {{ end }} - {{ if $commit.Parent }} - {{ i "arrow-left" "w-3 h-3 mx-1" }} - {{ slice $commit.Parent 0 8 }} - {{ end }} -

+ + date + + {{ template "repo/fragments/time" $commit.Committer.When }} + ({{ $commit.Committer.When | longTimeFmt }}) + + + + commit + + {{ shortId $commit.This }} + + + + + {{ if $commit.Parent }} + + parent + + {{ shortId $commit.Parent }} + + + + {{ end }} + + {{ if $commit.ChangeId }} + + change-id + + {{ shortId $commit.ChangeId }} + + + + {{ end }} +
+ + {{ if or (.VerifiedCommit.IsVerified $commit.This) $.Pipeline }} +
{{ if .VerifiedCommit.IsVerified $commit.This }}
@@ -75,28 +117,12 @@ {{ template "repo/pipelines/fragments/pipelineSymbolLong" (dict "Pipeline" $.Pipeline "RepoInfo" $.RepoInfo) }} {{ end }}
+
+ {{ end }}
{{end}} - -{{ define "attribution" }} - {{ $commit := .Diff.Commit }} - {{ $showCommitter := true }} - {{ if eq $commit.Author.Email $commit.Committer.Email }} - {{ $showCommitter = false }} - {{ end }} - - {{ if $showCommitter }} - authored by {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid) }} - {{ range $commit.CoAuthors }} - {{ template "attributedUser" (list .Email .Name $.EmailToDid) }} - {{ end }} - and committed by {{ template "attributedUser" (list $commit.Committer.Email $commit.Committer.Name $.EmailToDid) }} - {{ else }} - {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid )}} - {{ end }} -{{ end }} {{ define "attributedUser" }} {{ $email := index . 0 }} @@ -129,4 +155,3 @@ {{ define "contentAfter" }} {{ template "repo/fragments/diff" (list .Diff .DiffOpts) }} {{end}} - diff --git a/appview/pages/templates/repo/index.html b/appview/pages/templates/repo/index.html --- a/appview/pages/templates/repo/index.html +++ b/appview/pages/templates/repo/index.html @@ -213,6 +213,7 @@ {{ end }} {{ slice .Hash.String 0 8 }} {{ if $verified }} diff --git a/appview/pages/templates/repo/log.html b/appview/pages/templates/repo/log.html --- a/appview/pages/templates/repo/log.html +++ b/appview/pages/templates/repo/log.html @@ -34,7 +34,9 @@ {{ if $verified }} {{ $hashStyle = "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 rounded" }} {{ end }} - + {{ slice $commit.Hash.String 0 8 }} {{ if $verified }} {{ i "shield-check" "w-4 h-4" }} @@ -140,6 +142,7 @@ {{ end }} {{ slice $commit.Hash.String 0 8 }} {{ if $verified }}