1 files changed, 24 insertions, 8 deletions
diff --git a/lib/gitlab/git/commit_stats.rb b/lib/gitlab/git/commit_stats.rb
index e9118bbed0e..8463b1eb794 100644
--- a/lib/gitlab/git/commit_stats.rb
+++ b/lib/gitlab/git/commit_stats.rb
@@ -1,3 +1,5 @@
+# Gitaly note: JV: 1 RPC, migration in progress.
+
 # Gitlab::Git::CommitStats counts the additions, deletions, and total changes
 # in a commit.
 module Gitlab
@@ -6,21 +8,35 @@ module Gitlab
       attr_reader :id, :additions, :deletions, :total
 
       # Instantiate a CommitStats object
-      def initialize(commit)
+      #
+      # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/323
+      def initialize(repo, commit)
         @id = commit.id
         @additions = 0
         @deletions = 0
         @total = 0
 
-        diff = commit.diff_from_parent
-
-        diff.each_patch do |p|
-          # TODO: Use the new Rugged convenience methods when they're released
-          @additions += p.stat[0]
-          @deletions += p.stat[1]
-          @total += p.changes
+        repo.gitaly_migrate(:commit_stats) do |is_enabled|
+          if is_enabled
+            gitaly_stats(repo, commit)
+          else
+            rugged_stats(commit)
+          end
         end
       end
+
+      def gitaly_stats(repo, commit)
+        stats = repo.gitaly_commit_client.commit_stats(@id)
+        @additions = stats.additions
+        @deletions = stats.deletions
+        @total = @additions + @deletions
+      end
+
+      def rugged_stats(commit)
+        diff = commit.rugged_diff_from_parent
+        _files_changed, @additions, @deletions = diff.stat
+        @total = @additions + @deletions
+      end
     end
   end
 end