@@ -197,8 +197,8 @@ sub startup {

       $r->get('/raw/:rev/(*file)', {file => undef})->to('controller#raw');

       # Archive

-      $r->get('/archive/(#rev).tar.gz')->name('archive')->to(archive_type => 'tar');

-      $r->get('/archive/(#rev).zip')->name('archive')->to(archive_type => 'zip');

+      $r->get('/archive/(:rev).(tar.gz')->name('archive')->to(archive_type => 'tar');

+      $r->get('/archive/(:rev).zip')->name('archive')->to(archive_type => 'zip');

       # Compare

       $r->get('/compare/(#rev1)...(#rev2)')->name('compare');

@@ -504,37 +504,66 @@ sub difftree {

   return $diffs;

 }

-sub no_merged_branches {

-  my ($self, $user, $project) = @_;

-  

-  return $self->branches($user, $project, {no_merged => 1});

-}

-

 sub branches {

   my ($self, $user, $project, $opts) = @_;

-  # Command "git branch --no-merged"

+  # No merged branches

+  my $no_merged_branches_h = {};

+  {

+    my @cmd = $self->cmd($user, $project, 'branch');

+    push @cmd, , '--no-merged';

+    open my $fh, '-|', @cmd or return;

+    

+    while (my $branch_name = $self->_dec(scalar <$fh>)) {

+      $branch_name =~ s/^\*//;

+      $branch_name =~ s/^\s*//;

+      $branch_name =~ s/\s*$//;

+      $no_merged_branches_h->{$branch_name} = 1;

+    }

+  }

+  

+  # All branches

   my @cmd = $self->cmd($user, $project, 'branch');

-  push @cmd, , '--no-merged' if $opts->{no_merged};

   open my $fh, '-|', @cmd or return;

-  

-  my @branch_names

-    = map { s/^\*//; s/^\s*//; s/\s*$//; $self->_dec($_) } <$fh>;

-  close $fh or croak qq/Can't open "git branch"/;

-  

-  # Branches

   my $branches = [];

-  for my $branch_name (@branch_names) {

+  while (my $branch_name = $self->_dec(scalar <$fh>)) {

+    $branch_name =~ s/^\*//;

+    $branch_name =~ s/^\s*//;

+    $branch_name =~ s/\s*$//;

+    

     my $branch = {};

     $branch->{name} = $branch_name;

     my $commit = $self->get_commit($user, $project, $branch_name);

     $branch->{commit} = $commit;

+    $branch->{no_merged} = 1 if $no_merged_branches_h->{$branch_name};

     push @$branches, $branch;

   }

   return $branches;

 }

+sub branches_count {

+  my ($self, $user, $project) = @_;

+  

+  my @cmd = $self->cmd($user, $project, 'branch');

+  open my $fh, '-|', @cmd or return;

+  my @branches = <$fh>;

+  my $branches_count = @branches;

+  

+  return $branches_count;

+}

+

+sub no_merged_branches_count {

+  my ($self, $user, $project) = @_;

+  

+  my @cmd = $self->cmd($user, $project, 'branch', '--no-merged');

+  open my $fh, '-|', @cmd or return;

+  my @branches = <$fh>;

+  my $branches_count = @branches;

+  

+  return $branches_count;

+}

+

 sub id_by_path {

   my ($self, $user, $project, $rev, $path, $type) = @_;

@@ -7,6 +7,7 @@

   my $project = param('project');

   my $rev = param('rev');

   my $archive_type = stash('archive_type');

+  

   my $content_type;

   my $format;

   my $ext;

@@ -1,64 +0,0 @@

-<%

-  # API

-  my $api = gitprep_api;

-  

-  # Parameters

-  my $project = param('project');

-  my $diff = param('diff');

-  my $file = param('file');

-  my $from_file = param('from-file');

-  $from_file = $file unless defined $from_file;

-  my $from_id;

-  my $id;

-  if ($diff =~ /\.\./) { ($from_id, $id) = $diff =~ /(.+)\.\.(.+)/ }

-  else { $id = $diff }

-  

-  # Git

-  my $git = $self->app->git;

-

-  # Get blob diff

-  my @cmd = $git->cmd(

-    $user,

-    $project,

-    'diff',

-    '-r',

-    '-M',

-    '-p',

-    $from_id,

-    $id,

-    '--',

-    $from_file,

-    $file

-  );

-  open my $fh, '-|', @cmd

-    or $api->croak("Open git-diff-tree failed");

-  

-  # Lines

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

-  close $fh;

-  my $lines = $git->parse_blobdiff_lines(\@lines);

-  

-  # Commit

-  my $commit = $git->get_commit($user, $project, $id);

-  

-  # Variables for included templates

-  stash(

-    lines => $lines,

-    from_id => $from_id,

-    from_file => $from_file,

-    id => $id

-  );

-%>

-

-% layout 'common';

-  

-  %= include '/include/header', title => 'Blob diff', project => $project;

-

-  <div class="container">

-    %= include '/include/project_header';

-    %= include '/include/code_menu', display => 'files';

-    %= include '/include/page_path', Path => $file, type => 'blob';

-    %= include '/include/blobdiff_body';

-  </div>

-  

-  %= include '/include/footer';

@@ -15,10 +15,38 @@

   $default_branch->{commit} = $git->get_commit($user, $project, $default_branch->{name});

   # No merged branches

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

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

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

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

+  my $merged_branches_count = $branches_count - $no_merged_branches_count - 1;

 %>

 % layout 'common';

+

+  %= javascript begin

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

+      

+      // Swich merged branch or not merged branch

+      var display_no_merged = true;

+      $('#toggle-branch').on('click', function () {

+        if (display_no_merged) {

+          $(this).text('View unmerged branches');

+          $('#no-merged-branch-message').hide();

+          $('#merged-branch-message').show();

+          $('.no-merged-branch').css('display', 'none');

+          $('.merged-branch').css('display', 'inline');

+        }

+        else {

+          $(this).text('View merged branches');

+          $('#no-merged-branch-message').show();

+          $('#merged-branch-message').hide();

+          $('.no-merged-branch').css('display', 'inline');

+          $('.merged-branch').css('display', 'none');

+        }

+        display_no_merged = !display_no_merged;

+      });

+    });

+  % end

   %= include '/include/header';

@@ -29,7 +57,15 @@

     <h3>Branches</h3>

     <div class="muted">

-      Showing <%= @$branches %> branches not merged into master

+      Showing

+      <span id="no-merged-branch-message">

+         <%= $no_merged_branches_count %> branches not merged

+      </span>

+      <span style="display:none" id="merged-branch-message">

+        <%= $merged_branches_count %> branches merged

+      </span>

+      into <%= $default_branch->{name} %>.

+      <a id="toggle-branch" href="#">View merged branches</a>

     </div>

     <div class="bk-black" style="padding:5px">

       <div class="row">

@@ -48,7 +84,7 @@

             </span>

           </div>

         </div>

-        <div class="span3 offset1-mini text-right font-white" style="padding-top:10px">

+        <div class="text-right font-white" style="padding-top:10px">

           Base branch

         </div>

       </div>

@@ -57,7 +93,7 @@

       % my $branch = $branches->[$i];

       % my $bname = $branch->{name};

       % next if $bname eq $default_branch->{name};

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

+      <div class="<%= $branch->{no_merged} ? 'no-merged-branch' : 'merged-branch' %> border-bottom-gray" style="padding:5px">

         <div class="row">

           <div class="span8">

             <div>

@@ -99,13 +99,13 @@

         % for my $date (reverse sort keys %$commits_date) {

           % my $commits = $commits_date->{$date};

-          <div class="bk-gray-light border-gray padding5" style="border-bottom:none">

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

             <%= $date %>

           </div>

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

             % for my $commit (sort {$b->{author_epoch} <=> $a->{author_epoch}} @$commits) {

-              <div class="border-gray padding5">

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

                 <div class="row">

                   <div class="span2">

                     <%= $commit->{author_name} %>

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

   my $rev = stash('rev');

   $rev = app->manager->default_branch($user, $project)

     unless defined $rev;

-  my $branches_count = @{app->git->no_merged_branches($user, $project)};

+  my $branches_count = app->git->branches_count($user, $project);

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

 %>

@@ -2,6 +2,7 @@

   my $api = gitprep_api;

   my $logined = $api->logined;

   my $user_is_valid = $logined && $user eq session('user');

+  my $default_branch = app->manager->default_branch($user, $project);

   my $git = app->git;

@@ -212,7 +213,7 @@

         Default Branch

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

         % my $branch_names = [map { $_->{name} } @$branches];

-        % push @$branch_names, 'master' unless @$branch_names;

+        % push @$branch_names, $default_branch->{name} unless @$branch_names;

         %= select_field 'default_branch' => $branch_names, style => 'margin-top:5px';

       </div>

     </div>

@@ -122,7 +122,7 @@

     </h3>

     % if ($state eq 'display') {

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

-        <a class="btn" style="padding:3px 6px;margin-left:10px" href="<%= url_for("/$user/$project/archive/master.zip") %>">

+        <a class="btn" style="padding:3px 6px;margin-left:10px" href="<%= url_for("/$user/$project/archive/$rev.zip") %>">

           <i class="icon-arrow-down"></i>ZIP

         </a>

         <div class="input-append" style="margin-top:10px">

@@ -144,7 +144,7 @@

           <a href="<%= url_for %>"><%= $project %></a>

         </div>

         <div class="text-right">

-          <a href="<%= url_for("/$user/$project/commits/master") %>">

+          <a href="<%= url_for("/$user/$project/commits/$rev") %>">

             <%= $commits_number %> commits

           </a>

         </div>

@@ -169,3 +169,14 @@ note 'raw page';

   my $content = decode('UTF-8', $content_binary);

   like($content, qr/あああ/);

 }

+

+note 'Aarchive';

+{

+  # Archive zip

+  $t->get_ok("/$user/$project/archive/t1.zip");

+  $t->content_type_is('application/zip');

+  

+  # Archice tar.gz

+  $t->get_ok("/$user/$project/archive/t1.tar.gz");

+  $t->content_type_is('application/x-tar');

+}