jro_apps/redmine Commit - r5330:b091c9823849

scm: cvs: code clean up model....

Toshi MARUYAMA -

r5330:b091c9823849

parent child

Context file:

r5330:b091c9823849

Collapse all files

app/models/repository/cvs.rb +8 -7

                  # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
                  # we use a small delta here, to merge all changes belonging to _one_ changeset
                  time_delta=10.seconds
                  fetch_since = latest_changeset ? latest_changeset.committed_on : nil
                  transaction do
                    tmp_rev_num = 1
                      # is not exclusive at all.
                      tmp_time = revision.time.clone
                      unless changes.find_by_path_and_revision(
-             	           scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
+             	                         scm.with_leading_slash(revision.paths[0][:path]),
+             	                         revision.paths[0][:revision]
+             	                           )
                        cmt = Changeset.normalize_comments(revision.message, repo_log_encoding)
-                       cs = changesets.find(:first, :conditions=>{
+                       cs  = changesets.find(
+                         :first,
+                         :conditions => {
                          :committed_on=>tmp_time - time_delta .. tmp_time + time_delta,
                          :committer=>revision.author,
                          :comments=>cmt
-                       })
+                             }
+                          )
                        # create a new changeset....
                        unless cs
                          # we use a temporaray revision number here (just for inserting)
                                                :comments => revision.message)
                          tmp_rev_num += 1
                        end
                        #convert CVS-File-States to internal Action-abbrevations
                        #default action is (M)odified
                        action="M"
                        elsif revision.paths[0][:action]=="dead"
                          action="D" #dead-state is similar to Delete
                        end
                        Change.create(
                           :changeset => cs,
                           :action    => action,

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