kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: git: backout r8839 (#8857) 

call "git log" only once instead of per branch in fetching revisions.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9142 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-03-07 05:57:44 +00:00
parent 374c2aa705
commit f0987e4b8f
2 changed files with 57 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
app/models/repository/git.rb
View File

@ -107,7 +107,8 @@ class Repository::Git < Repository
# However, Git does not have a sequential commit numbering. # However, Git does not have a sequential commit numbering.
# #
# In order to fetch only new adding revisions, # In order to fetch only new adding revisions,
# Redmine needs to save "heads". # Redmine needs to parse revisions per branch.
# Branch "last_scmid" is for this requirement.
# #
# In Git and Mercurial, revisions are not in date order. # In Git and Mercurial, revisions are not in date order.
# Redmine Mercurial fixed issues. # Redmine Mercurial fixed issues.
@ -130,17 +131,9 @@ class Repository::Git < Repository
def fetch_changesets def fetch_changesets
scm_brs = branches scm_brs = branches
return if scm_brs.nil? || scm_brs.empty? return if scm_brs.nil? || scm_brs.empty?
h1 = extra_info || {} h1 = extra_info || {}
h = h1.dup h = h1.dup
repo_heads = scm_brs.map{ |br| br.scmid } h["branches"] ||= {}
h["heads"] ||= []
prev_db_heads = h["heads"].dup
if prev_db_heads.empty?
prev_db_heads += heads_from_branches_hash
end
return if prev_db_heads.sort == repo_heads.sort
h["db_consistent"] ||= {} h["db_consistent"] ||= {}
if changesets.count == 0 if changesets.count == 0
h["db_consistent"]["ordering"] = 1 h["db_consistent"]["ordering"] = 1
@ -151,39 +144,35 @@ class Repository::Git < Repository
merge_extra_info(h) merge_extra_info(h)
self.save self.save
end end
save_revisions(h, scm_brs)
save_revisions(prev_db_heads, repo_heads)
end end
def save_revisions(prev_db_heads, repo_heads) def save_revisions(h, scm_brs)
h = {} scm_brs.each do |br1|
opts = {} br = br1.to_s
opts[:reverse] = true from_scmid = nil
opts[:excludes] = prev_db_heads from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
opts[:includes] = repo_heads h["branches"][br] ||= {}
begin begin
scm.revisions('', nil, nil, opts) do |rev| scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
db_rev = find_changeset_by_name(rev.scmid) db_rev = find_changeset_by_name(rev.revision)
transaction do transaction do
if db_rev.nil? if db_rev.nil?
db_saved_rev = save_revision(rev) db_saved_rev = save_revision(rev)
parents = {} parents = {}
parents[db_saved_rev] = rev.parents unless rev.parents.nil? parents[db_saved_rev] = rev.parents unless rev.parents.nil?
parents.each do |ch, chparents| parents.each do |ch, chparents|
ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
end
end end
h["branches"][br]["last_scmid"] = rev.scmid
merge_extra_info(h)
self.save
end end
h["heads"] = prev_db_heads.dup
h["heads"] << rev.scmid
merge_extra_info(h)
self.save
end end
rescue Redmine::Scm::Adapters::CommandFailed => e
logger.error("save revisions error: #{e.message}")
end end
h["heads"] = repo_heads.dup
merge_extra_info(h)
self.save
rescue Redmine::Scm::Adapters::CommandFailed => e
logger.error("save revisions error: #{e.message}")
end end
end end
private :save_revisions private :save_revisions

70
test/unit/repository_git_test.rb
View File

@ -116,7 +116,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
assert_equal "README", change.path assert_equal "README", change.path
assert_equal "A", change.action assert_equal "A", change.action
assert_equal NUM_HEAD, @repository.extra_info["heads"].size assert_equal NUM_HEAD, @repository.extra_info["branches"].size
end end
def test_fetch_changesets_incremental def test_fetch_changesets_incremental
@ -124,11 +124,11 @@ class RepositoryGitTest < ActiveSupport::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
extra_info_heads = @repository.extra_info["heads"].dup extra_info_db = @repository.extra_info["branches"]
assert_equal NUM_HEAD, extra_info_heads.size assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127",
extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" } extra_info_db["latin-1-path-encoding"]["last_scmid"]
assert_equal 4, extra_info_heads.size assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
extra_info_db["master"]["last_scmid"]
del_revs = [ del_revs = [
"83ca5fd546063a3c7dc2e568ba3355661a9e2b2c", "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
"ed5bb786bbda2dee66a2d50faf51429dbc043a7b", "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
@ -142,19 +142,20 @@ class RepositoryGitTest < ActiveSupport::TestCase
end end
@project.reload @project.reload
cs1 = @repository.changesets cs1 = @repository.changesets
assert_equal NUM_REV - 6, cs1.count assert_equal 22, cs1.count
extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8" h = @repository.extra_info.dup
h = {} h["branches"]["master"]["last_scmid"] =
h["heads"] = extra_info_heads "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
@repository.merge_extra_info(h) @repository.merge_extra_info(h)
@repository.save @repository.save
@project.reload @project.reload
assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8") extra_info_db_1 = @repository.extra_info["branches"]
assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
extra_info_db_1["master"]["last_scmid"]
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
assert_equal NUM_HEAD, @repository.extra_info["heads"].size
assert @repository.extra_info["heads"].index("83ca5fd546063a3c7dc2e568ba3355661a9e2b2c")
end end
def test_fetch_changesets_history_editing def test_fetch_changesets_history_editing
@ -162,11 +163,9 @@ class RepositoryGitTest < ActiveSupport::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
extra_info_heads = @repository.extra_info["heads"].dup assert_equal NUM_HEAD, @repository.extra_info["branches"].size
assert_equal NUM_HEAD, extra_info_heads.size assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" } @repository.extra_info["branches"]["master"]["last_scmid"]
assert_equal 4, extra_info_heads.size
del_revs = [ del_revs = [
"83ca5fd546063a3c7dc2e568ba3355661a9e2b2c", "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
"ed5bb786bbda2dee66a2d50faf51429dbc043a7b", "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
@ -190,21 +189,17 @@ class RepositoryGitTest < ActiveSupport::TestCase
@project.reload @project.reload
assert_equal NUM_REV - 5, @repository.changesets.count assert_equal NUM_REV - 5, @repository.changesets.count
extra_info_heads << "abcd1234efgh" h = @repository.extra_info.dup
h = {} h["branches"]["master"]["last_scmid"] = "abcd1234efgh"
h["heads"] = extra_info_heads
@repository.merge_extra_info(h) @repository.merge_extra_info(h)
@repository.save @repository.save
@project.reload @project.reload
h1 = @repository.extra_info["heads"].dup assert_equal "abcd1234efgh",
assert h1.index("abcd1234efgh") @repository.extra_info["branches"]["master"]["last_scmid"]
assert_equal 5, h1.size
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV - 5, @repository.changesets.count assert_equal NUM_REV - 5, @repository.changesets.count
h2 = @repository.extra_info["heads"].dup
assert_equal h1, h2
end end
def test_parents def test_parents
@ -251,8 +246,6 @@ class RepositoryGitTest < ActiveSupport::TestCase
@project.reload @project.reload
assert_equal 0, @repository.extra_info["db_consistent"]["ordering"] 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 = [ del_revs = [
"83ca5fd546063a3c7dc2e568ba3355661a9e2b2c", "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
"ed5bb786bbda2dee66a2d50faf51429dbc043a7b", "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
@ -268,19 +261,18 @@ class RepositoryGitTest < ActiveSupport::TestCase
cs1 = @repository.changesets cs1 = @repository.changesets
assert_equal NUM_REV - 6, cs1.count assert_equal NUM_REV - 6, cs1.count
assert_equal 0, @repository.extra_info["db_consistent"]["ordering"] assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
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.merge_extra_info(h)
@repository.save @repository.save
@project.reload @project.reload
assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8") extra_info_db_1 = @repository.extra_info["branches"]
@repository.fetch_changesets assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
@project.reload extra_info_db_1["master"]["last_scmid"]
assert_equal NUM_REV, @repository.changesets.count
assert_equal NUM_HEAD, @repository.extra_info["heads"].size
@repository.fetch_changesets
assert_equal NUM_REV, @repository.changesets.count
assert_equal 0, @repository.extra_info["db_consistent"]["ordering"] assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
end end
@ -519,7 +511,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
%w|7234cb2750b63f47bff735edc50a1c0a433c2518 7234cb275|.each do |r1| %w|95488a44bc25f7d1f97d775a31359539ff333a63 95488a44b|.each do |r1|
changeset = @repository.find_changeset_by_name(r1) changeset = @repository.find_changeset_by_name(r1)
assert_nil changeset.previous assert_nil changeset.previous
end end
@ -543,7 +535,7 @@ class RepositoryGitTest < ActiveSupport::TestCase
@repository.fetch_changesets @repository.fetch_changesets
@project.reload @project.reload
assert_equal NUM_REV, @repository.changesets.count assert_equal NUM_REV, @repository.changesets.count
%w|2a682156a3b6e77a8bf9cd4590e8db757f3c6c78 2a682156a3b6e77a|.each do |r1| %w|67e7792ce20ccae2e4bb73eed09bb397819c8834 67e7792ce20cca|.each do |r1|
changeset = @repository.find_changeset_by_name(r1) changeset = @repository.find_changeset_by_name(r1)
assert_nil changeset.next assert_nil changeset.next
end end