Merge branch 'faster-branch-contains' into 'master'

Faster branch contains detection for commit

Much faster then iterate over all branches in rugged and look for existing commit

See merge request !1129

app/controllers/projects/commit_controller.rb

@@ -12,13 +12,7 @@ class Projects::CommitController < Projects::ApplicationController
     return git_not_found! unless @commit
 
     @line_notes = project.notes.for_commit_id(commit.id).inline
-
-    @branches = begin
-                  project.repository.branch_names_contains(commit.id)
-                rescue Grit::Git::GitTimeout
-                  []
-                end
-
+    @branches = project.repository.branch_names_contains(commit.id)
     @diffs = @commit.diffs
     @note = project.build_commit_note(commit)
     @notes_count = project.notes.for_commit_id(commit.id).count

app/models/repository.rb

@@ -284,4 +284,21 @@ class Repository
       blob_at(commit.parent_id, diff.old_path)
     end
   end
+
+  def branch_names_contains(sha)
+    args = %W(git branch --contains #{sha})
+    names = Gitlab::Popen.popen(args, path_to_repo).first
+
+    if names.respond_to?(:split)
+      names = names.split("\n").map(&:strip)
+
+      names.each do |name|
+        name.slice! '* '
+      end
+
+      names
+    else
+      []
+    end
+  end
 end

spec/models/repository_spec.rb

+require 'spec_helper'
+
+describe Repository do
+  include RepoHelpers
+
+  let(:repository) { create(:project).repository }
+
+  describe :branch_names_contains do
+    subject { repository.branch_names_contains(sample_commit.id) }
+
+    it { should include('master') }
+    it { should_not include('feature') }
+    it { should_not include('fix') }
+  end
+
+  describe :last_commit_for_path do
+    subject { repository.last_commit_for_path(sample_commit.id, '.gitignore').id }
+
+    it { should eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
+  end
+end