jro_apps/redmine Commit - r8719:1e5f16722fc3

scm: git: call "git log" only once instead of per branch in fetching revisions (#8857)...

Toshi MARUYAMA -

r8719:1e5f16722fc3

parent child

Context file:

r8719:1e5f16722fc3

Collapse all files

app/models/repository/git.rb +39 -28

@@ -107,8 +107,7 class Repository::Git < Repository
107	# However, Git does not have a sequential commit numbering.	107	# However, Git does not have a sequential commit numbering.
108	#	108	#
109	# In order to fetch only new adding revisions,	109	# In order to fetch only new adding revisions,
110	# Redmine needs to ~~parse revisions per branch~~.	110	# Redmine needs to save "heads".
111	# Branch "last_scmid" is for this requirement.
112	#	111	#
113	# In Git and Mercurial, revisions are not in date order.	112	# In Git and Mercurial, revisions are not in date order.
114	# Redmine Mercurial fixed issues.	113	# Redmine Mercurial fixed issues.
@@ -131,9 +130,17 class Repository::Git < Repository
131	def fetch_changesets	130	def fetch_changesets
132	scm_brs = branches	131	scm_brs = branches
133	return if scm_brs.nil? \|\| scm_brs.empty?	132	return if scm_brs.nil? \|\| scm_brs.empty?
		133
134	h1 = extra_info \|\| {}	134	h1 = extra_info \|\| {}
135	h = h1.dup	135	h = h1.dup
136	h["branches"] \|\|= {}	136	repo_heads = scm_brs.map{ \|br\| br.scmid }
		137	h["heads"] \|\|= []
		138	prev_db_heads = h["heads"].dup
		139	if prev_db_heads.empty?
		140	prev_db_heads += heads_from_branches_hash
		141	end
		142	return if prev_db_heads.sort == repo_heads.sort
		143
137	h["db_consistent"] \|\|= {}	144	h["db_consistent"] \|\|= {}
138	if changesets.count == 0	145	if changesets.count == 0
139	h["db_consistent"]["ordering"] = 1	146	h["db_consistent"]["ordering"] = 1
@@ -144,35 +151,39 class Repository::Git < Repository
144	merge_extra_info(h)	151	merge_extra_info(h)
145	self.save	152	self.save
146	end	153	end
147	save_revisions(h, scm_brs)	154
148	end	155	save_revisions(prev_db_heads, repo_heads)
149		156	end
150	def save_revisions(h, scm_brs)	157
151	scm_brs.each do \|br1\|	158	def save_revisions(prev_db_heads, repo_heads)
152	br = br1.to_s	159	h = {}
153	from_scmid = nil	160	opts = {}
154	from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]	161	opts[:reverse] = true
155	h["branches"][br] \|\|= {}	162	opts[:excludes] = prev_db_heads
156	begin	163	opts[:includes] = repo_heads
157	scm.revisions('', from_scmid, br, {:reverse => true}) do \|rev\|	164	begin
158	db_rev = find_changeset_by_name(rev.revision)	165	scm.revisions('', nil, nil, opts) do \|rev\|
159	transaction do	166	db_rev = find_changeset_by_name(rev.scmid)
160	if db_rev.nil?	167	transaction do
161	db_saved_rev = save_revision(rev)	168	if db_rev.nil?
162	parents = {}	169	db_saved_rev = save_revision(rev)
163	parents[db_saved_rev] = rev.parents unless rev.parents.nil?	170	parents = {}
164	parents.each do \|ch, chparents\|	171	parents[db_saved_rev] = rev.parents unless rev.parents.nil?
165	ch.parents = chparents.collect{\|rp\| find_changeset_by_name(rp)}.compact	172	parents.each do \|ch, chparents\|
166	end	173	ch.parents = chparents.collect{\|rp\| find_changeset_by_name(rp)}.compact
167	end	174	end
168	h["branches"][br]["last_scmid"] = rev.scmid
169	merge_extra_info(h)
170	self.save
171	end	175	end
		176	h["heads"] = prev_db_heads.dup
		177	h["heads"] << rev.scmid
		178	merge_extra_info(h)
		179	self.save
172	end	180	end
173	rescue Redmine::Scm::Adapters::CommandFailed => e
174	logger.error("save revisions error: #{e.message}")
175	end	181	end
		182	h["heads"] = repo_heads.dup
		183	merge_extra_info(h)
		184	self.save
		185	rescue Redmine::Scm::Adapters::CommandFailed => e
		186	logger.error("save revisions error: #{e.message}")
176	end	187	end
177	end	188	end
178	private :save_revisions	189	private :save_revisions

test/unit/repository_git_test.rb +36 -30

                   assert_equal "README", change.path
                   assert_equal "A", change.action
-                  assert_equal 5, @repository.extra_info["branches"].size
+                  assert_equal 5, @repository.extra_info["heads"].size
                 end
                 def test_fetch_changesets_incremental
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  extra_info_db = @repository.extra_info["branches"]
+                  extra_info_heads = @repository.extra_info["heads"].dup
-                  assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127",
+                  assert_equal 5, extra_info_heads.size
-                                extra_info_db["latin-1-path-encoding"]["last_scmid"]
+                  extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
-                  assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
+                  assert_equal 4, extra_info_heads.size
-                                extra_info_db["master"]["last_scmid"]
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                   end
                   @project.reload
                   cs1 = @repository.changesets
-                  assert_equal 22, cs1.count
+                  assert_equal NUM_REV - 6, cs1.count
-                  h = @repository.extra_info.dup
+                  extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
-                  h["branches"]["master"]["last_scmid"] =
+                  h = {}
-                        "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
+                  h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
-                  extra_info_db_1 = @repository.extra_info["branches"]
+                  assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8")
-                  assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
-                                extra_info_db_1["master"]["last_scmid"]
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
+                  assert_equal 5, @repository.extra_info["heads"].size
+                  assert @repository.extra_info["heads"].index("83ca5fd546063a3c7dc2e568ba3355661a9e2b2c")
                 end
                 def test_fetch_changesets_history_editing
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal 5, @repository.extra_info["branches"].size
+                  extra_info_heads = @repository.extra_info["heads"].dup
-                  assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
+                  assert_equal 5, extra_info_heads.size
-                                 @repository.extra_info["branches"]["master"]["last_scmid"]
+                  extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
+                  assert_equal 4, extra_info_heads.size
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                   @project.reload
                   assert_equal NUM_REV - 5, @repository.changesets.count
-                  h = @repository.extra_info.dup
+                  extra_info_heads << "abcd1234efgh"
-                  h["branches"]["master"]["last_scmid"] = "abcd1234efgh"
+                  h = {}
+                  h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
-                  assert_equal "abcd1234efgh",
+                  h1 = @repository.extra_info["heads"].dup
-                                @repository.extra_info["branches"]["master"]["last_scmid"]
+                  assert h1.index("abcd1234efgh")
+                  assert_equal 5, h1.size
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV - 5, @repository.changesets.count
+                  h2 = @repository.extra_info["heads"].dup
+                  assert_equal h1, h2
                 end
                 def test_parents
                   @project.reload
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
+                  extra_info_heads = @repository.extra_info["heads"].dup
+                  extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                   cs1 = @repository.changesets
                   assert_equal NUM_REV - 6, cs1.count
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
-                  h = @repository.extra_info.dup
-                  h["branches"]["master"]["last_scmid"] =
+                  extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
-                        "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
+                  h = {}
+                  h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
-                  extra_info_db_1 = @repository.extra_info["branches"]
+                  assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8")
-                  assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
-                                extra_info_db_1["master"]["last_scmid"]
                   @repository.fetch_changesets
+                  @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
+                  assert_equal 5, @repository.extra_info["heads"].size
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
                 end
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  %w|95488a44bc25f7d1f97d775a31359539ff333a63 95488a44b|.each do |r1|
+                  %w|7234cb2750b63f47bff735edc50a1c0a433c2518 7234cb275|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.previous
                   end
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  %w|67e7792ce20ccae2e4bb73eed09bb397819c8834 67e7792ce20cca|.each do |r1|
+                  %w|2a682156a3b6e77a8bf9cd4590e8db757f3c6c78 2a682156a3b6e77a|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.next
                   end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages