comparison app/models/repository/git.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

 
   def supports_directory_revisions?
     true
   end
 
+  def supports_revision_graph?
+    true
+  end
+
   def repo_log_encoding
     'UTF-8'
   end
 
   # Returns the identifier for the given git changeset

     scm.tags
   end
 
   def default_branch
     scm.default_branch
+  rescue Exception => e
+    logger.error "git: error during get default branch: #{e.message}"
+    nil
   end
 
   def find_changeset_by_name(name)
     return nil if name.nil? || name.empty?
     e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])

     scm.entries(path,
                 identifier,
                 options = {:report_last_commit => extra_report_last_commit})
   end
 
+  # With SCMs that have a sequential commit numbering,
+  # such as Subversion and Mercurial,
+  # Redmine is able to be clever and only fetch changesets
+  # going forward from the most recent one it knows about.
+  # 
+  # However, Git does not have a sequential commit numbering.
+  #
+  # In order to fetch only new adding revisions,
+  # Redmine needs to parse revisions per branch.
+  # Branch "last_scmid" is for this requirement.
+  #
   # In Git and Mercurial, revisions are not in date order.
   # Redmine Mercurial fixed issues.
   #    * Redmine Takes Too Long On Large Mercurial Repository
   #      http://www.redmine.org/issues/3449
   #    * Sorting for changesets might go wrong on Mercurial repos

     elsif ! h["db_consistent"].has_key?("ordering")
       h["db_consistent"]["ordering"] = 0
       merge_extra_info(h)
       self.save
     end
-    scm_brs.each do |br|
+    scm_brs.each do |br1|
+      br = br1.to_s
       from_scmid = nil
       from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
       h["branches"][br] ||= {}
       scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
         db_rev = find_changeset_by_name(rev.revision)
         transaction do
           if db_rev.nil?
-            save_revision(rev)
+            db_saved_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
           h["branches"][br]["last_scmid"] = rev.scmid
           merge_extra_info(h)
           self.save
         end

                   :changeset => changeset,
                   :action    => file[:action],
                   :path      => file[:path])
       end
     end
+    changeset
   end
   private :save_revision
 
   def latest_changesets(path,rev,limit=10)
     revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)