@@ -62,7 +62,7 @@ sub startup {

   $r->get('/:user/:project')->to('#project');

   # Commit

-  $r->get('/:user/:project/commit/:id')->to('#commit');

+  $r->get('/:user/:project/commit/:diff')->to('#commitdiff');

   # Commits

   $r->get('/:user/:project/commits/:rev', {id => 'HEAD'})->to('#commits');

@@ -653,6 +653,29 @@ sub latest_commit_log {

   return $commit_log;

 }

+sub parse_blobdiff_lines {

+  my ($self, $lines_raw) = @_;

+  

+  # Parse

+  my @lines;

+  for my $line (@$lines_raw) {

+    $line = $self->dec($line);

+    chomp $line;

+    my $class;

+    

+    if ($line =~ /^diff \-\-git /) { $class = 'diff header' }

+    elsif ($line =~ /^index /) { $class = 'diff extended_header' }

+    elsif ($line =~ /^\+/) { $class = 'diff to_file' }

+    elsif ($line =~ /^\-/) { $class = 'diff from_file' }

+    elsif ($line =~ /^\@\@/) { $class = 'diff chunk_header' }

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

+    else { $class = 'diff' }

+    push @lines, {value => $line, class => $class};

+  }

+  

+  return \@lines;

+}

+

 sub parse_commit {

   my ($self, $project, $id) = @_;

@@ -70,126 +70,6 @@ sub blobdiff {

   }

 }

-sub commitdiff {

-  my $self = shift;

-  

-  # Paramters

-  my $project_ns = $self->param('project');

-  my $project = "/$project_ns";

-  my $home_ns = dirname $project_ns;

-  my $home = "/$home_ns";

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

-  my ($from_id, $id) = $diff =~ /(.+)\.\.(.+)/;

-  $id = $diff unless defined $id;

-  

-  # Git

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

-  

-  # Commit

-  my $commit = $git->parse_commit($project, $id)

-    or croak 'Unknown commit object';

-  my $author_date

-    = $git->parse_date($commit->{author_epoch}, $commit->{author_tz});

-  my $committer_date

-    = $git->parse_date($commit->{committer_epoch}, $commit->{committer_tz});

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

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

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

-  

-  # Plain text

-  if ($self->param('plain')) {

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

-    my @cmd = ($git->cmd($project), 'diff-tree', '-r', '-M',

-        '-p', $from_id, $id, '--');

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

-      or croak 'Open git-diff-tree failed';

-

-    # Content

-    my $content = do { local $/; <$fh> };

-    my $content_disposition .= "inline; filename=$id";

-    

-    # Render

-    $self->res->headers->content_disposition($content_disposition);

-    $self->res->headers->content_type("text/plain;charset=" . $git->encoding);

-    $self->render_data($content);

-  }

-  

-  # HTML

-  else {

-    

-    # Diff tree

-    my $difftrees = $git->difftree($project,

-      $id, $commit->{parent}, $commit->{parents});

-    

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

-    my @cmd = ($git->cmd($project), 'diff-tree', '-r', '-M',

-      '--no-commit-id', '--patch-with-raw', $from_id, $id, '--');

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

-      or croak 'Open git-diff-tree failed';

-

-    # Parse output

-    my @blobdiffs;

-    while (my $line = $git->dec(scalar <$fh>)) {

-      

-      # Parse line

-      chomp $line;

-      my $diffinfo = $git->parse_difftree_raw_line($line);

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

-      my $file = $diffinfo->{to_file};

-      

-      # Get blobdiff (command "git diff-tree")

-      my @cmd = ($git->cmd($project), 'diff-tree', '-r', '-M', '-p',

-        $from_id, $id, '--', (defined $from_file ? $from_file : ()), $file);

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

-        or croak 'Open git-diff-tree failed';

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

-      close $fh_blobdiff;

-      my $blobdiff = {

-        file => $file,

-        from_file => $from_file,

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

-      };

-      

-      # Status

-      for my $difftree (@$difftrees) {

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

-          $blobdiff->{status} = $difftree->{status};

-          last;

-        }

-      }

-      

-      push @blobdiffs, $blobdiff;

-    }

-

-    # References

-    my $refs = $git->references($project);

-    

-    # Render

-    $self->render(

-      'commitdiff',

-      home => $home,

-      home_ns => $home_ns,

-      project => $project,

-      project_ns => $project_ns,

-      from_id => $from_id,

-      id => $id,

-      commit => $commit,

-      difftrees => $difftrees,

-      blobdiffs => \@blobdiffs,

-      refs => $refs

-    );

-  }

-}

-

-sub _root_ns {

-  my $self = shift;

-  

-  my $root = $self->root;

-  $root =~ s/^\///;

-  

-  return $root;

-}

-

 sub snapshot {

   my $self = shift;

@@ -267,63 +147,6 @@ sub tag {

   );

 }

-sub _parse_blobdiff_lines {

-  my ($self, $lines_raw) = @_;

-  

-  # Git

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

-  

-  # Parse

-  my @lines;

-  for my $line (@$lines_raw) {

-    $line = $git->dec($line);

-    chomp $line;

-    my $class;

-    

-    if ($line =~ /^diff \-\-git /) { $class = 'diff header' }

-    elsif ($line =~ /^index /) { $class = 'diff extended_header' }

-    elsif ($line =~ /^\+/) { $class = 'diff to_file' }

-    elsif ($line =~ /^\-/) { $class = 'diff from_file' }

-    elsif ($line =~ /^\@\@/) { $class = 'diff chunk_header' }

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

-    else { $class = 'diff' }

-    push @lines, {value => $line, class => $class};

-  }

-  

-  return \@lines;

-}

-

-sub _parse_id_path {

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

-  

-  # Git

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

-  

-  # Parse id and path

-  my $refs = $git->references($project);

-  my $id;

-  my $path;

-  for my $rs (values %$refs) {

-    for my $ref (@$rs) {

-      $ref =~ s#^heads/##;

-      $ref =~ s#^tags/##;

-      if ($id_path =~ s#^\Q$ref(/|$)##) {

-        $id = $ref;

-        $path = $id_path;

-        last;

-      }      

-    }

-  }

-  unless (defined $id) {

-    if ($id_path =~ s#(^[^/]+)(/|$)##) {

-      $id = $1;

-      $path = $id_path;

-    }

-  }

-  

-  return ($id, $path);

-}

-

 sub _quote_command {

   my $self = shift;

   return join(' ',

@@ -1,5 +1,5 @@

 <table class="<%= @$parents > 1 ? 'combined' : 'diff_tree' %>"">

-

+  

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

   % if ($has_header) {

     <thead>

@@ -2,12 +2,10 @@

   # API

   my $api = Gitprep::API->new($self);

-  # Parameter

+  # Parameters

   my $user = param('user');

   my $project = param('project');

   my $root_ns = $api->root_ns(config->{root});

-  

-  # Parameters

   my $rep_ns = "$root_ns/$user/$project.git";

   my $rep = "/$rep_ns";

   my $object = param('object');

@@ -1,19 +1,128 @@

+<%

+  use Gitprep::API;

+  

+  # API

+  my $api = Gitprep::API->new($self);

+  

+  # Paramters

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

+  my $root_ns = $api->root_ns(config->{root});

+  my $rep_ns = "$root_ns/$user/$project.git";

+  my $rep = "/$rep_ns";

+  my $home_ns = $api->dirname($project);

+  my $home = "/$home_ns";

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

+  my ($from_id, $id) = $diff =~ /(.+)\.\.(.+)/;

+  $id = $diff unless defined $id;

+  

+  # Git

+  my $git = app->git;

+  

+  # Commit

+  my $commit = $git->parse_commit($rep, $id)

+    or $api->croak('Unknown commit object');

+  my $author_date

+    = $git->parse_date($commit->{author_epoch}, $commit->{author_tz});

+  my $committer_date

+    = $git->parse_date($commit->{committer_epoch}, $commit->{committer_tz});

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

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

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

+  

+  my $difftrees;

+  my $blobdiffs;

+

+  # Plain text

+  if ($self->param('plain')) {

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

+    my @cmd = ($git->cmd($rep), 'diff-tree', '-r', '-M',

+        '-p', $from_id, $id, '--');

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

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

+

+    # Content

+    my $content = do { local $/; <$fh> };

+    my $content_disposition .= "inline; filename=$id";

+    

+    # Render

+    $self->res->headers->content_disposition($content_disposition);

+    $self->res->headers->content_type("text/plain;charset=" . $git->encoding);

+    $self->render_data($content);

+  }

+  

+  # HTML

+  else {

+    

+    # Diff tree

+    $difftrees = $git->difftree($rep,

+      $id, $commit->{parent}, $commit->{parents});

+    

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

+    my @cmd = ($git->cmd($rep), 'diff-tree', '-r', '-M',

+      '--no-commit-id', '--patch-with-raw', $from_id, $id, '--');

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

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

+

+    # Parse output

+    while (my $line = $git->dec(scalar <$fh>)) {

+      

+      # Parse line

+      chomp $line;

+      my $diffinfo = $git->parse_difftree_raw_line($line);

+      my $from_file = $diffinfo->{from_file};

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

+      

+      # Get blobdiff (command "git diff-tree")

+      my @cmd = ($git->cmd($rep), 'diff-tree', '-r', '-M', '-p',

+        $from_id, $id, '--', (defined $from_file ? $from_file : ()), $file);

+      open my $fh_blobdiff, '-|', @cmd

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

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

+      close $fh_blobdiff;

+      my $blobdiff = {

+        file => $file,

+        from_file => $from_file,

+        lines => $git->parse_blobdiff_lines(\@lines)

+      };

+      

+      # Status

+      for my $difftree (@$difftrees) {

+        if ($difftree->{to_file} eq $file) {

+          $blobdiff->{status} = $difftree->{status};

+          last;

+        }

+      }

+      

+      push @$blobdiffs, $blobdiff;

+    }

+    

+    # Render

+    stash(

+      home => $home,

+      home_ns => $home_ns,

+      project => $project,

+      project => $project,

+      from_id => $from_id,

+      id => $id,

+      commit => $commit,

+    );

+  }

+%>

+

 % layout 'common';

+  %= include '/css/common';

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

-  %= include '/include/current_directory', home_ns => $home_ns, home => $home;

-  %= include '/include/page_navi', current => 'commitdiff', project_ns => $project_ns;

   <div class="page_nav">

-    <a href="<%= url_for('commitdiff_plain', project => $project_ns, diff => $commit->{id}) %>">

+    <a href="<%= url_for('commitdiff_plain', project => $project, diff => $commit->{id}) %>">

       Raw

     </a>

   </div>

   <div class="header">

-    <a class="title" href="<%= url_for('commit', project => $project_ns) %>">

+    <a class="title" href="<%= url_for('commit', project => $project) %>">

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

     </a>

   </div>

   <div class="title_text">

-    %= include 'include/refs', project_ns => $project_ns, commit => $commit, refs => $refs;

     <table class="object_header">

       <tr><td>Author</td><td><%= $commit->{author} %></td><td rowspan="2"></td></tr>

       <tr><td></td><td><%= $commit->{author_date} %></td></tr>

@@ -25,7 +134,7 @@

     <div class="list_head"></div>

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

-      difftrees => $difftrees, parents => $commit->{parents} %>

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

     <div class="patchset">

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

@@ -36,7 +145,7 @@

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

           % $from_file = $file unless defined $from_file;

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

-          %= include '/include/blobdiff_body', file => $file, from_file => $from_file, status => $status, lines => $blobdiff->{lines};

+          %= include '/include/blobdiff_body', file => $file, from_file => $from_file, status => $status, lines => $blobdiff->{lines}, project_ns => $project;

         </div>

       % }

     </div>