From 46fa92187d6c076619e9cd58877e03c6d15a1f03 Mon Sep 17 00:00:00 2001
From: Sato Hiroyuki <sathiroyuki@gmail.com>
Date: Tue, 19 Mar 2013 10:00:29 +0900
Subject: [PATCH] Refactor: removing duplicate code.
---
app/models/network/graph.rb | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb
index 074ec371fd2..16512b90f77 100644
--- a/app/models/network/graph.rb
+++ b/app/models/network/graph.rb
@@ -25,15 +25,7 @@ module Network
def collect_commits
refs_cache = build_refs_cache
- Grit::Commit.find_all(
- @repo,
- nil,
- {
- date_order: true,
- max_count: self.class.max_count,
- skip: count_to_display_commit_in_center
- }
- )
+ find_commits(count_to_display_commit_in_center)
.map do |commit|
# Decorate with app/model/network/commit.rb
Network::Commit.new(commit, refs_cache[commit.id])
@@ -74,7 +66,7 @@ module Network
# Skip count that the target commit is displayed in center.
def count_to_display_commit_in_center
- commit_index = Grit::Commit.find_all(@repo, nil, {date_order: true}).index do |c|
+ commit_index = find_commits.index do |c|
c.id == @commit.id
end
@@ -86,6 +78,18 @@ module Network
end
end
+ def find_commits(skip = 0)
+ Grit::Commit.find_all(
+ @repo,
+ nil,
+ {
+ date_order: true,
+ max_count: self.class.max_count,
+ skip: skip
+ }
+ )
+ end
+
def commits_sort_by_ref
@commits.sort do |a,b|
if include_ref?(a)
--
GitLab