jro_apps/redmine Commit - r9149:9b333e1c8772

scm: git: process new git revisions all at once rather than per branch (#10470)...

Toshi MARUYAMA -

r9149:9b333e1c8772

parent child

Context file:

r9149:9b333e1c8772

Collapse all files

app/models/repository/git.rb +22 -35

             # Redmine - project management software
             # Copyright (C) 2006-2012  Jean-Philippe Lang
             # Copyright (C) 2007  Patrick Aljord patcito@ŋmail.com
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require 'redmine/scm/adapters/git_adapter'
             class Repository::Git < Repository
               attr_protected :root_url
               validates_presence_of :url
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "url"
                   attr_name = "path_to_repository"
                 end
                 super(attr_name, *args)
               end
               def self.scm_adapter_class
                 Redmine::Scm::Adapters::GitAdapter
               end
               def self.scm_name
                 'Git'
               end
               def report_last_commit
                 extra_report_last_commit
               end
               def extra_report_last_commit
                 return false if extra_info.nil?
                 v = extra_info["extra_report_last_commit"]
                 return false if v.nil?
                 v.to_s != '0'
               end
               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
               def self.changeset_identifier(changeset)
                 changeset.scmid
               end
               # Returns the readable identifier for the given git changeset
               def self.format_changeset_identifier(changeset)
                 changeset.revision[0, 8]
               end
               def branches
                 scm.branches
               end
               def tags
                 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])
                 return e if e
                 changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])
               end
               def entries(path=nil, identifier=nil)
                 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.
+              # Redmine needs to save "heads".
-              # 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
               #      http://www.redmine.org/issues/3567
               #
               # Database revision column is text, so Redmine can not sort by revision.
               # Mercurial has revision number, and revision number guarantees revision order.
               # Redmine Mercurial model stored revisions ordered by database id to database.
               # So, Redmine Mercurial model can use correct ordering revisions.
               #
               # Redmine Mercurial adapter uses "hg log -r 0:tip --limit 10"
               # to get limited revisions from old to new.
               # But, Git 1.7.3.4 does not support --reverse with -n or --skip.
               #
               # The repository can still be fully reloaded by calling #clear_changesets
               # before fetching changesets (eg. for offline resync)
               def fetch_changesets
                 scm_brs = branches
                 return if scm_brs.nil? || scm_brs.empty?
                 h1 = extra_info || {}
                 h  = h1.dup
-                h["branches"]       ||= {}
+                repo_heads = scm_brs.map{ |br| br.scmid }
+                h["heads"] ||= []
+                prev_db_heads = h["heads"].dup
+                if prev_db_heads.empty?
+                  prev_db_heads += heads_from_branches_hash
+                end
+                return if prev_db_heads.sort == repo_heads.sort
                 h["db_consistent"]  ||= {}
                 if changesets.count == 0
                   h["db_consistent"]["ordering"] = 1
                   merge_extra_info(h)
                   self.save
                 elsif ! h["db_consistent"].has_key?("ordering")
                   h["db_consistent"]["ordering"] = 0
                   merge_extra_info(h)
                   self.save
                 end
-                save_revisions(h, scm_brs)
+                save_revisions(prev_db_heads, repo_heads)
               end
-              def save_revisions(h, scm_brs)
+              def save_revisions(prev_db_heads, repo_heads)
-                # Remember what revisions we already processed (in any branches)
+                  h = {}
-                all_revisions = []
+                  opts = {}
-                scm_brs.each do |br1|
+                  opts[:reverse]  = true
-                  br = br1.to_s
+                  opts[:excludes] = prev_db_heads
-                  last_revision = nil
+                  opts[:includes] = repo_heads
-                  from_scmid = nil
-                  from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
-                  h["branches"][br] ||= {}
-                  revisions = scm.revisions('', from_scmid, br, {:reverse => true})
-                  next if revisions.blank?
-                  # Remember the last commit id here, before we start removing revisions from the array.
-                  # We'll do that for optimization, but it also means, that we may lose even all revisions.
-                  last_revision  = revisions.last
-                  # remove revisions that we have already processed (possibly in other branches)
+                  revisions = scm.revisions('', nil, nil, opts)
-                  revisions.reject!{|r| all_revisions.include?(r.scmid)}
+                  return if revisions.blank?
-                  # add revisions that we are to parse now to 'all processed revisions'
-                  # (this equals to a union, because we executed diff above)
-                  all_revisions += revisions.map{|r| r.scmid}
                   # Make the search for existing revisions in the database in a more sufficient manner
                   # This is replacing the one-after-one queries.
                   # Find all revisions, that are in the database, and then remove them from the revision array.
                   # Then later we won't need any conditions for db existence.
                   # Query for several revisions at once, and remove them from the revisions array, if they are there.
                   # Do this in chunks, to avoid eventual memory problems (in case of tens of thousands of commits).
                   # If there are no revisions (because the original code's algoritm filtered them),
                   # then this part will be stepped over.
                   # We make queries, just if there is any revision.
                   limit = 100
                   offset = 0
                   revisions_copy = revisions.clone # revisions will change
                   while offset < revisions_copy.size
                     recent_changesets_slice = changesets.find(
                                                  :all,
                                                  :conditions => [
                                                     'scmid IN (?)',
                                                     revisions_copy.slice(offset, limit).map{|x| x.scmid}
                                                   ]
                                                 )
                     # Subtract revisions that redmine already knows about
                     recent_revisions = recent_changesets_slice.map{|c| c.scmid}
                     revisions.reject!{|r| recent_revisions.include?(r.scmid)}
                     offset += limit
                   end
                   revisions.each do |rev|
                     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)
                       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
-                      # saving the last scmid was moved from here, because we won't come in here,
-                      # if the revision was already added for another branch
                     end
                   end
+                  h["heads"] = repo_heads.dup
-                  # save the data about the last revision for this branch
+                  merge_extra_info(h)
-                  unless last_revision.nil?
+                  self.save
-                    h["branches"][br]["last_scmid"] = last_revision.scmid
-                    merge_extra_info(h)
-                    self.save
-                  end
-                end
               end
               private :save_revisions
               def save_revision(rev)
                 changeset = Changeset.new(
                           :repository   => self,
                           :revision     => rev.identifier,
                           :scmid        => rev.scmid,
                           :committer    => rev.author,
                           :committed_on => rev.time,
                           :comments     => rev.message
                           )
                 if changeset.save
                   rev.paths.each do |file|
                     Change.create(
                               :changeset => changeset,
                               :action    => file[:action],
                               :path      => file[:path])
                   end
                 end
                 changeset
               end
               private :save_revision
               def heads_from_branches_hash
                 h1 = extra_info || {}
                 h  = h1.dup
                 h["branches"] ||= {}
                 h['branches'].map{|br, hs| hs['last_scmid']}
               end
               def latest_changesets(path,rev,limit=10)
                 revisions = scm.revisions(path, nil, rev, :limit => limit, :all => false)
                 return [] if revisions.nil? || revisions.empty?
                 changesets.find(
                   :all,
                   :conditions => [
                     "scmid IN (?)",
                     revisions.map!{|c| c.scmid}
                   ],
                   :order => 'committed_on DESC'
                 )
               end
             end

test/unit/repository_git_test.rb +38 -30

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.expand_path('../../test_helper', __FILE__)
             class RepositoryGitTest < ActiveSupport::TestCase
               fixtures :projects, :repositories, :enabled_modules, :users, :roles
               include Redmine::I18n
               REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
               REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
               NUM_REV = 28
               NUM_HEAD = 6
               FELIX_HEX  = "Felix Sch\xC3\xA4fer"
               CHAR_1_HEX = "\xc3\x9c"
               ## Ruby uses ANSI api to fork a process on Windows.
               ## Japanese Shift_JIS and Traditional Chinese Big5 have 0x5c(backslash) problem
               ## and these are incompatible with ASCII.
               # WINDOWS_PASS = Redmine::Platform.mswin?
               WINDOWS_PASS = false
               ## Git, Mercurial and CVS path encodings are binary.
               ## Subversion supports URL encoding for path.
               ## Redmine Mercurial adapter and extension use URL encoding.
               ## Git accepts only binary path in command line parameter.
               ## So, there is no way to use binary command line parameter in JRuby.
               JRUBY_SKIP     = (RUBY_PLATFORM == 'java')
               JRUBY_SKIP_STR = "TODO: This test fails in JRuby"
               def setup
                 @project = Project.find(3)
                 @repository = Repository::Git.create(
                                     :project       => @project,
                                     :url           => REPOSITORY_PATH,
                                     :path_encoding => 'ISO-8859-1'
                                     )
                 assert @repository
                 @char_1        = CHAR_1_HEX.dup
                 if @char_1.respond_to?(:force_encoding)
                   @char_1.force_encoding('UTF-8')
                 end
               end
               def test_blank_path_to_repository_error_message
                 set_language_if_valid 'en'
                 repo = Repository::Git.new(
                                       :project      => @project,
                                       :identifier   => 'test'
                                     )
                 assert !repo.save
                 assert_include "Path to repository can't be blank",
                                repo.errors.full_messages
               end
               def test_blank_path_to_repository_error_message_fr
                 set_language_if_valid 'fr'
                 str = "Chemin du d\xc3\xa9p\xc3\xb4t doit \xc3\xaatre renseign\xc3\xa9(e)"
                 str.force_encoding('UTF-8') if str.respond_to?(:force_encoding)
                 repo = Repository::Git.new(
                                       :project      => @project,
                                       :url          => "",
                                       :identifier   => 'test',
                                       :path_encoding => ''
                                     )
                 assert !repo.save
                 assert_include str, repo.errors.full_messages
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_scm_available
                   klass = Repository::Git
                   assert_equal "Git", klass.scm_name
                   assert klass.scm_adapter_class
                   assert_not_equal "", klass.scm_command
                   assert_equal true, klass.scm_available
                 end
                 def test_fetch_changesets_from_scratch
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_equal 39, @repository.changes.count
                   commit = @repository.changesets.find_by_revision("7234cb2750b63f47bff735edc50a1c0a433c2518")
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518", commit.scmid
                   assert_equal "Initial import.\nThe repository contains 3 files.", commit.comments
                   assert_equal "jsmith <jsmith@foo.bar>", commit.committer
                   assert_equal User.find_by_login('jsmith'), commit.user
                   # TODO: add a commit with commit time <> author time to the test repository
                   assert_equal "2007-12-14 09:22:52".to_time, commit.committed_on
                   assert_equal "2007-12-14".to_date, commit.commit_date
                   assert_equal 3, commit.changes.count
                   change = commit.changes.sort_by(&:path).first
                   assert_equal "README", change.path
                   assert_equal "A", change.action
-                  assert_equal NUM_HEAD, @repository.extra_info["branches"].size
+                  assert_equal NUM_HEAD, @repository.extra_info["heads"].size
                 end
                 def test_fetch_changesets_incremental
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  extra_info_db = @repository.extra_info["branches"]
+                  extra_info_heads = @repository.extra_info["heads"].dup
-                  assert_equal "1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127",
+                  assert_equal NUM_HEAD, extra_info_heads.size
-                                extra_info_db["latin-1-path-encoding"]["last_scmid"]
+                  extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
-                  assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
+                  assert_equal 4, extra_info_heads.size
-                                extra_info_db["master"]["last_scmid"]
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                       "4f26664364207fa8b1af9f8722647ab2d4ac5d43",
                       "deff712f05a90d96edbd70facc47d944be5897e3",
                       "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                       "7e61ac704deecde634b51e59daa8110435dcb3da",
                      ]
                   @repository.changesets.each do |rev|
                     rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
                   end
                   @project.reload
                   cs1 = @repository.changesets
-                  assert_equal 22, cs1.count
+                  assert_equal NUM_REV - 6, cs1.count
-                  h = @repository.extra_info.dup
+                  extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
-                  h["branches"]["master"]["last_scmid"] =
+                  h = {}
-                        "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
+                  h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
-                  extra_info_db_1 = @repository.extra_info["branches"]
+                  assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8")
-                  assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
-                                extra_info_db_1["master"]["last_scmid"]
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
+                  assert_equal NUM_HEAD, @repository.extra_info["heads"].size
+                  assert @repository.extra_info["heads"].index("83ca5fd546063a3c7dc2e568ba3355661a9e2b2c")
                 end
                 def test_fetch_changesets_history_editing
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  assert_equal NUM_HEAD, @repository.extra_info["branches"].size
+                  extra_info_heads = @repository.extra_info["heads"].dup
-                  assert_equal "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
+                  assert_equal NUM_HEAD, extra_info_heads.size
-                                 @repository.extra_info["branches"]["master"]["last_scmid"]
+                  extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
+                  assert_equal 4, extra_info_heads.size
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                       "4f26664364207fa8b1af9f8722647ab2d4ac5d43",
                       "deff712f05a90d96edbd70facc47d944be5897e3",
                       "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                       "7e61ac704deecde634b51e59daa8110435dcb3da",
                      ]
                   @repository.changesets.each do |rev|
                     rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
                   end
                   @project.reload
                   assert_equal NUM_REV - 6, @repository.changesets.count
                   c = Changeset.new(:repository   => @repository,
                                     :committed_on => Time.now,
                                     :revision     => "abcd1234efgh",
                                     :scmid        => "abcd1234efgh",
                                     :comments     => 'test')
                   assert c.save
                   @project.reload
                   assert_equal NUM_REV - 5, @repository.changesets.count
-                  h = @repository.extra_info.dup
+                  extra_info_heads << "abcd1234efgh"
-                  h["branches"]["master"]["last_scmid"] = "abcd1234efgh"
+                  h = {}
+                  h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
-                  assert_equal "abcd1234efgh",
+                  h1 = @repository.extra_info["heads"].dup
-                                @repository.extra_info["branches"]["master"]["last_scmid"]
+                  assert h1.index("abcd1234efgh")
+                  assert_equal 5, h1.size
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV - 5, @repository.changesets.count
+                  h2 = @repository.extra_info["heads"].dup
+                  assert_equal h1, h2
                 end
                 def test_parents
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   r1 = @repository.find_changeset_by_name("7234cb2750b63")
                   assert_equal [], r1.parents
                   r2 = @repository.find_changeset_by_name("899a15dba03a3")
                   assert_equal 1, r2.parents.length
                   assert_equal "7234cb2750b63f47bff735edc50a1c0a433c2518",
                                r2.parents[0].identifier
                   r3 = @repository.find_changeset_by_name("32ae898b720c2")
                   assert_equal 2, r3.parents.length
                   r4 = [r3.parents[0].identifier, r3.parents[1].identifier].sort
                   assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8", r4[0]
                   assert_equal "7e61ac704deecde634b51e59daa8110435dcb3da", r4[1]
                 end
                 def test_db_consistent_ordering_init
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 1, @repository.extra_info["db_consistent"]["ordering"]
                 end
                 def test_db_consistent_ordering_before_1_2
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   assert_not_nil @repository.extra_info
                   h = {}
                   h["heads"] = []
                   h["branches"] = {}
                   h["db_consistent"] = {}
                   @repository.merge_extra_info(h)
                   @repository.save
                   assert_equal NUM_REV, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
+                  extra_info_heads = @repository.extra_info["heads"].dup
+                  extra_info_heads.delete_if { |x| x == "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c" }
                   del_revs = [
                       "83ca5fd546063a3c7dc2e568ba3355661a9e2b2c",
                       "ed5bb786bbda2dee66a2d50faf51429dbc043a7b",
                       "4f26664364207fa8b1af9f8722647ab2d4ac5d43",
                       "deff712f05a90d96edbd70facc47d944be5897e3",
                       "32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf",
                       "7e61ac704deecde634b51e59daa8110435dcb3da",
                      ]
                   @repository.changesets.each do |rev|
                     rev.destroy if del_revs.detect {|r| r == rev.scmid.to_s }
                   end
                   @project.reload
                   cs1 = @repository.changesets
                   assert_equal NUM_REV - 6, cs1.count
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
-                  h = @repository.extra_info.dup
-                  h["branches"]["master"]["last_scmid"] =
+                  extra_info_heads << "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
-                        "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8"
+                  h = {}
+                  h["heads"] = extra_info_heads
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
-                  extra_info_db_1 = @repository.extra_info["branches"]
+                  assert @repository.extra_info["heads"].index("4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8")
-                  assert_equal "4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8",
-                                extra_info_db_1["master"]["last_scmid"]
                   @repository.fetch_changesets
+                  @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
+                  assert_equal NUM_HEAD, @repository.extra_info["heads"].size
                   assert_equal 0, @repository.extra_info["db_consistent"]["ordering"]
                 end
                 def test_heads_from_branches_hash
                   assert_nil @repository.extra_info
                   assert_equal 0, @repository.changesets.count
                   assert_equal [], @repository.heads_from_branches_hash
                   h = {}
                   h["branches"] = {}
                   h["branches"]["test1"] = {}
                   h["branches"]["test1"]["last_scmid"] = "1234abcd"
                   h["branches"]["test2"] = {}
                   h["branches"]["test2"]["last_scmid"] = "abcd1234"
                   @repository.merge_extra_info(h)
                   @repository.save
                   @project.reload
                   assert_equal ["1234abcd", "abcd1234"], @repository.heads_from_branches_hash.sort
                 end
                 def test_latest_changesets
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   # with limit
                   changesets = @repository.latest_changesets('', 'master', 2)
                   assert_equal 2, changesets.size
                   # with path
                   changesets = @repository.latest_changesets('images', 'master')
                   assert_equal [
                           'deff712f05a90d96edbd70facc47d944be5897e3',
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', nil)
                   assert_equal [
                           '32ae898b720c2f7eec2723d5bdd558b4cb2d3ddf',
                           '4a07fe31bffcf2888791f3e6cbc9c4545cefe3e8',
                           '713f4944648826f558cf548222f813dabe7cbb04',
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   # with path, revision and limit
                   changesets = @repository.latest_changesets('images', '899a15dba')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('images', '899a15dba', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', '899a15dba')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', '899a15dba', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   # with path, tag and limit
                   changesets = @repository.latest_changesets('images', 'tag01.annotated')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('images', 'tag01.annotated', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'tag01.annotated')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'tag01.annotated', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   # with path, branch and limit
                   changesets = @repository.latest_changesets('images', 'test_branch')
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('images', 'test_branch', 1)
                   assert_equal [
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'test_branch')
                   assert_equal [
                           '713f4944648826f558cf548222f813dabe7cbb04',
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                           '899a15dba03a3b350b89c3f537e4bbe02a03cdc9',
                           '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       ], changesets.collect(&:revision)
                   changesets = @repository.latest_changesets('README', 'test_branch', 2)
                   assert_equal [
                           '713f4944648826f558cf548222f813dabe7cbb04',
                           '61b685fbe55ab05b5ac68402d5720c1a6ac973d1',
                       ], changesets.collect(&:revision)
                   if JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     # latin-1 encoding path
                     changesets = @repository.latest_changesets(
                                   "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89')
                     assert_equal [
                           '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
                           '4fc55c43bf3d3dc2efb66145365ddc17639ce81e',
                       ], changesets.collect(&:revision)
                     changesets = @repository.latest_changesets(
                                 "latin-1-dir/test-#{@char_1}-2.txt", '64f1f3e89', 1)
                     assert_equal [
                           '64f1f3e89ad1cb57976ff0ad99a107012ba3481d',
                       ], changesets.collect(&:revision)
                   end
                 end
                 def test_latest_changesets_latin_1_dir
                   if WINDOWS_PASS
                     #
                   elsif JRUBY_SKIP
                     puts JRUBY_SKIP_STR
                   else
                     assert_equal 0, @repository.changesets.count
                     @repository.fetch_changesets
                     @project.reload
                     assert_equal NUM_REV, @repository.changesets.count
                     changesets = @repository.latest_changesets(
                                 "latin-1-dir/test-#{@char_1}-subdir", '1ca7f5ed')
                     assert_equal [
                           '1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127',
                       ], changesets.collect(&:revision)
                   end
                 end
                 def test_find_changeset_by_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['7234cb2750b63f47bff735edc50a1c0a433c2518', '7234cb2750b'].each do |r|
                     assert_equal '7234cb2750b63f47bff735edc50a1c0a433c2518',
                                  @repository.find_changeset_by_name(r).revision
                   end
                 end
                 def test_find_changeset_by_empty_name
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   ['', ' ', nil].each do |r|
                     assert_nil @repository.find_changeset_by_name(r)
                   end
                 end
                 def test_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision(
                                       '7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal c.scmid, c.identifier
                 end
                 def test_format_identifier
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   c = @repository.changesets.find_by_revision(
                                       '7234cb2750b63f47bff735edc50a1c0a433c2518')
                   assert_equal '7234cb27', c.format_identifier
                 end
                 def test_activities
                   c = Changeset.new(:repository => @repository,
                                     :committed_on => Time.now,
                                     :revision => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
                                     :scmid    => 'abc7234cb2750b63f47bff735edc50a1c0a433c2',
                                     :comments => 'test')
                   assert c.event_title.include?('abc7234c:')
                   assert_equal 'abc7234cb2750b63f47bff735edc50a1c0a433c2', c.event_url[:rev]
                 end
                 def test_log_utf8
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   str_felix_hex  = FELIX_HEX.dup
                   if str_felix_hex.respond_to?(:force_encoding)
                       str_felix_hex.force_encoding('UTF-8')
                   end
                   c = @repository.changesets.find_by_revision(
                                     'ed5bb786bbda2dee66a2d50faf51429dbc043a7b')
                   assert_equal "#{str_felix_hex} <felix@fachschaften.org>", c.committer
                 end
                 def test_previous
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
                       assert_equal @repository.find_changeset_by_name(r2), changeset.previous
                     end
                   end
                 end
                 def test_previous_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  %w|95488a44bc25f7d1f97d775a31359539ff333a63 95488a44b|.each do |r1|
+                  %w|7234cb2750b63f47bff735edc50a1c0a433c2518 7234cb275|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.previous
                   end
                 end
                 def test_next
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
                   %w|64f1f3e89ad1cb57976ff0ad99a107012ba3481d 64f1f3e89ad1|.each do |r2|
                     changeset = @repository.find_changeset_by_name(r2)
                     %w|1ca7f5ed374f3cb31a93ae5215c2e25cc6ec5127 1ca7f5ed|.each do |r1|
                     assert_equal @repository.find_changeset_by_name(r1), changeset.next
                     end
                   end
                 end
                 def test_next_nil
                   assert_equal 0, @repository.changesets.count
                   @repository.fetch_changesets
                   @project.reload
                   assert_equal NUM_REV, @repository.changesets.count
-                  %w|67e7792ce20ccae2e4bb73eed09bb397819c8834 67e7792ce20cca|.each do |r1|
+                  %w|2a682156a3b6e77a8bf9cd4590e8db757f3c6c78 2a682156a3b6e77a|.each do |r1|
                     changeset = @repository.find_changeset_by_name(r1)
                     assert_nil changeset.next
                   end
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping unit tests !!!"
                 def test_fake; assert true end
               end
             end

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