@@ -8,6 +8,7 @@ use File::Basename qw/basename dirname/;

 use File::Copy 'move';

 use File::Find 'find';

 use File::Path qw/mkpath rmtree/;

+use POSIX 'floor';

 # Attributes

 has 'bin';

@@ -210,19 +211,27 @@ sub blob_diffs {

       or croak('Open self-diff-tree failed');

     my @lines = map { $self->_dec($_) } <$fh>;

     close $fh;

+    my ($lines, $diff_info) = $self->parse_blob_diff_lines(\@lines);

     my $blob_diff = {

       file => $file,

       from_file => $from_file,

-      lines => $self->parse_blob_diff_lines(\@lines)

+      lines => $lines,

+      add_line_count => $diff_info->{add_line_count},

+      delete_line_count => $diff_info->{delete_line_count}

     };

-    # Status

+    # Diff tree info

     for my $diff_tree (@$diff_trees) {

       if ($diff_tree->{to_file} eq $file) {

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

+        $diff_tree->{add_line_count} = $diff_info->{add_line_count};

+        $diff_tree->{delete_line_count} = $diff_info->{delete_line_count};

+        $diff_tree->{add_block_count} = $diff_info->{add_block_count};

+        $diff_tree->{delete_block_count} = $diff_info->{delete_block_count};

         last;

       }

     }

+    

     push @$blob_diffs, $blob_diff;

   }

@@ -453,6 +462,8 @@ sub description {

 sub diff_tree {

   my ($self, $user, $project, $cid, $parent, $parents) = @_;

+  $parents = [] unless $parents;

+  

   # Root

   $parent = '--root' unless defined $parent;

@@ -1005,6 +1016,8 @@ sub parse_blob_diff_lines {

   my @lines;

   my $next_before_line_num;

   my $next_after_line_num;

+  my $add_line_count = 0;

+  my $delete_line_count = 0;

   for my $line (@$lines) {

     chomp $line;

@@ -1026,11 +1039,13 @@ sub parse_blob_diff_lines {

       $class = 'from_file';

       $before_line_num = $next_before_line_num++;

       $after_line_num = '';

+      $delete_line_count++;

     }

     elsif ($line =~ /^\+/) {

       $class = 'to_file';

       $before_line_num = '';

       $after_line_num = $next_after_line_num++;

+      $add_line_count++;

     }

     elsif ($line =~ /^Binary files/) { $class = 'binary_file' }

     elsif ($line =~ /^ /) {

@@ -1049,7 +1064,24 @@ sub parse_blob_diff_lines {

     push @lines, $line_data;

   }

-  return \@lines;

+  # Diff info

+  my $diff_line_count = $add_line_count + $delete_line_count;

+  my $add_block_count

+    = $diff_line_count == 0

+    ? 0

+    : floor(($add_line_count * 5) / $diff_line_count);

+  my $delete_block_count

+    = $diff_line_count == 0

+    ? 0

+    : floor(($delete_line_count * 5) / $diff_line_count);

+  

+  my $diff_info = {

+    add_line_count => $add_line_count,

+    delete_line_count => $delete_line_count,

+    add_block_count => $add_block_count,

+    delete_block_count => $delete_block_count

+  };

+  return (\@lines, $diff_info);

 }

 sub get_commit {

@@ -26,28 +26,6 @@

   $commit->{committer_date} = $git->timestamp($committer_date);

   $from_id = $commit->{parent} unless defined $from_id;

-  # Diff tree

-  my $diff_trees = $git->diff_tree(

-    $user,

-    $project,

-    $id,

-    $commit->{parent},

-    $commit->{parents}

-  );

-  my $diff_trees_h = {};

-  for my $diff_tree (@$diff_trees) {

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

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

-  }

-  

-  # Get blob diffs

-  my $blob_diffs = $git->blob_diffs($user, $project, $from_id, $id, $diff_trees) || [];

-  my $blob_diffs_h = {};

-  for my $blob_diff (@$blob_diffs) {

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

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

-  }

-  

   # Branches

   my $branch_refs = $git->references($user, $project, 'heads');

   my $branches = $branch_refs->{$commit->{id}} || [];

@@ -58,36 +36,16 @@

   # Global variable for included template

   stash(

-    from_id => $from_id,

     id => $id,

+    from_id => $from_id,

     rev => $id,

-    commit => $commit

+    commit => $commit,

+    parents => $commit->{parents}

   );

 %>

 % layout 'common';

-  

-  %= javascript begin

-    $(document).ready(function () {

-    

-      // Diff Stats Button

-      var diff_tree_show = false;

-      var original_diff_stats_btn_text = $('#diff-stats-btn').text();

-      

-      $('#diff-stats-btn').on('click', function () {

-        if (diff_tree_show) {

-          $(this).text(original_diff_stats_btn_text);

-          $('#diff_tree').css('display', 'none');

-        }

-        else {

-          $(this).text('Hide Diff Stats');

-          $('#diff_tree').css('display', 'block');

-        }

-        diff_tree_show = !diff_tree_show;

-      });

-    });

-  % end

-  

+

   %= include '/include/header', title => 'Commit diff';

   <div class="container">

@@ -173,41 +131,7 @@

         </div>

       </div>

     </div>

-

-    <div class="row" style="margin-bottom:10px">

-      <div class="span8" style="padding-top:5px">

-        Showing <b><%= @$diff_trees %> changed files</b>

-      </div>

-      <div class="text-right">

-        <button id="diff-stats-btn" class="btn">Show Diff Stats</button>

-      </div>

-    </div>

-    <div id="diff_tree" style="display:none">

-      <%= include '/include/diff_tree', id => $commit->{id}, from_id => $commit->{parent},

-        diff_trees => $diff_trees, parents => $commit->{parents}, project_ns => $project %>

-    </div>

-    % my $num = 0;

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

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

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

-        % if ($blob_diff) {

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

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

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

-          % $from_file = $file unless defined $from_file;

-          % my $status = $blob_diff->{status};

-          %= include '/include/blob_diff_body', file => $file, from_file => $from_file, status => $status, lines => $blob_diff->{lines}, project_ns => $project;

-        % } else {

-          <div class="border-gray bk-gray-light" style="border-bottom:none;padding:10px">

-            <%= $file %>

-          </div>

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

-            No changes. Empty file is added.

-          </div>

-        % }

-      </div>

-      % $num++;

-    % }

-  </div>

+  

+  %= include '/include/commit_body';

   %= include '/include/footer';

@@ -37,30 +37,15 @@

     return;

   }

-  # Diff tree

-  my $diff_trees = $git->diff_tree(

-    $user,

-    $project,

-    $end_commit->{id},

-    $start_commit->{id},

-    []

-  );

-  

-  # Get blob diffs (command "git diff-tree")

-  my $blob_diffs = $git->blob_diffs(

-    $user,

-    $project,

-    $start_commit->{id},

-    $end_commit->{id},

-    $diff_trees

-  );

-  

   # Branches

   my $branches = $git->branches($user, $project);

   @$branches = sort { $a->{commit}{age} <=> $b->{commit}{age} } @$branches;

   # Global variables

-  stash(user => $user, project => $project);

+  stash(

+    id => $end_commit->{id},

+    from_id => $start_commit->{id},

+  );

 %>

 % layout 'common';

@@ -239,29 +224,7 @@

         </div>

         <div class="tab-pane" id="file-changed">

-          <div style="margin-bottom:5px">

-            Showing <b><%= @$diff_trees %> changed files</b>

-          </div>

-          <div>

-            <%= include '/include/diff_tree', id => $end_commit->{id}, from_id => $start_commit->{id},

-              diff_trees => $diff_trees, parents => [], project_ns => $project %>

-          </div>

-          <div>

-            <div>

-              % my $num = 0;

-              % for (my $i = 0; $i < @$blob_diffs; $i++) {

-                % my $blob_diff = $blob_diffs->[$i];

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

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

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

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

-                  % $from_file = $file unless defined $from_file;

-                  % my $status = $blob_diff->{status};

-                  %= include '/include/blob_diff_body', file => $file, from_file => $from_file, status => $status, lines => $blob_diff->{lines}, project_ns => $project, from_id => $start_commit->{id}, id => $end_commit->{id};

-                </div>

-              % }

-            </div>

-          </div>

+          %= include '/include/commit_body';

         </div>

       </div>

     % } else {

@@ -1,11 +1,15 @@

 <%

   my $status = stash('status') || '';

+  my $diff_tree = stash('diff_tree');

 %>

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

   <div class="border-gray bk-gray-light" style="padding:5px">

     <div class="row">

-      <div class="span8" style="padding-top:6px">

+      <div class="span8" style="padding-top:3px">

+        <div class="radius-top radius-bottom" style="padding:1px 3px;margin-right:5px;border:1px solid #ccc;display:inline-block;background:#f7f7f7">

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

+        </div>

         <%= $file %>

       </div>

       <div class="text-right">

@@ -0,0 +1,88 @@

+<%

+  # Parameters

+  my $id = stash('id');

+  my $from_id = stash('from_id');

+  my $parents = stash('parents');

+  

+  # Git

+  my $git = app->git;

+  

+  # Diff tree

+  my $diff_trees = $git->diff_tree(

+    $user,

+    $project,

+    $id,

+    $from_id,

+    $parents

+  );

+  my $diff_trees_h = {};

+  for my $diff_tree (@$diff_trees) {

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

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

+  }

+  

+  # Get blob diffs

+  my $blob_diffs = $git->blob_diffs($user, $project, $from_id, $id, $diff_trees) || [];

+  my $blob_diffs_h = {};

+  for my $blob_diff (@$blob_diffs) {

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

+    $blob_diffs_h->{$file} = $blob_diff;

+  }

+%>

+

+%= javascript begin

+  $(document).ready(function () {

+  

+    // Diff Stats Button

+    var diff_tree_show = false;

+    var original_diff_stats_btn_text = $('#diff-stats-btn').text();

+    

+    $('#diff-stats-btn').on('click', function () {

+      if (diff_tree_show) {

+        $(this).text(original_diff_stats_btn_text);

+        $('#diff_tree').css('display', 'none');

+      }

+      else {

+        $(this).text('Hide Diff Stats');

+        $('#diff_tree').css('display', 'block');

+      }

+      diff_tree_show = !diff_tree_show;

+    });

+  });

+% end

+

+<div class="row" style="margin-bottom:10px">

+  <div class="span8" style="padding-top:5px">

+    Showing <b><%= @$diff_trees %> changed files</b>

+  </div>

+  <div class="text-right">

+    <button id="diff-stats-btn" class="btn">Show Diff Stats</button>

+  </div>

+</div>

+<div id="diff_tree" style="display:none">

+  <%= include '/include/diff_tree', id => $id, from_id => $from_id,

+    diff_trees => $diff_trees, parents => $parents %>

+</div>

+% my $num = 0;

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

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

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

+    % if ($blob_diff) {

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

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

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

+      % $from_file = $file unless defined $from_file;

+      % my $status = $blob_diff->{status};

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

+    % } else {

+      <div class="border-gray bk-gray-light" style="border-bottom:none;padding:10px">

+        <%= $file %>

+      </div>

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

+        No changes. Empty file is added.

+      </div>

+    % }

+  </div>

+  % $num++;

+% }

+</div>

@@ -0,0 +1,27 @@

+<%

+  my $diff_tree = stash('diff_tree');

+  my $fragment = stash('fragment');

+  my $add_line_count = $diff_tree->{add_line_count} || 0;

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

+  my $diff_line_count = $add_line_count + $delete_line_count;

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

+%>

+

+

+<<%= $tag %> title="<%= $diff_count_text %>" style="text-decoration:none;color:#666" href="#<%= $fragment %>"><%= $diff_line_count %></<%= $tag %>>

+

+<<%= $tag %> title="<%= $diff_count_text %>" style="text-decoration:none;display:inline-block;overflow:none;" href="#<%= $fragment %>">

+  % for (my $i = 0; $i < $add_block_count; $i++) {

+    <div style="display:inline-block;background:#6cc644;width:8px;height:9px;float:left;margin:1px"></div>

+  % }

+  % for (my $i = 0; $i < $delete_block_count; $i++) {

+    <div style="display:inline-block;background:#bd2c00;width:8px;height:9px;float:left;margin:1px"></div>

+  % }

+  % for (my $i = 0; $i < 5 - $add_block_count - $delete_block_count; $i++) {

+    <div style="display:inline-block;background:#eee;width:8px;height:9px;float:left;margin:1px"></div>

+  % }

+</<%= $tag %>>

@@ -1,3 +1,7 @@

+<%

+  my $parents = stash('parents') || [];

+%>

+

 %= stylesheet begin

   .file-add {

     color:#32CD32;

@@ -28,8 +32,8 @@

   }

   .file-modified {

-    color:#A9A9A9;

-    border:2px #A9A9A9 solid;

+    color:#DAA520;

+    border:2px #DAA520 solid;

     margin-left:3px;

     font-weight:bold;

     line-height:0;

@@ -38,11 +42,11 @@

     vertical-align:middle;

     width:9px;

     height:9px;

-    font-size:13px;

+    font-size:11px;

   }

 % end

-<table style="margin-bottom:10px">

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

   % my $has_header = @$diff_trees && @$parents > 1 && stash('action') eq 'commitdiff';

   % if ($has_header) {

@@ -64,7 +68,7 @@

   % my $toggle = 0;

   % my $num = 0;

   % for my $diff_tree (@$diff_trees) {

-    <tr>

+    <tr style="<%= $num + 1 ne @$diff_trees ? 'border-bottom:1px #ddd solid' : '' %>">

       % if (exists $diff_tree->{'nparents'}) {

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

@@ -132,7 +136,7 @@

         % 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>

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

           % if ($status eq 'A') {

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

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

@@ -175,7 +179,10 @@

           % }

         </td>

         <td>

-          <a style="margin-left:5px" href="<%= url_for->fragment("diff-$num") %>"><%= $file %></a>

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

       % }

     </tr>

@@ -77,6 +77,7 @@ note 'Project page';

 note 'Commit page';

 {

+  note 'first commit';

   {

     # Page access

     $t->get_ok("/$user/$project/commit/4b0e81c462088b16fefbe545e00b993fd7e6f884");

@@ -105,17 +106,20 @@ note 'Commit page';

     # Empty file is added

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

   }

+  

+  note 'Branch name';

   {

     # Page access (branch name)

     $t->get_ok("/$user/$project/commit/b1");

     $t->content_like(qr/\+bbb/);

-  }

-  {

+

     # Page access (branch name long)

     $t->get_ok("/$user/$project/commit/refs/heads/b1");

     $t->content_like(qr/\+bbb/);

     $t->content_like(qr#refs/heads/b1#);

   }

+  

+  

 }

 note 'Commits page';