Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-10-31 18:36:07 +01:00
Code Issues Packages Projects Releases Activity

Do not parse the entire git log to fetch new commits (takes several minutes for a few thousands commits), but only 1 week before the last known commit (#4547, #4716).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3394 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2010-02-07 15:17:21 +00:00
parent be2004e398
commit 3c20a9b0ac
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/models/repository/git.rb
View File

@@ -40,23 +40,26 @@ class Repository::Git < Repository
# With SCM's that have a sequential commit numbering, redmine is able to be # 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 # 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 # it knows about. However, with git, you never know if people have merged
# commits into the middle of the repository history, so we always have to # commits into the middle of the repository history, so we should parse
# parse the entire log. # 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 def fetch_changesets
# Save ourselves an expensive operation if we're already up to date c = changesets.find(:first, :order => 'committed_on DESC')
return if scm.num_revisions == changesets.count since = (c ? c.committed_on - 7.days : nil)
revisions = scm.revisions('', nil, nil, :all => true) revisions = scm.revisions('', nil, nil, :all => true, :since => since)
return if revisions.nil? || revisions.empty? return if revisions.nil? || revisions.empty?
# Find revisions that redmine knows about already recent_changesets = changesets.find(:all, :conditions => ['committed_on >= ?', since])
existing_revisions = changesets.find(:all).map!{|c| c.scmid}
# Clean out revisions that are no longer in git # Clean out revisions that are no longer in git
Changeset.delete_all(["scmid NOT IN (?) AND repository_id = (?)", revisions.map{|r| r.scmid}, self.id]) 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 # Subtract revisions that redmine already knows about
revisions.reject!{|r| existing_revisions.include?(r.scmid)} recent_revisions = recent_changesets.map{|c| c.scmid}
revisions.reject!{|r| recent_revisions.include?(r.scmid)}
# Save the remaining ones to the database # Save the remaining ones to the database
revisions.each{|r| r.save(self)} unless revisions.nil? revisions.each{|r| r.save(self)} unless revisions.nil?

6
lib/redmine/scm/adapters/git_adapter.rb
View File

@@ -110,11 +110,6 @@ module Redmine
end end
end end
def num_revisions
cmd = "#{GIT_BIN} --git-dir #{target('')} log --all --pretty=format:'' | wc -l"
shellout(cmd) {|io| io.gets.chomp.to_i + 1}
end
def revisions(path, identifier_from, identifier_to, options={}) def revisions(path, identifier_from, identifier_to, options={})
revisions = Revisions.new revisions = Revisions.new
@@ -124,6 +119,7 @@ module Redmine
cmd << " -n #{options[:limit]} " if options[:limit] cmd << " -n #{options[:limit]} " if options[:limit]
cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
cmd << " #{shell_quote identifier_to} " if identifier_to cmd << " #{shell_quote identifier_to} " if identifier_to
cmd << " --since=#{shell_quote(options[:since].strftime("%Y-%m-%d %H:%M:%S"))}" if options[:since]
cmd << " -- #{path}" if path && !path.empty? cmd << " -- #{path}" if path && !path.empty?
shellout(cmd) do |io| shellout(cmd) do |io|