patch of appview/pages: show co-authors and committers in commit messages · round #1 · pull #863 · tangled.org/core

+1 -1

appview/pages/funcmap.go

···

       162
       162
        
       			}

     

       163
       163
        
       			return pairs, nil

     

       164
       164
        
       		},

     

       165
       165
       -
       		"append": func(s []string, values ...string) []string {

     

       165
       165
       +
       		"append": func(s []any, values ...any) []any {

     

       166
       166
        
       			s = append(s, values...)

     

       167
       167
        
       			return s

     

       168
       168
        
       		},

+34 -9

appview/pages/templates/repo/commit.html

···

       25
       25
        
         </div>

     

       26
       26
        
       

     

       27
       27
        
         <div class="flex flex-wrap items-center space-x-2">

     

       28
       28
       -
             <p class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-300">

     

       29
       29
       -
                 {{ $did := index $.EmailToDid $commit.Author.Email }}

     

       30
       30
       -
       

     

       31
       31
       -
                 {{ if $did }}

     

       32
       32
       -
                   {{ template "user/fragments/picHandleLink" $did }}

     

       33
       33
       -
                 {{ else }}

     

       34
       34
       -
                   <a href="mailto:{{ $commit.Author.Email }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ $commit.Author.Name }}</a>

     

       35
       35
       -
                 {{ end }}

     

       28
       28
       +
             <p class="flex flex-wrap items-center gap-1 text-sm text-gray-500 dark:text-gray-300">

     

       29
       29
       +
                 {{ template "attribution" . }}

     

       36
       30
        
       

     

       37
       31
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       38
       38
       -
                 {{ template "repo/fragments/time" $commit.Committer.When }}

     

       32
       32
       +
                   {{ template "repo/fragments/time" $commit.Committer.When }}

     

       39
       33
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       40
       34
        
       

     

       41
       35
        
                 <a href="/{{ $repo }}/commit/{{ $commit.This }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ slice $commit.This 0 8 }}</a>

     
···

       79
       73
        
       </section>

     

       80
       74
        
       {{end}}

     

       81
       75
        
       

     

       76
       76
       +
       {{ define "attribution" }}

     

       77
       77
       +
         {{ $commit := .Diff.Commit }}

     

       78
       78
       +
         {{ $showCommitter := true }}

     

       79
       79
       +
         {{ if eq $commit.Author.Email $commit.Committer.Email }}

     

       80
       80
       +
           {{ $showCommitter = false }}

     

       81
       81
       +
         {{ end }}

     

       82
       82
       +
       

     

       83
       83
       +
         {{ if $showCommitter }}

     

       84
       84
       +
           authored by {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid) }}

     

       85
       85
       +
           {{ range $commit.CoAuthors }} 

     

       86
       86
       +
             {{ template "attributedUser" (list .Email .Name $.EmailToDid) }}

     

       87
       87
       +
           {{ end }}

     

       88
       88
       +
           and committed by  {{ template "attributedUser" (list $commit.Committer.Email $commit.Committer.Name $.EmailToDid) }}

     

       89
       89
       +
         {{ else }}

     

       90
       90
       +
           {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid )}}

     

       91
       91
       +
         {{ end }}

     

       92
       92
       +
       {{ end }}

     

       93
       93
       +
       

     

       94
       94
       +
       {{ define "attributedUser" }}

     

       95
       95
       +
         {{ $email := index . 0 }}

     

       96
       96
       +
         {{ $name := index . 1 }}

     

       97
       97
       +
         {{ $map := index . 2 }}

     

       98
       98
       +
         {{ $did := index $map $email }}

     

       99
       99
       +
       

     

       100
       100
       +
         {{ if $did }}

     

       101
       101
       +
           {{ template "user/fragments/picHandleLink" $did }}

     

       102
       102
       +
         {{ else }}

     

       103
       103
       +
           <a href="mailto:{{ $email }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ $name }}</a>

     

       104
       104
       +
         {{ end }}

     

       105
       105
       +
       {{ end }}

     

       106
       106
       +
       

     

       82
       107
        
       {{ define "topbarLayout" }}

     

       83
       108
        
         <header class="col-span-full" style="z-index: 20;">

     

       84
       109
        
           {{ template "layouts/fragments/topbar" . }}

+30 -8

appview/pages/templates/repo/index.html

···

       14
       14
        
               {{ end }}

     

       15
       15
        
               <div class="flex items-center justify-between pb-5">

     

       16
       16
        
                 {{ block "branchSelector" . }}{{ end }}

     

       17
       17
       -
                 <div class="flex md:hidden items-center gap-2">

     

       17
       17
       +
                 <div class="flex md:hidden items-center gap-3">

     

       18
       18
        
                   <a href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" class="inline-flex items-center text-sm gap-1 font-bold">

     

       19
       19
        
                     {{ i "git-commit-horizontal" "w-4" "h-4" }} {{ .TotalCommits }}

     

       20
       20
        
                   </a>

     
···

       66
       66
        
       

     

       67
       67
        
       {{ define "branchSelector" }}

     

       68
       68
        
         <div class="flex gap-2 items-center justify-between w-full">

     

       69
       69
       -
           <div class="flex gap-2 items-center">

     

       69
       69
       +
           <div class="flex gap-2 items-stretch">

     

       70
       70
        
             <select

     

       71
       71
        
                 onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)"

     

       72
       72
        
                 class="p-1 border max-w-32 border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"

     
···

       228
       228
        
               <span

     

       229
       229
        
                 class="mx-1 before:content-['·'] before:select-none"

     

       230
       230
        
                 ></span>

     

       231
       231
       -
               <span>

     

       232
       232
       -
                 {{ $did := index $.EmailToDid .Author.Email }}

     

       233
       233
       -
                 <a href="{{ if $did }}/{{ resolve $did }}{{ else }}mailto:{{ .Author.Email }}{{ end }}"

     

       234
       234
       -
                   class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       235
       235
       -
                   >{{ if $did }}{{ template "user/fragments/picHandleLink" $did }}{{ else }}{{ .Author.Name }}{{ end }}</a>

     

       236
       236
       -
               </span>

     

       231
       231
       +
               {{ template "attribution" (list . $.EmailToDid) }}

     

       237
       232
        
               <div class="inline-block px-1 select-none after:content-['·']"></div>

     

       238
       233
        
               {{ template "repo/fragments/time" .Committer.When }}

     

       239
       234
        
       

     
···

       261
       256
        
       </div>

     

       262
       257
        
       {{ end }}

     

       263
       258
        
       

     

       259
       259
       +
       {{ define "attribution" }}

     

       260
       260
       +
         {{ $commit := index . 0 }}

     

       261
       261
       +
         {{ $map := index . 1 }}

     

       262
       262
       +
         <span class="flex items-center">

     

       263
       263
       +
           {{ $author := index $map $commit.Author.Email }}

     

       264
       264
       +
           {{ $coauthors := $commit.CoAuthors }}

     

       265
       265
       +
           {{ $all := list }}

     

       266
       266
       +
       

     

       267
       267
       +
           {{ if $author }}

     

       268
       268
       +
               {{ $all = append $all $author }}

     

       269
       269
       +
           {{ end }}

     

       270
       270
       +
           {{ range $coauthors }}

     

       271
       271
       +
             {{ $co := index $map .Email }}

     

       272
       272
       +
             {{ if $co }}

     

       273
       273
       +
               {{ $all = append $all $co }}

     

       274
       274
       +
             {{ end }}

     

       275
       275
       +
           {{ end }}

     

       276
       276
       +
       

     

       277
       277
       +
           {{ template "fragments/tinyAvatarList" (dict "all" $all "classes" "size-6") }}

     

       278
       278
       +
           <a href="{{ if $author }}/{{ $author }}{{ else }}mailto:{{ $commit.Author.Email }}{{ end }}"

     

       279
       279
       +
              class="no-underline hover:underline">

     

       280
       280
       +
              {{ if $author }}{{ resolve $author }}{{ else }}{{ $commit.Author.Name }}{{ end }}

     

       281
       281
       +
              {{ if $coauthors }} +{{ length $coauthors }}{{ end }}

     

       282
       282
       +
           </a>

     

       283
       283
       +
         </span>

     

       284
       284
       +
       {{ end }}

     

       285
       285
       +
       

     

       264
       286
        
       {{ define "branchList" }}

     

       265
       287
        
         {{ if gt (len .BranchesTrunc) 0 }}

     

       266
       288
        
           <div id="branches" class="md:col-span-1 px-2 py-4 border-t border-gray-200 dark:border-gray-700">

+40 -23

appview/pages/templates/repo/log.html

···

       17
       17
        
           <div class="hidden md:flex md:flex-col divide-y divide-gray-200 dark:divide-gray-700">

     

       18
       18
        
             {{ $grid := "grid grid-cols-14 gap-4" }}

     

       19
       19
        
             <div class="{{ $grid }}">

     

       20
       20
       -
               <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-2">Author</div>

     

       20
       20
       +
               <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-3">Author</div>

     

       21
       21
        
               <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-3">Commit</div>

     

       22
       22
        
               <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-6">Message</div>

     

       23
       23
       -
               <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-1"></div>

     

       24
       23
        
               <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-2 justify-self-end">Date</div>

     

       25
       24
        
             </div>

     

       26
       25
        
             {{ range $index, $commit := .Commits }}

     

       27
       26
        
               {{ $messageParts := splitN $commit.Message "\n\n" 2 }}

     

       28
       27
        
               <div class="{{ $grid }} py-3">

     

       29
       29
       -
                 <div class="align-top truncate col-span-2">

     

       30
       30
       -
                     {{ $did := index $.EmailToDid $commit.Author.Email }}

     

       31
       31
       -
                     {{ if $did }}

     

       32
       32
       -
                         {{ template "user/fragments/picHandleLink" $did }}

     

       33
       33
       -
                     {{ else }}

     

       34
       34
       -
                         <a href="mailto:{{ $commit.Author.Email }}" class="text-gray-700 dark:text-gray-300 no-underline hover:underline">{{ $commit.Author.Name }}</a>

     

       35
       35
       -
                     {{ end }}

     

       28
       28
       +
                 <div class="align-top col-span-3">

     

       29
       29
       +
                   {{ template "attribution" (list $commit $.EmailToDid) }}

     

       36
       30
        
                 </div>

     

       37
       31
        
                 <div class="align-top font-mono flex items-start col-span-3">

     

       38
       32
        
                     {{ $verified := $.VerifiedCommits.IsVerified $commit.Hash.String }}

     
···

       61
       55
        
                 <div class="align-top col-span-6">

     

       62
       56
        
                   <div>

     

       63
       57
        
                       <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="dark:text-white no-underline hover:underline">{{ index $messageParts 0 }}</a>

     

       58
       58
       +
       

     

       64
       59
        
                       {{ if gt (len $messageParts) 1 }}

     

       65
       60
        
                       <button class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 dark:bg-gray-700 dark:hover:bg-gray-600 rounded" hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">{{ i "ellipsis" "w-3 h-3" }}</button>

     

       66
       61
        
                       {{ end }}

     
···

       72
       67
        
                           </span>

     

       73
       68
        
                         {{ end }}

     

       74
       69
        
                       {{ end }}

     

       70
       70
       +
       

     

       71
       71
       +
                       <!-- ci status -->

     

       72
       72
       +
                       <span class="text-xs">

     

       73
       73
       +
                         {{ $pipeline := index $.Pipelines .Hash.String }}

     

       74
       74
       +
                         {{ if and $pipeline (gt (len $pipeline.Statuses) 0) }}

     

       75
       75
       +
                           {{ template "repo/pipelines/fragments/pipelineSymbolLong" (dict "Pipeline" $pipeline "RepoInfo" $.RepoInfo) }}

     

       76
       76
       +
                         {{ end }}

     

       77
       77
       +
                       </span>

     

       75
       78
        
                   </div>

     

       76
       79
        
       

     

       77
       80
        
                   {{ if gt (len $messageParts) 1 }}

     

       78
       81
        
                     <p class="hidden mt-1 text-sm text-gray-600 dark:text-gray-400">{{ nl2br (index $messageParts 1) }}</p>

     

       79
       82
        
                   {{ end }}

     

       80
       83
        
                 </div>

     

       81
       81
       -
                 <div class="align-top col-span-1">

     

       82
       82
       -
                     <!-- ci status -->

     

       83
       83
       -
                     {{ $pipeline := index $.Pipelines .Hash.String }}

     

       84
       84
       -
                     {{ if and $pipeline (gt (len $pipeline.Statuses) 0) }}

     

       85
       85
       -
                       {{ template "repo/pipelines/fragments/pipelineSymbolLong" (dict "Pipeline" $pipeline "RepoInfo" $.RepoInfo) }}

     

       86
       86
       -
                     {{ end }}

     

       87
       87
       -
                 </div>

     

       88
       84
        
                 <div class="align-top justify-self-end text-gray-500 dark:text-gray-400 col-span-2">{{ template "repo/fragments/shortTimeAgo" $commit.Committer.When }}</div>

     

       89
       85
        
               </div>

     

       90
       86
        
             {{ end }}

     
···

       152
       148
        
                               </a>

     

       153
       149
        
                           </span>

     

       154
       150
        
                           <span class="mx-2 before:content-['·'] before:select-none"></span>

     

       155
       155
       -
                           <span>

     

       156
       156
       -
                               {{ $did := index $.EmailToDid $commit.Author.Email }}

     

       157
       157
       -
                               <a href="{{ if $did }}/{{ $did }}{{ else }}mailto:{{ $commit.Author.Email }}{{ end }}"

     

       158
       158
       -
                                  class="text-gray-500 dark:text-gray-400 no-underline hover:underline">

     

       159
       159
       -
                                  {{ if $did }}{{ template "user/fragments/picHandleLink" $did }}{{ else }}{{ $commit.Author.Name }}{{ end }}

     

       160
       160
       -
                               </a>

     

       161
       161
       -
                           </span>

     

       151
       151
       +
                           {{ template "attribution" (list $commit $.EmailToDid) }}

     

       162
       152
        
                           <div class="inline-block px-1 select-none after:content-['·']"></div>

     

       163
       153
        
                           <span>{{ template "repo/fragments/shortTime" $commit.Committer.When }}</span>

     

       164
       154
        
       

     
···

       178
       168
        
       

     

       179
       169
        
       {{ end }}

     

       180
       170
        
       

     

       171
       171
       +
       {{ define "attribution" }}

     

       172
       172
       +
         {{ $commit := index . 0 }}

     

       173
       173
       +
         {{ $map := index . 1 }}

     

       174
       174
       +
         <span class="flex items-center gap-1">

     

       175
       175
       +
           {{ $author := index $map $commit.Author.Email }}

     

       176
       176
       +
           {{ $coauthors := $commit.CoAuthors }}

     

       177
       177
       +
           {{ $all := list }}

     

       178
       178
       +
       

     

       179
       179
       +
           {{ if $author }}

     

       180
       180
       +
               {{ $all = append $all $author }}

     

       181
       181
       +
           {{ end }}

     

       182
       182
       +
           {{ range $coauthors }}

     

       183
       183
       +
             {{ $co := index $map .Email }}

     

       184
       184
       +
             {{ if $co }}

     

       185
       185
       +
               {{ $all = append $all $co }}

     

       186
       186
       +
             {{ end }}

     

       187
       187
       +
           {{ end }}

     

       188
       188
       +
       

     

       189
       189
       +
           {{ template "fragments/tinyAvatarList" (dict "all" $all "classes" "size-6") }}

     

       190
       190
       +
           <a href="{{ if $author }}/{{ $author }}{{ else }}mailto:{{ $commit.Author.Email }}{{ end }}"

     

       191
       191
       +
              class="no-underline hover:underline">

     

       192
       192
       +
              {{ if $author }}{{ resolve $author }}{{ else }}{{ $commit.Author.Name }}{{ end }}

     

       193
       193
       +
              {{ if $coauthors }} +{{ length $coauthors }}{{ end }}

     

       194
       194
       +
           </a>

     

       195
       195
       +
         </span>

     

       196
       196
       +
       {{ end }}

     

       197
       197
       +
       

     

       181
       198
        
       {{ define "repoAfter" }}

     

       182
       199
        
         {{ $commits_len := len .Commits }}

     

       183
       200
        
         <div class="flex justify-end mt-4 gap-2">

+10 -10

appview/repo/repo_util.go

···

       1
       1
        
       package repo

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"maps"

     

       4
       5
        
       	"slices"

     

       5
       6
        
       	"sort"

     

       6
       7
        
       	"strings"

     
···

       43
       44
        
       func uniqueEmails(commits []types.Commit) []string {

     

       44
       45
        
       	emails := make(map[string]struct{})

     

       45
       46
        
       	for _, commit := range commits {

     

       46
       46
       -
       		if commit.Author.Email != "" {

     

       47
       47
       -
       			emails[commit.Author.Email] = struct{}{}

     

       47
       47
       +
       		emails[commit.Author.Email] = struct{}{}

     

       48
       48
       +
       		emails[commit.Committer.Email] = struct{}{}

     

       49
       49
       +
       		for _, c := range commit.CoAuthors() {

     

       50
       50
       +
       			emails[c.Email] = struct{}{}

     

       48
       51
        
       		}

     

       49
       49
       -
       		if commit.Committer.Email != "" {

     

       50
       50
       -
       			emails[commit.Committer.Email] = struct{}{}

     

       51
       51
       -
       		}

     

       52
       52
       -
       	}

     

       53
       53
       -
       	var uniqueEmails []string

     

       54
       54
       -
       	for email := range emails {

     

       55
       55
       -
       		uniqueEmails = append(uniqueEmails, email)

     

       56
       52
        
       	}

     

       57
       57
       -
       	return uniqueEmails

     

       53
       53
       +
       

     

       54
       54
       +
       	// delete empty emails if any, from the set

     

       55
       55
       +
       	delete(emails, "")

     

       56
       56
       +
       

     

       57
       57
       +
       	return slices.Collect(maps.Keys(emails))

     

       58
       58
        
       }

     

       59
       59
        
       

     

       60
       60
        
       func balanceIndexItems(commitCount, branchCount, tagCount, fileCount int) (commitsTrunc int, branchesTrunc int, tagsTrunc int) {

+1 -1

types/commit.go

···

       172
       172
        
       	coAuthorRegex = regexp.MustCompile(`(?im)^Co-authored-by:\s*(.+?)\s*<([^>]+)>`)

     

       173
       173
        
       )

     

       174
       174
        
       

     

       175
       175
       -
       func (commit *Commit) CoAuthors() []object.Signature {

     

       175
       175
       +
       func (commit Commit) CoAuthors() []object.Signature {

     

       176
       176
        
       	var coAuthors []object.Signature

     

       177
       177
        
       

     

       178
       178
        
       	matches := coAuthorRegex.FindAllStringSubmatch(commit.Message, -1)