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>

diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
index 2dcad2ba9d03fc9e0bdb9514eb60864432da8745..4408d5257566b139719fc90675c23b1a208ff146 100644 (file)
--- a/templates/repo/diff/box.tmpl
+++ b/templates/repo/diff/box.tmpl
@@ -49,9 +49,7 @@
                                                        {{svg "octicon-chevron-down" 18}}
                                                </a>
                                                <div class="bold ui left df ac">
-                                                       {{if not $file.IsRenamed}}
-                                                               {{template "repo/diff/stats" dict "file" . "root" $}}
-                                                       {{end}}
+                                                       {{template "repo/diff/stats" dict "file" . "root" $}}
                                                </div>
                                                <span class="file mono">{{$file.Name}}</span>
                                                <div class="diff-file-header-actions df ac">
@@ -87,7 +85,7 @@
                                                        <div class="bold df ac">
                                                                {{if $file.IsBin}}
                                                                        {{$.i18n.Tr "repo.diff.bin"}}
-                                                               {{else if not $file.IsRenamed}}
+                                                               {{else}}
                                                                        {{template "repo/diff/stats" dict "file" . "root" $}}
                                                                {{end}}
                                                        </div>
@@ -113,11 +111,10 @@
                                                </div>
                                        </h4>
                                        <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}}">
-                                                               {{if $file.IsBin}}
+                                               <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}}
                                                                <div class="diff-file-body binary" style="padding: 5px 10px;">{{$.i18n.Tr "repo.diff.bin_not_shown"}}</div>
-                                                               {{else}}
+                                                       {{else}}
                                                                <table class="chroma">
                                                                        {{if $.IsSplitStyle}}
                                                                                {{template "repo/diff/section_split" dict "file" . "root" $}}
@@ -125,9 +122,9 @@
                                                                                {{template "repo/diff/section_unified" dict "file" . "root" $}}
                                                                        {{end}}
                                                                </table>
-                                                               {{end}}
-                                                       </div>
-                                                       {{if or $isImage $isCsv}}
+                                                       {{end}}
+                                               </div>
+                                               {{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">
                                                                <table class="chroma w-100">
                                                                        {{if $isImage}}
@@ -137,7 +134,6 @@
                                                                        {{end}}
                                                                </table>
                                                        </div>
-                                                       {{end}}
                                                {{end}}
                                        </div>
                                </div>