meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-30 12:19:38 +00:00
Code Issues Releases Wiki Activity

fix source indent of app/models/repository/cvs.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20493 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-11-26 14:45:41 +00:00
parent 2f43c315f3
commit 79fa07b93a
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/models/repository/cvs.rb
View File

@ -60,9 +60,11 @@ class Repository::Cvs < Repository
if entries
entries.each do |entry|
if ( ! entry.lastrev.nil? ) && ( ! entry.lastrev.revision.nil? )
change = filechanges.where(
:revision => entry.lastrev.revision,
:path => scm.with_leading_slash(entry.path)).first
change =
filechanges.where(
:revision => entry.lastrev.revision,
:path => scm.with_leading_slash(entry.path)
).first
if change
entry.lastrev.identifier = change.changeset.revision
entry.lastrev.revision = change.changeset.revision
@ -140,17 +142,19 @@ class Repository::Cvs < Repository
# only add the change to the database, if it doen't exists. the cvs log
# is not exclusive at all.
tmp_time = revision.time.clone
unless filechanges.find_by_path_and_revision(
scm.with_leading_slash(revision.paths[0][:path]),
revision.paths[0][:revision]
)
unless filechanges.
find_by_path_and_revision(
scm.with_leading_slash(revision.paths[0][:path]),
revision.paths[0][:revision]
)
cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
author_utf8 = Changeset.to_utf8(revision.author, repo_log_encoding)
cs = changesets.where(
:committed_on => (tmp_time - time_delta)..(tmp_time + time_delta),
:committer => author_utf8,
:comments => cmt
).first
cs =
changesets.where(
:committed_on => (tmp_time - time_delta)..(tmp_time + time_delta),
:committer => author_utf8,
:comments => cmt
).first
# create a new changeset....
unless cs
# we use a temporary revision number here (just for inserting)
@ -175,12 +179,12 @@ class Repository::Cvs < Repository
action = "D" # dead-state is similar to Delete
end
Change.create(
:changeset => cs,
:action => action,
:path => scm.with_leading_slash(revision.paths[0][:path]),
:revision => revision.paths[0][:revision],
:branch => revision.paths[0][:branch]
)
:changeset => cs,
:action => action,
:path => scm.with_leading_slash(revision.paths[0][:path]),
:revision => revision.paths[0][:revision],
:branch => revision.paths[0][:branch]
)
end
end