Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show diff on rename with diff changes (#15338) 

More recent versions of git have increased support for detection of renames meaning
that a rename with diff changes is now supported.

Although ParsePatch supports this - our templates do not and the simplest solution
is simply to show the diff.

Fix #15335

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
zeripath 2021-04-08 20:35:36 +01:00 committed by GitHub
parent b62bd8e7c0
commit f544414a23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
templates/repo/diff/box.tmpl
View File

@ -49,9 +49,7 @@
{{svg "octicon-chevron-down" 18}} {{svg "octicon-chevron-down" 18}}
</a> </a>
<div class="bold ui left df ac"> <div class="bold ui left df ac">
{{if not $file.IsRenamed}} {{template "repo/diff/stats" dict "file" . "root" $}}
{{template "repo/diff/stats" dict "file" . "root" $}}
{{end}}
</div> </div>
<span class="file mono">{{$file.Name}}</span> <span class="file mono">{{$file.Name}}</span>
<div class="diff-file-header-actions df ac"> <div class="diff-file-header-actions df ac">
@ -87,7 +85,7 @@
<div class="bold df ac"> <div class="bold df ac">
{{if $file.IsBin}} {{if $file.IsBin}}
{{$.i18n.Tr "repo.diff.bin"}} {{$.i18n.Tr "repo.diff.bin"}}
{{else if not $file.IsRenamed}} {{else}}
{{template "repo/diff/stats" dict "file" . "root" $}} {{template "repo/diff/stats" dict "file" . "root" $}}
{{end}} {{end}}
</div> </div>
@ -113,11 +111,10 @@
</div> </div>
</h4> </h4>
<div class="diff-file-body ui attached unstackable table segment"> <div class="diff-file-body ui attached unstackable table segment">
{{if ne $file.Type 4}} <div id="diff-source-{{$i}}" class="file-body file-code has-context-menu code-diff{{if $.IsSplitStyle}} code-diff-split{{else}} code-diff-unified{{end}}">
<div id="diff-source-{{$i}}" class="file-body file-code has-context-menu code-diff{{if $.IsSplitStyle}} code-diff-split{{else}} code-diff-unified{{end}}"> {{if $file.IsBin}}
{{if $file.IsBin}}
<div class="diff-file-body binary" style="padding: 5px 10px;">{{$.i18n.Tr "repo.diff.bin_not_shown"}}</div> <div class="diff-file-body binary" style="padding: 5px 10px;">{{$.i18n.Tr "repo.diff.bin_not_shown"}}</div>
{{else}} {{else}}
<table class="chroma"> <table class="chroma">
{{if $.IsSplitStyle}} {{if $.IsSplitStyle}}
{{template "repo/diff/section_split" dict "file" . "root" $}} {{template "repo/diff/section_split" dict "file" . "root" $}}
@ -125,9 +122,9 @@
{{template "repo/diff/section_unified" dict "file" . "root" $}} {{template "repo/diff/section_unified" dict "file" . "root" $}}
{{end}} {{end}}
</table> </table>
{{end}} {{end}}
</div> </div>
{{if or $isImage $isCsv}} {{if or $isImage $isCsv}}
<div id="diff-rendered-{{$i}}" class="file-body file-code has-context-menu{{if $.IsSplitStyle}} code-diff-split{{else}} code-diff-unified{{end}} hide"> <div id="diff-rendered-{{$i}}" class="file-body file-code has-context-menu{{if $.IsSplitStyle}} code-diff-split{{else}} code-diff-unified{{end}} hide">
<table class="chroma w-100"> <table class="chroma w-100">
{{if $isImage}} {{if $isImage}}
@ -137,7 +134,6 @@
{{end}} {{end}}
</table> </table>
</div> </div>
{{end}}
{{end}} {{end}}
</div> </div>
</div> </div>