2020-12-10 04:47:48 +00:00
|
|
|
{{$file := .file}}
|
2024-12-24 16:51:13 +00:00
|
|
|
{{$blobExcerptLink := print (or ctx.RootData.CommitRepoLink ctx.RootData.RepoLink) (Iif $.root.PageIsWiki "/wiki" "") "/blob_excerpt/" (PathEscape $.root.AfterCommitID) "?"}}
|
2023-04-04 11:05:07 +00:00
|
|
|
<colgroup>
|
|
|
|
<col width="50">
|
|
|
|
<col width="10">
|
|
|
|
<col width="10">
|
|
|
|
<col>
|
|
|
|
<col width="50">
|
|
|
|
<col width="10">
|
|
|
|
<col width="10">
|
|
|
|
<col>
|
|
|
|
</colgroup>
|
2020-12-10 04:47:48 +00:00
|
|
|
{{range $j, $section := $file.Sections}}
|
|
|
|
{{range $k, $line := $section.Lines}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{$hasmatch := ne $line.Match -1}}
|
|
|
|
{{if or (ne .GetType 2) (not $hasmatch)}}
|
2023-05-07 09:49:46 +00:00
|
|
|
<tr class="{{.GetHTMLDiffLineType}}-code nl-{{$k}} ol-{{$k}}" data-line-type="{{.GetHTMLDiffLineType}}">
|
2021-08-29 14:28:04 +00:00
|
|
|
{{if eq .GetType 4}}
|
2024-05-29 06:08:45 +00:00
|
|
|
{{$expandDirection := $line.GetExpandDirection}}
|
2021-08-29 14:28:04 +00:00
|
|
|
<td class="lines-num lines-num-old">
|
2024-05-29 06:08:45 +00:00
|
|
|
<div class="code-expander-buttons" data-expand-direction="{{$expandDirection}}">
|
|
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 5)}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptLink}}&{{$line.GetBlobExcerptQuery}}&style=split&direction=down&&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2021-08-29 14:28:04 +00:00
|
|
|
{{svg "octicon-fold-down"}}
|
2023-05-21 20:47:41 +00:00
|
|
|
</button>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
2024-05-29 06:08:45 +00:00
|
|
|
{{if or (eq $expandDirection 3) (eq $expandDirection 4)}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptLink}}&{{$line.GetBlobExcerptQuery}}&style=split&direction=up&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2021-08-29 14:28:04 +00:00
|
|
|
{{svg "octicon-fold-up"}}
|
2023-05-21 20:47:41 +00:00
|
|
|
</button>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
2024-05-29 06:08:45 +00:00
|
|
|
{{if eq $expandDirection 2}}
|
2024-12-24 16:51:13 +00:00
|
|
|
<button class="code-expander-button" hx-target="closest tr" hx-get="{{$blobExcerptLink}}&{{$line.GetBlobExcerptQuery}}&style=split&anchor=diff-{{$file.NameHash}}K{{$line.SectionInfo.RightIdx}}">
|
2021-08-29 14:28:04 +00:00
|
|
|
{{svg "octicon-fold"}}
|
2023-05-21 20:47:41 +00:00
|
|
|
</button>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
2023-05-21 20:47:41 +00:00
|
|
|
</div>
|
2023-09-25 12:42:40 +00:00
|
|
|
</td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale}}
|
2023-09-24 20:31:58 +00:00
|
|
|
<td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
|
2024-12-24 16:51:13 +00:00
|
|
|
<td colspan="6" class="lines-code lines-code-old">{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}}
|
|
|
|
{{$match := index $section.Lines $line.Match}}
|
2023-09-25 12:42:40 +00:00
|
|
|
{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line ctx.Locale}}{{end}}
|
|
|
|
{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match ctx.Locale}}{{end}}
|
2022-05-08 22:29:50 +00:00
|
|
|
<td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{$file.NameHash}}L{{$line.LeftIdx}}"></span></td>
|
2023-09-24 20:31:58 +00:00
|
|
|
<td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff}}"></button>{{end}}{{end}}</td>
|
2024-03-28 08:31:07 +00:00
|
|
|
<td class="lines-type-marker lines-type-marker-old del-code"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
|
2024-12-24 16:51:13 +00:00
|
|
|
<td class="lines-code lines-code-old del-code">
|
|
|
|
{{- if and $.root.SignedUserID $.root.PageIsPullFiles -}}
|
|
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">
|
|
|
|
{{- svg "octicon-plus" -}}
|
|
|
|
</button>
|
|
|
|
{{- end -}}
|
|
|
|
{{- if $line.LeftIdx -}}
|
|
|
|
{{- template "repo/diff/section_code" dict "diff" $leftDiff -}}
|
|
|
|
{{- else -}}
|
|
|
|
<code class="code-inner"></code>
|
|
|
|
{{- end -}}
|
|
|
|
</td>
|
2022-05-08 22:29:50 +00:00
|
|
|
<td class="lines-num lines-num-new add-code" data-line-num="{{if $match.RightIdx}}{{$match.RightIdx}}{{end}}"><span rel="{{if $match.RightIdx}}diff-{{$file.NameHash}}R{{$match.RightIdx}}{{end}}"></span></td>
|
2023-09-24 20:31:58 +00:00
|
|
|
<td class="lines-escape add-code lines-escape-new">{{if $match.RightIdx}}{{if $rightDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $rightDiff}}"></button>{{end}}{{end}}</td>
|
2024-03-28 08:31:07 +00:00
|
|
|
<td class="lines-type-marker lines-type-marker-new add-code">{{if $match.RightIdx}}<span class="tw-font-mono" data-type-marker="{{$match.GetLineTypeMarker}}"></span>{{end}}</td>
|
2024-12-24 16:51:13 +00:00
|
|
|
<td class="lines-code lines-code-new add-code">
|
|
|
|
{{- if and $.root.SignedUserID $.root.PageIsPullFiles -}}
|
|
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $match.CanComment)}} tw-invisible{{end}}" data-side="right" data-idx="{{$match.RightIdx}}">
|
|
|
|
{{- svg "octicon-plus" -}}
|
|
|
|
</button>
|
|
|
|
{{- end -}}
|
|
|
|
{{- if $match.RightIdx -}}
|
|
|
|
{{- template "repo/diff/section_code" dict "diff" $rightDiff -}}
|
|
|
|
{{- else -}}
|
|
|
|
<code class="code-inner"></code>
|
|
|
|
{{- end -}}
|
|
|
|
</td>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{else}}
|
2023-09-25 12:42:40 +00:00
|
|
|
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale}}
|
2022-05-08 22:29:50 +00:00
|
|
|
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
|
2023-09-24 20:31:58 +00:00
|
|
|
<td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}{{end}}</td>
|
2024-03-28 08:31:07 +00:00
|
|
|
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
|
2024-12-24 16:51:13 +00:00
|
|
|
<td class="lines-code lines-code-old">
|
|
|
|
{{- if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2)) -}}
|
|
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-left{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="left" data-idx="{{$line.LeftIdx}}">
|
|
|
|
{{- svg "octicon-plus" -}}
|
|
|
|
</button>
|
|
|
|
{{- end -}}
|
|
|
|
{{- if $line.LeftIdx -}}
|
|
|
|
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
|
|
|
|
{{- else -}}
|
|
|
|
<code class="code-inner"></code>
|
|
|
|
{{- end -}}
|
|
|
|
</td>
|
2022-05-08 22:29:50 +00:00
|
|
|
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
|
2023-09-24 20:31:58 +00:00
|
|
|
<td class="lines-escape lines-escape-new">{{if $line.RightIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}{{end}}</td>
|
2024-03-28 08:31:07 +00:00
|
|
|
<td class="lines-type-marker lines-type-marker-new">{{if $line.RightIdx}}<span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>
|
2024-12-24 16:51:13 +00:00
|
|
|
<td class="lines-code lines-code-new">
|
|
|
|
{{- if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3)) -}}
|
|
|
|
<button type="button" aria-label="{{ctx.Locale.Tr "repo.diff.comment.add_line_comment"}}" class="ui primary button add-code-comment add-code-comment-right{{if (not $line.CanComment)}} tw-invisible{{end}}" data-side="right" data-idx="{{$line.RightIdx}}">
|
|
|
|
{{- svg "octicon-plus" -}}
|
|
|
|
</button>
|
|
|
|
{{- end -}}
|
|
|
|
{{- if $line.RightIdx -}}
|
|
|
|
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
|
|
|
|
{{- else -}}
|
|
|
|
<code class="code-inner"></code>
|
|
|
|
{{- end -}}
|
|
|
|
</td>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
2020-12-10 04:47:48 +00:00
|
|
|
</tr>
|
2021-08-29 14:28:04 +00:00
|
|
|
{{if and (eq .GetType 3) $hasmatch}}
|
|
|
|
{{$match := index $section.Lines $line.Match}}
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if or $line.Comments $match.Comments}}
|
2023-05-07 09:49:46 +00:00
|
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
2022-10-25 11:11:49 +00:00
|
|
|
<td class="add-comment-left" colspan="4">
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if $line.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{if eq $line.GetCommentSide "previous"}}
|
2023-04-07 14:39:08 +00:00
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if $match.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{if eq $match.GetCommentSide "previous"}}
|
2023-04-07 14:39:08 +00:00
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
</td>
|
2022-10-25 11:11:49 +00:00
|
|
|
<td class="add-comment-right" colspan="4">
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if $line.Comments}}
|
|
|
|
{{if eq $line.GetCommentSide "proposed"}}
|
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
|
|
|
{{end}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if $match.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{if eq $match.GetCommentSide "proposed"}}
|
2023-04-07 14:39:08 +00:00
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $match.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
{{end}}
|
2023-12-04 21:48:42 +00:00
|
|
|
{{else if $line.Comments}}
|
2023-05-07 09:49:46 +00:00
|
|
|
<tr class="add-comment" data-line-type="{{.GetHTMLDiffLineType}}">
|
2022-10-25 11:11:49 +00:00
|
|
|
<td class="add-comment-left" colspan="4">
|
2023-12-04 21:48:42 +00:00
|
|
|
{{if eq $line.GetCommentSide "previous"}}
|
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
|
|
|
</td>
|
2022-10-25 11:11:49 +00:00
|
|
|
<td class="add-comment-right" colspan="4">
|
2021-08-29 14:28:04 +00:00
|
|
|
{{if eq $line.GetCommentSide "proposed"}}
|
2023-04-07 14:39:08 +00:00
|
|
|
{{template "repo/diff/conversation" dict "." $.root "comments" $line.Comments}}
|
2021-08-29 14:28:04 +00:00
|
|
|
{{end}}
|
|
|
|
</td>
|
|
|
|
</tr>
|
|
|
|
{{end}}
|
2020-12-10 04:47:48 +00:00
|
|
|
{{end}}
|
|
|
|
{{end}}
|
|
|
|
{{end}}
|