@@ -3,12 +3,14 @@

   my $from_rev = stash('from_rev');

   my $diff_tree = stash('diff_tree');

   my $blob_diff = stash('blob_diff');

+  my $from_mode_str = $diff_tree->{from_mode_str};

+  my $to_mode_str = $diff_tree->{to_mode_str};

   my $lines = $blob_diff->{lines} || [];

   my $file = $blob_diff->{file};

   $file = '' unless defined $file;

   my $from_file = $blob_diff->{from_file};

   $from_file = $file unless defined $from_file;

-  my $status = $blob_diff->{status} || '';

+  my $status = $diff_tree->{status} || '';

 %>

   <div style="margin-bottom:20px;">

@@ -19,6 +21,9 @@

             %= include '/include/diff_status_bar', diff_tree => $diff_tree;

           </div>

           <%= $file %>

+          % if ($status ne 'A' && $status ne 'D' && $from_mode_str ne $to_mode_str) {

+            <%= "100$from_mode_str → 100$to_mode_str" %>

+          % }

         </div>

         <div class="text-right">

           % if ($status eq 'D') {

@@ -90,8 +95,10 @@

         <div class="border-gray" style="padding:10px;margin-bottom:30px;border-top:none">

           % if ($status eq 'R') {

             File renamed without changes.

-          % } else {

-            No changes.

+          % } elsif ($status eq 'A' || $status eq 'D') {

+             No changes.

+          % } elsif ($from_mode_str ne $to_mode_str) {

+            File mode changed.

           % }

         </div>

       % }

@@ -6,16 +6,9 @@

   my $diff_line_count = $add_line_count + $delete_line_count;

   my $diff_count_text;

   my $status = $diff_tree->{status};

-  if ($status eq 'A' && $add_line_count == 0) {

-    $diff_count_text = 'Empty file added';

-  }

-  elsif ($diff_tree->{status} eq 'R' && $add_line_count == 0 && $delete_line_count == 0) {

-    $diff_count_text = 'Empty file renamed';

-  }

-  else {

-    $diff_count_text = "$add_line_count additions";

-    $diff_count_text .= " & $delete_line_count deletions" if $delete_line_count > 0;

-  }

+

+  $diff_count_text = "$add_line_count additions";

+  $diff_count_text .= " & $delete_line_count deletions" if $delete_line_count > 0;

   my $tag = $fragment ? 'a' : 'span';

   my $add_block_count = $diff_tree->{add_block_count} || 0;

   my $delete_block_count = $diff_tree->{delete_block_count} || 0;

@@ -148,10 +148,7 @@

         % my $mode_str = $diff_tree->{to_mode_str};

         % my $mode_oct = $diff_tree->{to_mode_oct};

         % my $from_file = $diff_tree->{from_file};

-        % my $from_file_type = $diff_tree->{from_file_type};

-        % my $from_mode = $diff_tree->{from_mode};

         % my $from_mode_str = $diff_tree->{from_mode_str};

-        % my $from_mode_oct = $diff_tree->{from_mode_oct};

         <td style="padding:7px 5px 7px 0; width:12px">

           % if ($status eq 'A') {

             <div class="file-add" title="added">+</div>

@@ -159,23 +156,6 @@

             <div class="file-del" title="deleted">-</div>

           % } elsif ($status eq 'M' || $status eq 'T') {

             <div class="file-modified" title="modified">●</div>

-            % if ($from_mode != $mode) {

-              <span>

-                [

-                  changed

-                  % if ($from_file_type ne $file_type) {

-                    from <%= $from_file_type %> to <%= $file_type %>

-                  % }

-                  % if (($from_mode_oct & 0777) != ($mode_oct & 0777)) {

-                    % if ($from_mode_str && $mode_str) {

-                      mode: <%= $from_mode_str %>-><%= $mode_str %>

-                    % } elsif ($mode_str) {

-                      mode: <%= $mode_str %>

-                    % }

-                  % }

-                ]

-              </span>

-            % }

           % } elsif ($status eq 'R') {

             <div class="file-renamed" title="renamed">▶</div>

           % } elsif ($status eq 'C') {

@@ -188,16 +168,14 @@

           % } elsif ($status eq 'T') {

           % } elsif ($status eq 'R' || $status eq 'C') {

-            % my $mode_change;

-            % if ($diff_tree->{'from_mode'} != $diff_tree->{'to_mode'}) {

-              % $mode_change = sprintf(", mode: %04o", oct $diff_tree->{to_mode} & 0777);

-            % }

             <a href="#<%= "diff-$num" %>"><%= $diff_tree->{from_file} %> → <%= $file %></a>

             % unless ($diff_tree->{similarity} == 100) {

               with <%= $diff_tree->{similarity} %>

             % }

-            <%= $mode_change || '' %>

+          % }

+          % if ($status ne 'A' && $status ne 'D' && $from_mode_str ne $mode_str) {

+            <%= "100$from_mode_str → 100$mode_str" %>

           % }

         </td>

         <td style="text-align:right">

@@ -105,7 +105,6 @@ note 'Commit page';

     # Empty file is added

     $t->content_like(qr/No changes/);

-    $t->content_like(qr/Empty file added/);

     $t->content_like(qr/class="file-add"/);

   }