From 81d191ede9eed2ef63d772a40038679944d8fd69 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 17 Mar 2016 17:50:59 +0100
Subject: [PATCH 1/3] Removed Repository#rebuild_cache

This method is not used or tested anywhere.
---
 app/models/repository.rb | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 036919c27b..53d3d90859 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -301,18 +301,6 @@ class Repository
     @tag_count = nil
   end
 
-  def rebuild_cache
-    cache_keys.each do |key|
-      cache.expire(key)
-      send(key)
-    end
-
-    branches.each do |branch|
-      cache.expire(:"diverging_commit_counts_#{branch.name}")
-      diverging_commit_counts(branch)
-    end
-  end
-
   def lookup_cache
     @lookup_cache ||= {}
   end

From 3d7feeede32a81df06f80f6f3599bfe62aa6e13d Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 17 Mar 2016 17:52:19 +0100
Subject: [PATCH 2/3] Don't rebuild diverging commit count caches

When calling Repository#build_cache we _don't_ want to build the
diverging commit count cache as doing so can be _very_ slow for
repositories with lots of branches. Because these caches are built
whenever needed (= when actually viewing the list of branches in the web
UI) we can safely remove this code from
Repository#build_cache.
---
 app/models/repository.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 53d3d90859..25d24493f6 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -227,12 +227,6 @@ class Repository
         send(key)
       end
     end
-
-    branches.each do |branch|
-      unless cache.exist?(:"diverging_commit_counts_#{branch.name}")
-        send(:diverging_commit_counts, branch)
-      end
-    end
   end
 
   def expire_tags_cache

From dd4b789765ca4219f89c03d14d0c2524b2374184 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 17 Mar 2016 18:15:09 +0100
Subject: [PATCH 3/3] Added tests for Repository#build_cache

---
 spec/models/repository_spec.rb | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 536fe66b21..a57229a4fd 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -780,4 +780,34 @@ describe Repository, models: true do
       end
     end
   end
+
+  describe '#build_cache' do
+    let(:cache) { repository.send(:cache) }
+
+    it 'builds the caches if they do not already exist' do
+      expect(cache).to receive(:exist?).
+        exactly(repository.cache_keys.length).
+        times.
+        and_return(false)
+
+      repository.cache_keys.each do |key|
+        expect(repository).to receive(key)
+      end
+
+      repository.build_cache
+    end
+
+    it 'does not build any caches that already exist' do
+      expect(cache).to receive(:exist?).
+        exactly(repository.cache_keys.length).
+        times.
+        and_return(true)
+
+      repository.cache_keys.each do |key|
+        expect(repository).to_not receive(key)
+      end
+
+      repository.build_cache
+    end
+  end
 end