##// END OF EJS Templates
scm: git: backout r8840 (#8857, #9472)...
Toshi MARUYAMA -
r9021:374c2aa70500
parent child
Show More
@@ -162,12 +162,10 class Repository::Git < Repository
162 opts[:excludes] = prev_db_heads
162 opts[:excludes] = prev_db_heads
163 opts[:includes] = repo_heads
163 opts[:includes] = repo_heads
164 begin
164 begin
165 cnt = 0
166 scm.revisions('', nil, nil, opts) do |rev|
165 scm.revisions('', nil, nil, opts) do |rev|
167 cnt += 1
168 db_rev = find_changeset_by_name(rev.scmid)
166 db_rev = find_changeset_by_name(rev.scmid)
169 if db_rev.nil?
167 transaction do
170 transaction do
168 if db_rev.nil?
171 db_saved_rev = save_revision(rev)
169 db_saved_rev = save_revision(rev)
172 parents = {}
170 parents = {}
173 parents[db_saved_rev] = rev.parents unless rev.parents.nil?
171 parents[db_saved_rev] = rev.parents unless rev.parents.nil?
@@ -175,9 +173,6 class Repository::Git < Repository
175 ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
173 ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
176 end
174 end
177 end
175 end
178 end
179 if cnt > 100
180 cnt = 0
181 h["heads"] = prev_db_heads.dup
176 h["heads"] = prev_db_heads.dup
182 h["heads"] << rev.scmid
177 h["heads"] << rev.scmid
183 merge_extra_info(h)
178 merge_extra_info(h)
General Comments 0
You need to be logged in to leave comments. Login now