@@ -3,11 +3,12 @@

   my $from_rev = stash('from_rev');

   my $diff_tree = stash('diff_tree');

   my $blob_diff = stash('blob_diff');

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

+  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 = $blob_diff->{status} || '';

 %>

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

@@ -33,7 +34,7 @@

       </div>

     </div>

     <table class="border-gray" style="border-top:none">

-      % if ($lines) {

+      % if (@$lines) {

         % for my $line (@$lines) {

           % my $class = $line->{class};

           % my $value = $line->{value};

@@ -87,7 +88,11 @@

         % }

       % } else {

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

-          No changes.

+          % if ($status eq 'R') {

+            File renamed without changes.

+          % } else {

+            No changes.

+          % }

         </div>

       % }

     </table>

@@ -15,9 +15,11 @@

     $from_rev,

     $parents

   );

+

   my $diff_trees_h = {};

   for my $diff_tree (@$diff_trees) {

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

+    my $file = $diff_tree->{to_file};

+    $file = $diff_tree->{from_file} unless defined $file;

     $diff_trees_h->{$file} = $diff_tree if defined $file;

   }

@@ -75,7 +77,6 @@

 % for my $file (sort keys %$diff_trees_h) {

   <div id="diff-<%= $num %>">

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

-    % $blob_diff ||= {status => 'A', file => $file};

     %= include '/include/blob_diff_body', blob_diff => $blob_diff, diff_tree => $diff_trees_h->{$file};

   </div>

   % $num++;

@@ -5,9 +5,13 @@

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

   my $diff_line_count = $add_line_count + $delete_line_count;

   my $diff_count_text;

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

+  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;

@@ -20,6 +24,9 @@

     $add_block_count = 5;

     $delete_block_count = 0;

   }

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

+    $add_block_count = 5;

+  }

   if ($diff_tree->{status} eq 'D') {

     $add_block_count = 0;

     $delete_block_count = 5;

@@ -46,6 +46,20 @@

     height:9px;

     font-size:11px;

   }

+

+  .file-renamed {

+    color:#677a85;

+    border:2px #677a85 solid;

+    margin-left:3px;

+    font-weight:bold;

+    line-height:0;

+    display:table-cell;

+    text-align:center;

+    vertical-align:middle;

+    width:9px;

+    height:9px;

+    font-size:7px;

+  }

 % end

 <table style="margin-bottom:10px;width:100%">

@@ -138,13 +152,13 @@

         % 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 0; width:12px">

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

           % if ($status eq 'A') {

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

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

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

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

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

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

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

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

             % if ($from_mode != $mode) {

               <span>

                 [

@@ -162,27 +176,30 @@

                 ]

               </span>

             % }

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

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

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

+            <div class="file-copied" title="copied">→</div>

+          % }

+        </td>

+        <td>

+          % if ($status eq 'A' || $status eq 'M' || $status eq 'D') {

+            <a style="margin-left:5px" href="#<%= "diff-$num" %>"><%= $file %></a>

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

+            

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

-            % my $status_name = $status eq 'R' ? 'moved' : 'copied';

-

-            % my $mode_change = "";

+            % my $mode_change;

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

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

             % }

-            <span>

-              [

-                <%= $status_name %> from

-                <a href="#"><%= $diff_tree->{from_file} %></a>

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

-                <%= $mode_change %>

-              ]

-            </span>

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

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

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

+            % }

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

           % }

         </td>

-        <td>

-          <a style="margin-left:5px" href="#<%= "diff-$num" %>"><%= $file %></a>

-        </td>

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

           %= include '/include/diff_status_bar', diff_tree => $diff_tree, fragment => "diff-$num";

         </td>

@@ -105,8 +105,20 @@ 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"/);

   }

+  note 'rename';

+  {

+    $t->get_ok("/$user/$project/commit/15ea9d711617abda5eed7b4173a3349d30bca959");

+    $t->content_like(qr/File renamed without changes/);

+    $t->content_like(qr/a.txt → a_renamed.txt/);

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

+  }

+  

+

+  

   note 'Branch name';

   {

     # Page access (branch name)