forked from tangled.org/core
Something went wrong. Try again.
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265{{ define "title" }} {{ .Pull.Title }} · pull #{{ .Pull.PullId }} · {{ .RepoInfo.FullName }}{{ end }}
{{ define "extrameta" }} {{ $title := printf "%s · pull #%d · %s" .Pull.Title .Pull.PullId .RepoInfo.FullName }} {{ $url := printf "https://tangled.sh/%s/pulls/%d" .RepoInfo.FullName .Pull.PullId }} {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}{{ end }}
{{ define "repoContent" }} {{ template "repo/pulls/fragments/pullHeader" . }}
{{ if .Pull.IsStacked }} <div class="mt-8"> {{ template "repo/pulls/fragments/pullStack" . }} </div> {{ end }}{{ end }}
{{ define "repoAfter" }} <section id="submissions" class="mt-4"> <div class="flex flex-col gap-4"> {{ block "submissions" . }} {{ end }} </div> </section>
<div id="pull-close"></div> <div id="pull-reopen"></div>{{ end }}
{{ define "submissions" }} {{ $lastIdx := sub (len .Pull.Submissions) 1 }} {{ $targetBranch := .Pull.TargetBranch }} {{ $repoName := .RepoInfo.FullName }} {{ range $idx, $item := .Pull.Submissions }} {{ with $item }} <details {{ if eq $idx $lastIdx }}open{{ end }}> <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer"> <div class="flex flex-wrap gap-2 items-center"> <!-- round number --> <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white"> <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span> </div> <!-- round summary --> <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400"> <span> {{ $owner := index $.DidHandleMap $.Pull.OwnerDid }} {{ $re := "re" }} {{ if eq .RoundNumber 0 }} {{ $re = "" }} {{ end }} <span class="hidden md:inline">{{$re}}submitted</span> by <a href="/{{ $owner }}">{{ $owner }}</a> <span class="select-none before:content-['\00B7']"></span> <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500" href="#round-#{{ .RoundNumber }}"><time>{{ .Created | shortTimeFmt }}</time></a> <span class="select-none before:content-['·']"></span> {{ $s := "s" }} {{ if eq (len .Comments) 1 }} {{ $s = "" }} {{ end }} {{ len .Comments }} comment{{$s}} </span> </div>
<a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" hx-boost="true" href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}"> {{ i "file-diff" "w-4 h-4" }} <span class="hidden md:inline">diff</span> {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} </a> {{ if not (eq .RoundNumber 0) }} <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" hx-boost="true" href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff"> {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} <span class="hidden md:inline">interdiff</span> {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} </a> <span id="interdiff-error-{{.RoundNumber}}"></span> {{ end }} </div> </summary>
{{ if .IsFormatPatch }} {{ $patches := .AsFormatPatch }} {{ $round := .RoundNumber }} <details class="group py-2 md:ml-[3.5rem] text-gray-500 dark:text-gray-400 flex flex-col gap-2 relative text-sm"> <summary class="py-1 list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400"> {{ $s := "s" }} {{ if eq (len $patches) 1 }} {{ $s = "" }} {{ end }} <div class="group-open:hidden flex items-center gap-2 ml-2"> {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $patches }} commit{{$s}} </div> <div class="hidden group-open:flex items-center gap-2 ml-2"> {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $patches }} commit{{$s}} </div> </summary> {{ range $patches }} <div id="commit-{{.SHA}}" class="py-1 px-2 relative w-full md:max-w-3/5 md:w-fit flex flex-col"> <div class="flex items-center gap-2"> {{ i "git-commit-horizontal" "w-4 h-4" }} <div class="text-sm text-gray-500 dark:text-gray-400"> <!-- attempt to resolve $fullRepo: this is possible only on non-deleted forks and branches --> {{ $fullRepo := "" }} {{ if and $.Pull.IsForkBased $.Pull.PullSource.Repo }} {{ $fullRepo = printf "%s/%s" $owner $.Pull.PullSource.Repo.Name }} {{ else if $.Pull.IsBranchBased }} {{ $fullRepo = $.RepoInfo.FullName }} {{ end }}
<!-- if $fullRepo was resolved, link to it, otherwise just span without a link --> {{ if $fullRepo }} <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-500 dark:text-gray-400">{{ slice .SHA 0 8 }}</a> {{ else }} <span class="font-mono">{{ slice .SHA 0 8 }}</span> {{ end }} </div> <div class="flex items-center"> <span>{{ .Title }}</span> {{ if gt (len .Body) 0 }} <button class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600" hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')" > {{ i "ellipsis" "w-3 h-3" }} </button> {{ end }} </div> </div> {{ if gt (len .Body) 0 }} <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2"> {{ nl2br .Body }} </p> {{ end }} </div> {{ end }} </details> {{ end }}
<div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative"> {{ range $cidx, $c := .Comments }} <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit"> {{ if gt $cidx 0 }} <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> {{ end }} <div class="text-sm text-gray-500 dark:text-gray-400"> {{ $owner := index $.DidHandleMap $c.OwnerDid }} <a href="/{{$owner}}">{{$owner}}</a> <span class="before:content-['·']"></span> <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}"><time>{{ $c.Created | shortTimeFmt }}</time></a> </div> <div class="prose dark:prose-invert"> {{ $c.Body | markdown }} </div> </div> {{ end }}
{{ if eq $lastIdx .RoundNumber }} {{ block "mergeStatus" $ }} {{ end }} {{ block "resubmitStatus" $ }} {{ end }} {{ end }}
{{ if $.LoggedInUser }} {{ template "repo/pulls/fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck "Stack" $.Stack) }} {{ else }} <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white"> <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> <a href="/login" class="underline">login</a> to join the discussion </div> {{ end }} </div> </details> <hr class="md:hidden border-t border-gray-300 dark:border-gray-600"/> {{ end }} {{ end }}{{ end }}
{{ define "mergeStatus" }} {{ if .Pull.State.IsClosed }} <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex items-center gap-2 text-black dark:text-white"> {{ i "ban" "w-4 h-4" }} <span class="font-medium">closed without merging</span > </div> </div> {{ else if .Pull.State.IsMerged }} <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300"> {{ i "git-merge" "w-4 h-4" }} <span class="font-medium">pull request successfully merged</span > </div> </div> {{ else if .Pull.State.IsDeleted }} <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> {{ i "git-pull-request-closed" "w-4 h-4" }} <span class="font-medium">This pull has been deleted (possibly by jj abandon or jj squash)</span> </div> </div> {{ else if and .MergeCheck .MergeCheck.Error }} <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex items-center gap-2 text-red-500 dark:text-red-300"> {{ i "triangle-alert" "w-4 h-4" }} <span class="font-medium">{{ .MergeCheck.Error }}</span> </div> </div> {{ else if and .MergeCheck .MergeCheck.IsConflicted }} <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex flex-col gap-2 text-red-500 dark:text-red-300"> <div class="flex items-center gap-2"> {{ i "triangle-alert" "w-4 h-4" }} <span class="font-medium">merge conflicts detected</span> </div> {{ if gt (len .MergeCheck.Conflicts) 0 }} <ul class="space-y-1"> {{ range .MergeCheck.Conflicts }} {{ if .Filename }} <li class="flex items-center"> {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} <span class="font-mono">{{ .Filename }}</span> </li> {{ else if .Reason }} <li class="flex items-center"> {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }} <span>{{.Reason}}</span> </li> {{ end }} {{ end }} </ul> {{ end }} </div> </div> {{ else if .MergeCheck }} <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex items-center gap-2 text-green-500 dark:text-green-300"> {{ i "circle-check-big" "w-4 h-4" }} <span class="font-medium">no conflicts, ready to merge</span> </div> </div> {{ end }}{{ end }}
{{ define "resubmitStatus" }} {{ if .ResubmitCheck.Yes }} <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit"> <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300"> {{ i "triangle-alert" "w-4 h-4" }} <span class="font-medium">this branch has been updated, consider resubmitting</span> </div> </div> {{ end }}{{ end }}
{{ define "commits" }}{{ end }}