jro_apps/redmine Commit - r9156:f36eb54141c6

scm: git: use Changeset#create and Changeset#create_change as same with Subversion and Mercurial...

Toshi MARUYAMA -

r9156:f36eb54141c6

parent child

Context file:

r9156:f36eb54141c6

Collapse all files

app/models/repository/git.rb +8 -13

                   transaction do
                     # There is no search in the db for this revision, because above we ensured,
                     # that it's not in the db.
-                    db_saved_rev = save_revision(rev)
+                    save_revision(rev)
-                    parents = {}
-                    parents[db_saved_rev] = rev.parents unless rev.parents.nil?
-                    parents.each do |ch, chparents|
-                      ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
-                    end
                   end
                 end
                 h["heads"] = repo_heads.dup
               private :save_revisions
               def save_revision(rev)
-                changeset = Changeset.new(
+                changeset = Changeset.create(
                           :repository   => self,
                           :revision     => rev.identifier,
                           :scmid        => rev.scmid,
                           :committed_on => rev.time,
                           :comments     => rev.message
                           )
-                if changeset.save
+                unless changeset.new_record?
-                  rev.paths.each do |file|
+                  rev.paths.each { |change| changeset.create_change(change) }
-                    Change.create(
+                  parents = {}
-                              :changeset => changeset,
+                  parents[changeset] = rev.parents unless rev.parents.nil?
-                              :action    => file[:action],
+                  parents.each do |ch, chparents|
-                              :path      => file[:path])
+                    ch.parents = chparents.collect{|rp| find_changeset_by_name(rp)}.compact
                   end
                 end
                 changeset

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