scm: git: fix fetching 7 days problem (#7146, #6013).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5788 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 16 insertions, 29 deletions

diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index 51a2ca82d..3e2edd9f7 100644
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -103,39 +103,26 @@ class Repository::Git < Repository
   #
   # But, Git 1.7.3.4 does not support --reverse with -n or --skip.
   #
-  # With SCM's that have a sequential commit numbering, redmine is able to be
-  # clever and only fetch changesets going forward from the most recent one
-  # it knows about.
-  # However, with git, you never know if people have merged
-  # commits into the middle of the repository history, so we should parse
-  # the entire log.
-  #
-  # Since it's way too slow for large repositories,
-  # we only parse 1 week before the last known commit.
-  #
   # The repository can still be fully reloaded by calling #clear_changesets
   # before fetching changesets (eg. for offline resync)
   def fetch_changesets
-    c = changesets.find(:first, :order => 'committed_on DESC')
-    since = (c ? c.committed_on - 7.days : nil)
-
-    revisions = scm.revisions('', nil, nil, {:all => true, :since => since, :reverse => true})
-    return if revisions.nil? || revisions.empty?
-
-    recent_changesets = changesets.find(:all, :conditions => ['committed_on >= ?', since])
-
-    # Clean out revisions that are no longer in git
-    recent_changesets.each {|c| c.destroy unless revisions.detect {|r| r.scmid.to_s == c.scmid.to_s }}
-
-    # Subtract revisions that redmine already knows about
-    recent_revisions = recent_changesets.map{|c| c.scmid}
-    revisions.reject!{|r| recent_revisions.include?(r.scmid)}
-
-    # Save the remaining ones to the database
-    unless revisions.nil?
-      revisions.each do |rev|
+    scm_brs = branches
+    return if scm_brs.nil? || scm_brs.empty?
+    h = extra_info || {}
+    h["branches"]  ||= {}
+    scm_brs.each do |br|
+      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
-          save_revision(rev)
+          if db_rev.nil?
+            save_revision(rev)
+          end
+          h["branches"][br]["last_scmid"] = rev.scmid
+          merge_extra_info(h)
+          self.save
         end
       end
     end