summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-03-07 05:57:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2012-03-07 05:57:29 +0000
commit374c2aa70500629a66a305afe08306c3bbb82c5c (patch)
treeb409c26f4420d0aa446e9e1047a22f85f342e4d0 /app/models
parent2bcf9f28710b527ff9efbc68fc228593a243e65f (diff)
downloadredmine-374c2aa70500629a66a305afe08306c3bbb82c5c.tar.gz
redmine-374c2aa70500629a66a305afe08306c3bbb82c5c.zip
scm: git: backout r8840 (#8857, #9472)
reduce saving heads times in fetching revisions. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9141 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
-rw-r--r--app/models/repository/git.rb9
1 files changed, 2 insertions, 7 deletions
diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index 6dae13e9c..d777fe7c5 100644
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -162,12 +162,10 @@ class Repository::Git < Repository
opts[:excludes] = prev_db_heads
opts[:includes] = repo_heads
begin
- cnt = 0
scm.revisions('', nil, nil, opts) do |rev|
- cnt += 1
db_rev = find_changeset_by_name(rev.scmid)
- if db_rev.nil?
- transaction do
+ transaction do
+ if db_rev.nil?
db_saved_rev = save_revision(rev)
parents = {}
parents[db_saved_rev] = rev.parents unless rev.parents.nil?
@@ -175,9 +173,6 @@ class Repository::Git < Repository
ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
end
end
- end
- if cnt > 100
- cnt = 0
h["heads"] = prev_db_heads.dup
h["heads"] << rev.scmid
merge_extra_info(h)