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

scm: mercurial: add method to switch short or long id by existing value in DB (#14361) 

git-svn-id: http://svn.redmine.org/redmine/trunk@12755 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2014-02-02 00:41:16 +00:00
parent d45bf0a83e
commit 8a35585bd2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/models/repository/mercurial.rb
View File

@ -100,15 +100,20 @@ class Repository::Mercurial < Repository
all all
end end
def scmid_for_inserting_db(scmid)
# TODO: switch short or long by existing value in DB
scmid[0, 12]
end
def nodes_in_branch(rev, branch_limit) def nodes_in_branch(rev, branch_limit)
scm.nodes_in_branch(rev, :limit => branch_limit).collect do |b| scm.nodes_in_branch(rev, :limit => branch_limit).collect do |b|
b[0, 12] scmid_for_inserting_db(b)
end end
end end
def tag_scmid(rev) def tag_scmid(rev)
scmid = scm.tagmap[rev] scmid = scm.tagmap[rev]
scmid.nil? ? nil : scmid[0, 12] scmid.nil? ? nil : scmid_for_inserting_db(scmid)
end end
def latest_changesets_cond(path, rev, limit) def latest_changesets_cond(path, rev, limit)
@ -152,16 +157,23 @@ class Repository::Mercurial < Repository
(db_rev + 1).step(scm_rev, FETCH_AT_ONCE) do |i| (db_rev + 1).step(scm_rev, FETCH_AT_ONCE) do |i|
scm.each_revision('', i, [i + FETCH_AT_ONCE - 1, scm_rev].min) do |re| scm.each_revision('', i, [i + FETCH_AT_ONCE - 1, scm_rev].min) do |re|
transaction do transaction do
parents = (re.parents || []).collect{|rp| find_changeset_by_name(rp)}.compact parents = (re.parents || []).collect do |rp|
find_changeset_by_name(scmid_for_inserting_db(rp))
end.compact
cs = Changeset.create(:repository => self, cs = Changeset.create(:repository => self,
:revision => re.revision, :revision => re.revision,
:scmid => re.scmid, :scmid => scmid_for_inserting_db(re.scmid),
:committer => re.author, :committer => re.author,
:committed_on => re.time, :committed_on => re.time,
:comments => re.message, :comments => re.message,
:parents => parents) :parents => parents)
unless cs.new_record? unless cs.new_record?
re.paths.each { |e| cs.create_change(e) } re.paths.each do |e|
if from_revision = e[:from_revision]
e[:from_revision] = scmid_for_inserting_db(from_revision)
end
cs.create_change(e)
end
end end
end end
end end