jro_apps/redmine Commit - r13063:a56754633520

Don't link multiple changesets from the same commit multiple times (#17931)....

Jean-Philippe Lang -

r13063:a56754633520

parent child

Context file:

r13063:a56754633520

Collapse all files

app/models/changeset.rb +7 -1

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             class Changeset < ActiveRecord::Base
               belongs_to :repository
               belongs_to :user
               has_many :filechanges, :class_name => 'Change', :dependent => :delete_all
               has_and_belongs_to_many :issues
               has_and_belongs_to_many :parents,
                                       :class_name => "Changeset",
                                       :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                       :association_foreign_key => 'parent_id', :foreign_key => 'changeset_id'
               has_and_belongs_to_many :children,
                                       :class_name => "Changeset",
                                       :join_table => "#{table_name_prefix}changeset_parents#{table_name_suffix}",
                                       :association_foreign_key => 'changeset_id', :foreign_key => 'parent_id'
               acts_as_event :title => Proc.new {|o| o.title},
                             :description => :long_comments,
                             :datetime => :committed_on,
                             :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
               acts_as_searchable :columns => 'comments',
                                  :include => {:repository => :project},
                                  :project_key => "#{Repository.table_name}.project_id",
                                  :date_column => 'committed_on'
               acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                                         :author_key => :user_id,
                                         :find_options => {:include => [:user, {:repository => :project}]}
               validates_presence_of :repository_id, :revision, :committed_on, :commit_date
               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
               scope :visible, lambda {|*args|
                 includes(:repository => :project).where(Project.allowed_to_condition(args.shift || User.current, :view_changesets, *args))
               }
               after_create :scan_for_issues
               before_create :before_create_cs
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
               # Returns the identifier of this changeset; depending on repository backends
               def identifier
                 if repository.class.respond_to? :changeset_identifier
                   repository.class.changeset_identifier self
                 else
                   revision.to_s
                 end
               end
               def committed_on=(date)
                 self.commit_date = date
                 super
               end
               # Returns the readable identifier
               def format_identifier
                 if repository.class.respond_to? :format_changeset_identifier
                   repository.class.format_changeset_identifier self
                 else
                   identifier
                 end
               end
               def project
                 repository.project
               end
               def author
                 user || committer.to_s.split('<').first
               end
               def before_create_cs
                 self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
                 self.comments  = self.class.normalize_comments(
                                    self.comments, repository.repo_log_encoding)
                 self.user = repository.find_committer_user(self.committer)
               end
               def scan_for_issues
                 scan_comment_for_issue_ids
               end
               TIMELOG_RE = /
                 (
                 ((\d+)(h|hours?))((\d+)(m|min)?)?
                 |
                 ((\d+)(h|hours?|m|min))
                 |
                 (\d+):(\d+)
                 |
                 (\d+([\.,]\d+)?)h?
                 )
                 /x
               def scan_comment_for_issue_ids
                 return if comments.blank?
                 # keywords used to reference issues
                 ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
                 ref_keywords_any = ref_keywords.delete('*')
                 # keywords used to fix issues
                 fix_keywords = Setting.commit_update_keywords_array.map {|r| r['keywords']}.flatten.compact
                 kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
                 referenced_issues = []
                 comments.scan(/([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?(#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+#\d+(\s+@#{TIMELOG_RE})?)*)(?=[[:punct:]]|\s|<|$)/i) do |match|
                   action, refs = match[2].to_s.downcase, match[3]
                   next unless action.present? || ref_keywords_any
                   refs.scan(/#(\d+)(\s+@#{TIMELOG_RE})?/).each do |m|
                     issue, hours = find_referenced_issue_by_id(m[0].to_i), m[2]
-                    if issue
+                    if issue && !issue_linked_to_same_commit?(issue)
                       referenced_issues << issue
                       # Don't update issues or log time when importing old commits
                       unless repository.created_on && committed_on && committed_on < repository.created_on
                         fix_issue(issue, action) if fix_keywords.include?(action)
                         log_time(issue, hours) if hours && Setting.commit_logtime_enabled?
                       end
                     end
                   end
                 end
                 referenced_issues.uniq!
                 self.issues = referenced_issues unless referenced_issues.empty?
               end
               def short_comments
                 @short_comments || split_comments.first
               end
               def long_comments
                 @long_comments || split_comments.last
               end
               def text_tag(ref_project=nil)
                 repo = ""
                 if repository && repository.identifier.present?
                   repo = "#{repository.identifier}|"
                 end
                 tag = if scmid?
                   "commit:#{repo}#{scmid}"
                 else
                   "#{repo}r#{revision}"
                 end
                 if ref_project && project && ref_project != project
                   tag = "#{project.identifier}:#{tag}"
                 end
                 tag
               end
               # Returns the title used for the changeset in the activity/search results
               def title
                 repo = (repository && repository.identifier.present?) ? " (#{repository.identifier})" : ''
                 comm = short_comments.blank? ? '' : (': ' + short_comments)
                 "#{l(:label_revision)} #{format_identifier}#{repo}#{comm}"
               end
               # Returns the previous changeset
               def previous
                 @previous ||= Changeset.where(["id < ? AND repository_id = ?", id, repository_id]).order('id DESC').first
               end
               # Returns the next changeset
               def next
                 @next ||= Changeset.where(["id > ? AND repository_id = ?", id, repository_id]).order('id ASC').first
               end
               # Creates a new Change from it's common parameters
               def create_change(change)
                 Change.create(:changeset     => self,
                               :action        => change[:action],
                               :path          => change[:path],
                               :from_path     => change[:from_path],
                               :from_revision => change[:from_revision])
               end
               # Finds an issue that can be referenced by the commit message
               def find_referenced_issue_by_id(id)
                 return nil if id.blank?
                 issue = Issue.includes(:project).where(:id => id.to_i).first
                 if Setting.commit_cross_project_ref?
                   # all issues can be referenced/fixed
                 elsif issue
                   # issue that belong to the repository project, a subproject or a parent project only
                   unless issue.project &&
                             (project == issue.project || project.is_ancestor_of?(issue.project) ||
                              project.is_descendant_of?(issue.project))
                     issue = nil
                   end
                 end
                 issue
               end
               private
+              # Returns true if the issue is already linked to the same commit
+              # from a different repository
+              def issue_linked_to_same_commit?(issue)
+                repository.same_commits_in_scope(issue.changesets, self).any?
+              end
               # Updates the +issue+ according to +action+
               def fix_issue(issue, action)
                 # the issue may have been updated by the closure of another one (eg. duplicate)
                 issue.reload
                 # don't change the status is the issue is closed
                 return if issue.status && issue.status.is_closed?
                 journal = issue.init_journal(user || User.anonymous,
                                              ll(Setting.default_language,
                                                 :text_status_changed_by_changeset,
                                                 text_tag(issue.project)))
                 rule = Setting.commit_update_keywords_array.detect do |rule|
                   rule['keywords'].include?(action) &&
                     (rule['if_tracker_id'].blank? || rule['if_tracker_id'] == issue.tracker_id.to_s)
                 end
                 if rule
                   issue.assign_attributes rule.slice(*Issue.attribute_names)
                 end
                 Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
                                         { :changeset => self, :issue => issue, :action => action })
                 unless issue.save
                   logger.warn("Issue ##{issue.id} could not be saved by changeset #{id}: #{issue.errors.full_messages}") if logger
                 end
                 issue
               end
               def log_time(issue, hours)
                 time_entry = TimeEntry.new(
                   :user => user,
                   :hours => hours,
                   :issue => issue,
                   :spent_on => commit_date,
                   :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
                                  :locale => Setting.default_language)
                   )
                 time_entry.activity = log_time_activity unless log_time_activity.nil?
                 unless time_entry.save
                   logger.warn("TimeEntry could not be created by changeset #{id}: #{time_entry.errors.full_messages}") if logger
                 end
                 time_entry
               end
               def log_time_activity
                 if Setting.commit_logtime_activity_id.to_i > 0
                   TimeEntryActivity.find_by_id(Setting.commit_logtime_activity_id.to_i)
                 end
               end
               def split_comments
                 comments =~ /\A(.+?)\r?\n(.*)$/m
                 @short_comments = $1 || comments
                 @long_comments = $2.to_s.strip
                 return @short_comments, @long_comments
               end
               public
               # Strips and reencodes a commit log before insertion into the database
               def self.normalize_comments(str, encoding)
                 Changeset.to_utf8(str.to_s.strip, encoding)
               end
               def self.to_utf8(str, encoding)
                 Redmine::CodesetUtil.to_utf8(str, encoding)
               end
             end

app/models/repository.rb +12 0

             # Redmine - project management software
             # Copyright (C) 2006-2014  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.
             class ScmFetchError < Exception; end
             class Repository < ActiveRecord::Base
               include Redmine::Ciphering
               include Redmine::SafeAttributes
               # Maximum length for repository identifiers
               IDENTIFIER_MAX_LENGTH = 255
               belongs_to :project
               has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
               has_many :filechanges, :class_name => 'Change', :through => :changesets
               serialize :extra_info
               before_save :check_default
               # Raw SQL to delete changesets and changes in the database
               # has_many :changesets, :dependent => :destroy is too slow for big repositories
               before_destroy :clear_changesets
               validates_length_of :password, :maximum => 255, :allow_nil => true
               validates_length_of :identifier, :maximum => IDENTIFIER_MAX_LENGTH, :allow_blank => true
               validates_presence_of :identifier, :unless => Proc.new { |r| r.is_default? || r.set_as_default? }
               validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
               validates_exclusion_of :identifier, :in => %w(browse show entry raw changes annotate diff statistics graph revisions revision)
               # donwcase letters, digits, dashes, underscores but not digits only
               validates_format_of :identifier, :with => /\A(?!\d+$)[a-z0-9\-_]*\z/, :allow_blank => true
               # Checks if the SCM is enabled when creating a repository
               validate :repo_create_validation, :on => :create
               safe_attributes 'identifier',
                 'login',
                 'password',
                 'path_encoding',
                 'log_encoding',
                 'is_default'
               safe_attributes 'url',
                 :if => lambda {|repository, user| repository.new_record?}
               def repo_create_validation
                 unless Setting.enabled_scm.include?(self.class.name.demodulize)
                   errors.add(:type, :invalid)
                 end
               end
               def self.human_attribute_name(attribute_key_name, *args)
                 attr_name = attribute_key_name.to_s
                 if attr_name == "log_encoding"
                   attr_name = "commit_logs_encoding"
                 end
                 super(attr_name, *args)
               end
               # Removes leading and trailing whitespace
               def url=(arg)
                 write_attribute(:url, arg ? arg.to_s.strip : nil)
               end
               # Removes leading and trailing whitespace
               def root_url=(arg)
                 write_attribute(:root_url, arg ? arg.to_s.strip : nil)
               end
               def password
                 read_ciphered_attribute(:password)
               end
               def password=(arg)
                 write_ciphered_attribute(:password, arg)
               end
               def scm_adapter
                 self.class.scm_adapter_class
               end
               def scm
                 unless @scm
                   @scm = self.scm_adapter.new(url, root_url,
                                               login, password, path_encoding)
                   if root_url.blank? && @scm.root_url.present?
                     update_attribute(:root_url, @scm.root_url)
                   end
                 end
                 @scm
               end
               def scm_name
                 self.class.scm_name
               end
               def name
                 if identifier.present?
                   identifier
                 elsif is_default?
                   l(:field_repository_is_default)
                 else
                   scm_name
                 end
               end
               def identifier=(identifier)
                 super unless identifier_frozen?
               end
               def identifier_frozen?
                 errors[:identifier].blank? && !(new_record? || identifier.blank?)
               end
               def identifier_param
                 if is_default?
                   nil
                 elsif identifier.present?
                   identifier
                 else
                   id.to_s
                 end
               end
               def <=>(repository)
                 if is_default?
                   -1
                 elsif repository.is_default?
                 else
                   identifier.to_s <=> repository.identifier.to_s
                 end
               end
               def self.find_by_identifier_param(param)
                 if param.to_s =~ /^\d+$/
                   find_by_id(param)
                 else
                   find_by_identifier(param)
                 end
               end
               # TODO: should return an empty hash instead of nil to avoid many ||{}
               def extra_info
                 h = read_attribute(:extra_info)
                 h.is_a?(Hash) ? h : nil
               end
               def merge_extra_info(arg)
                 h = extra_info || {}
                 return h if arg.nil?
                 h.merge!(arg)
                 write_attribute(:extra_info, h)
               end
               def report_last_commit
                 true
               end
               def supports_cat?
                 scm.supports_cat?
               end
               def supports_annotate?
                 scm.supports_annotate?
               end
               def supports_all_revisions?
                 true
               end
               def supports_directory_revisions?
                 false
               end
               def supports_revision_graph?
                 false
               end
               def entry(path=nil, identifier=nil)
                 scm.entry(path, identifier)
               end
               def scm_entries(path=nil, identifier=nil)
                 scm.entries(path, identifier)
               end
               protected :scm_entries
               def entries(path=nil, identifier=nil)
                 entries = scm_entries(path, identifier)
                 load_entries_changesets(entries)
                 entries
               end
               def branches
                 scm.branches
               end
               def tags
                 scm.tags
               end
               def default_branch
                 nil
               end
               def properties(path, identifier=nil)
                 scm.properties(path, identifier)
               end
               def cat(path, identifier=nil)
                 scm.cat(path, identifier)
               end
               def diff(path, rev, rev_to)
                 scm.diff(path, rev, rev_to)
               end
               def diff_format_revisions(cs, cs_to, sep=':')
                 text = ""
                 text << cs_to.format_identifier + sep if cs_to
                 text << cs.format_identifier if cs
                 text
               end
               # Returns a path relative to the url of the repository
               def relative_path(path)
                 path
               end
               # Finds and returns a revision with a number or the beginning of a hash
               def find_changeset_by_name(name)
                 return nil if name.blank?
                 s = name.to_s
                 if s.match(/^\d*$/)
                   changesets.where("revision = ?", s).first
                 else
                   changesets.where("revision LIKE ?", s + '%').first
                 end
               end
               def latest_changeset
                 @latest_changeset ||= changesets.first
               end
               # Returns the latest changesets for +path+
               # Default behaviour is to search in cached changesets
               def latest_changesets(path, rev, limit=10)
                 if path.blank?
                   changesets.
                     reorder("#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC").
                     limit(limit).
                     preload(:user).
                     all
                 else
                   filechanges.
                     where("path = ?", path.with_leading_slash).
                     reorder("#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC").
                     limit(limit).
                     preload(:changeset => :user).
                     collect(&:changeset)
                 end
               end
               def scan_changesets_for_issue_ids
                 self.changesets.each(&:scan_comment_for_issue_ids)
               end
               # Returns an array of committers usernames and associated user_id
               def committers
                 @committers ||= Changeset.connection.select_rows(
                      "SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
               end
               # Maps committers username to a user ids
               def committer_ids=(h)
                 if h.is_a?(Hash)
                   committers.each do |committer, user_id|
                     new_user_id = h[committer]
                     if new_user_id && (new_user_id.to_i != user_id.to_i)
                       new_user_id = (new_user_id.to_i > 0 ? new_user_id.to_i : nil)
                       Changeset.where(["repository_id = ? AND committer = ?", id, committer]).
                         update_all("user_id = #{new_user_id.nil? ? 'NULL' : new_user_id}")
                     end
                   end
                   @committers            = nil
                   @found_committer_users = nil
                   true
                 else
                   false
                 end
               end
               # Returns the Redmine User corresponding to the given +committer+
               # It will return nil if the committer is not yet mapped and if no User
               # with the same username or email was found
               def find_committer_user(committer)
                 unless committer.blank?
                   @found_committer_users ||= {}
                   return @found_committer_users[committer] if @found_committer_users.has_key?(committer)
                   user = nil
                   c = changesets.where(:committer => committer).includes(:user).first
                   if c && c.user
                     user = c.user
                   elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
                     username, email = $1.strip, $3
                     u = User.find_by_login(username)
                     u ||= User.find_by_mail(email) unless email.blank?
                     user = u
                   end
                   @found_committer_users[committer] = user
                   user
                 end
               end
               def repo_log_encoding
                 encoding = log_encoding.to_s.strip
                 encoding.blank? ? 'UTF-8' : encoding
               end
               # Fetches new changesets for all repositories of active projects
               # Can be called periodically by an external script
               # eg. ruby script/runner "Repository.fetch_changesets"
               def self.fetch_changesets
                 Project.active.has_module(:repository).all.each do |project|
                   project.repositories.each do |repository|
                     begin
                       repository.fetch_changesets
                     rescue Redmine::Scm::Adapters::CommandFailed => e
                       logger.error "scm: error during fetching changesets: #{e.message}"
                     end
                   end
                 end
               end
               # scan changeset comments to find related and fixed issues for all repositories
               def self.scan_changesets_for_issue_ids
                 all.each(&:scan_changesets_for_issue_ids)
               end
               def self.scm_name
                 'Abstract'
               end
               def self.available_scm
                 subclasses.collect {|klass| [klass.scm_name, klass.name]}
               end
               def self.factory(klass_name, *args)
                 klass = "Repository::#{klass_name}".constantize
                 klass.new(*args)
               rescue
                 nil
               end
               def self.scm_adapter_class
                 nil
               end
               def self.scm_command
                 ret = ""
                 begin
                   ret = self.scm_adapter_class.client_command if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get command: #{e.message}"
                 end
                 ret
               end
               def self.scm_version_string
                 ret = ""
                 begin
                   ret = self.scm_adapter_class.client_version_string if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get version string: #{e.message}"
                 end
                 ret
               end
               def self.scm_available
                 ret = false
                 begin
                   ret = self.scm_adapter_class.client_available if self.scm_adapter_class
                 rescue Exception => e
                   logger.error "scm: error during get scm available: #{e.message}"
                 end
                 ret
               end
               def set_as_default?
                 new_record? && project && Repository.where(:project_id => project.id).empty?
               end
               # Returns a hash with statistics by author in the following form:
               # {
               #   "John Smith" => { :commits => 45, :changes => 324 },
               #   "Bob" => { ... }
               # }
               #
               # Notes:
               # - this hash honnors the users mapping defined for the repository
               def stats_by_author
                 commits = Changeset.where("repository_id = ?", id).select("committer, user_id, count(*) as count").group("committer, user_id")
                 #TODO: restore ordering ; this line probably never worked
                 #commits.to_a.sort! {|x, y| x.last <=> y.last}
                 changes = Change.joins(:changeset).where("#{Changeset.table_name}.repository_id = ?", id).select("committer, user_id, count(*) as count").group("committer, user_id")
                 user_ids = changesets.map(&:user_id).compact.uniq
                 authors_names = User.where(:id => user_ids).inject({}) do |memo, user|
                   memo[user.id] = user.to_s
                   memo
                 end
                 (commits + changes).inject({}) do |hash, element|
                   mapped_name = element.committer
                   if username = authors_names[element.user_id.to_i]
                     mapped_name = username
                   end
                   hash[mapped_name] ||= { :commits_count => 0, :changes_count => 0 }
                   if element.is_a?(Changeset)
                     hash[mapped_name][:commits_count] += element.count.to_i
                   else
                     hash[mapped_name][:changes_count] += element.count.to_i
                   end
                   hash
                 end
               end
+              # Returns a scope of changesets that come from the same commit as the given changeset
+              # in different repositories that point to the same backend
+              def same_commits_in_scope(scope, changeset)
+                scope = scope.joins(:repository).where(:repositories => {:url => url, :root_url => root_url, :type => type})
+                if changeset.scmid.present?
+                  scope = scope.where(:scmid => changeset.scmid)
+                else
+                  scope = scope.where(:revision => changeset.revision)
+                end
+                scope
+              end
               protected
               def check_default
                 if !is_default? && set_as_default?
                   self.is_default = true
                 end
                 if is_default? && is_default_changed?
                   Repository.where(["project_id = ?", project_id]).update_all(["is_default = ?", false])
                 end
               end
               def load_entries_changesets(entries)
                 if entries
                   entries.each do |entry|
                     if entry.lastrev && entry.lastrev.identifier
                       entry.changeset = find_changeset_by_name(entry.lastrev.identifier)
                     end
                   end
                 end
               end
               private
               # Deletes repository data
               def clear_changesets
                 cs = Changeset.table_name
                 ch = Change.table_name
                 ci = "#{table_name_prefix}changesets_issues#{table_name_suffix}"
                 cp = "#{table_name_prefix}changeset_parents#{table_name_suffix}"
                 connection.delete("DELETE FROM #{ch} WHERE #{ch}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{ci} WHERE #{ci}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{cp} WHERE #{cp}.changeset_id IN (SELECT #{cs}.id FROM #{cs} WHERE #{cs}.repository_id = #{id})")
                 connection.delete("DELETE FROM #{cs} WHERE #{cs}.repository_id = #{id}")
                 clear_extra_info_of_changesets
               end
               def clear_extra_info_of_changesets
               end
             end

test/unit/changeset_test.rb +11 0

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2014  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 ChangesetTest < ActiveSupport::TestCase
               fixtures :projects, :repositories,
                        :issues, :issue_statuses, :issue_categories,
                        :changesets, :changes,
                        :enumerations,
                        :custom_fields, :custom_values,
                        :users, :members, :member_roles,
                        :trackers, :projects_trackers,
                        :enabled_modules, :roles
               def test_ref_keywords_any
                 ActionMailer::Base.deliveries.clear
                 Setting.commit_ref_keywords = '*'
                 Setting.commit_update_keywords = [{'keywords' => 'fixes , closes', 'status_id' => '5', 'done_ratio' => '90'}]
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => 'New commit (#2). Fixes #1',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [1, 2], c.issue_ids.sort
                 fixed = Issue.find(1)
                 assert fixed.closed?
                 assert_equal 90, fixed.done_ratio
                 assert_equal 1, ActionMailer::Base.deliveries.size
               end
               def test_ref_keywords
                 Setting.commit_ref_keywords = 'refs'
                 Setting.commit_update_keywords = ''
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => 'Ignores #2. Refs #1',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [1], c.issue_ids.sort
               end
               def test_ref_keywords_any_only
                 Setting.commit_ref_keywords = '*'
                 Setting.commit_update_keywords = ''
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => 'Ignores #2. Refs #1',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [1, 2], c.issue_ids.sort
               end
               def test_ref_keywords_any_with_timelog
                 Setting.commit_ref_keywords = '*'
                 Setting.commit_logtime_enabled = '1'
                 {
                   '2' => 2.0,
                   '2h' => 2.0,
                   '2hours' => 2.0,
                   '15m' => 0.25,
                   '15min' => 0.25,
                   '3h15' => 3.25,
                   '3h15m' => 3.25,
                   '3h15min' => 3.25,
                   '3:15' => 3.25,
                   '3.25' => 3.25,
                   '3.25h' => 3.25,
                   '3,25' => 3.25,
                   '3,25h' => 3.25,
                 }.each do |syntax, expected_hours|
                   c = Changeset.new(:repository   => Project.find(1).repository,
                                     :committed_on => 24.hours.ago,
                                     :comments     => "Worked on this issue #1 @#{syntax}",
                                     :revision     => '520',
                                     :user         => User.find(2))
                   assert_difference 'TimeEntry.count' do
                     c.scan_comment_for_issue_ids
                   end
                   assert_equal [1], c.issue_ids.sort
                   time = TimeEntry.order('id desc').first
                   assert_equal 1, time.issue_id
                   assert_equal 1, time.project_id
                   assert_equal 2, time.user_id
                   assert_equal expected_hours, time.hours,
                       "@#{syntax} should be logged as #{expected_hours} hours but was #{time.hours}"
                   assert_equal Date.yesterday, time.spent_on
                   assert time.activity.is_default?
                   assert time.comments.include?('r520'),
                         "r520 was expected in time_entry comments: #{time.comments}"
                 end
               end
               def test_ref_keywords_closing_with_timelog
                 Setting.commit_ref_keywords = '*'
                 Setting.commit_update_keywords = [{'keywords' => 'fixes , closes',
                                                    'status_id' => IssueStatus.where(:is_closed => true).first.id.to_s}]
                 Setting.commit_logtime_enabled = '1'
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => 'This is a comment. Fixes #1 @4.5, #2 @1',
                                   :user         => User.find(2))
                 assert_difference 'TimeEntry.count', 2 do
                   c.scan_comment_for_issue_ids
                 end
                 assert_equal [1, 2], c.issue_ids.sort
                 assert Issue.find(1).closed?
                 assert Issue.find(2).closed?
                 times = TimeEntry.order('id desc').limit(2)
                 assert_equal [1, 2], times.collect(&:issue_id).sort
               end
               def test_ref_keywords_any_line_start
                 Setting.commit_ref_keywords = '*'
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => '#1 is the reason of this commit',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [1], c.issue_ids.sort
               end
               def test_ref_keywords_allow_brackets_around_a_issue_number
                 Setting.commit_ref_keywords = '*'
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => '[#1] Worked on this issue',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [1], c.issue_ids.sort
               end
               def test_ref_keywords_allow_brackets_around_multiple_issue_numbers
                 Setting.commit_ref_keywords = '*'
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => '[#1 #2, #3] Worked on these',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [1,2,3], c.issue_ids.sort
               end
               def test_update_keywords_with_multiple_rules
                 with_settings :commit_update_keywords => [
                   {'keywords' => 'fixes, closes', 'status_id' => '5'},
                   {'keywords' => 'resolves', 'status_id' => '3'}
                 ] do
                   issue1 = Issue.generate!
                   issue2 = Issue.generate!
                   Changeset.generate!(:comments => "Closes ##{issue1.id}\nResolves ##{issue2.id}")
                   assert_equal 5, issue1.reload.status_id
                   assert_equal 3, issue2.reload.status_id
                 end
               end
               def test_update_keywords_with_multiple_rules_should_match_tracker
                 with_settings :commit_update_keywords => [
                   {'keywords' => 'fixes', 'status_id' => '5', 'if_tracker_id' => '2'},
                   {'keywords' => 'fixes', 'status_id' => '3', 'if_tracker_id' => ''}
                 ] do
                   issue1 = Issue.generate!(:tracker_id => 2)
                   issue2 = Issue.generate!
                   Changeset.generate!(:comments => "Fixes ##{issue1.id}, ##{issue2.id}")
                   assert_equal 5, issue1.reload.status_id
                   assert_equal 3, issue2.reload.status_id
                 end
               end
               def test_update_keywords_with_multiple_rules_and_no_match
                 with_settings :commit_update_keywords => [
                   {'keywords' => 'fixes', 'status_id' => '5', 'if_tracker_id' => '2'},
                   {'keywords' => 'fixes', 'status_id' => '3', 'if_tracker_id' => '3'}
                 ] do
                   issue1 = Issue.generate!(:tracker_id => 2)
                   issue2 = Issue.generate!
                   Changeset.generate!(:comments => "Fixes ##{issue1.id}, ##{issue2.id}")
                   assert_equal 5, issue1.reload.status_id
                   assert_equal 1, issue2.reload.status_id # no updates
                 end
               end
               def test_commit_referencing_a_subproject_issue
                 c = Changeset.new(:repository   => Project.find(1).repository,
                                   :committed_on => Time.now,
                                   :comments     => 'refs #5, a subproject issue',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [5], c.issue_ids.sort
                 assert c.issues.first.project != c.project
               end
               def test_commit_closing_a_subproject_issue
                 with_settings :commit_update_keywords => [{'keywords' => 'closes', 'status_id' => '5'}],
                               :default_language => 'en' do
                   issue = Issue.find(5)
                   assert !issue.closed?
                   assert_difference 'Journal.count' do
                     c = Changeset.new(:repository   => Project.find(1).repository,
                                       :committed_on => Time.now,
                                       :comments     => 'closes #5, a subproject issue',
                                       :revision     => '12345')
                     assert c.save
                   end
                   assert issue.reload.closed?
                   journal = Journal.order('id DESC').first
                   assert_equal issue, journal.issue
                   assert_include "Applied in changeset ecookbook:r12345.", journal.notes
                 end
               end
               def test_commit_referencing_a_parent_project_issue
                 # repository of child project
                 r = Repository::Subversion.create!(
                       :project => Project.find(3),
                       :url     => 'svn://localhost/test')
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :comments     => 'refs #2, an issue of a parent project',
                                   :revision     => '12345')
                 assert c.save
                 assert_equal [2], c.issue_ids.sort
                 assert c.issues.first.project != c.project
               end
               def test_commit_referencing_a_project_with_commit_cross_project_ref_disabled
                 r = Repository::Subversion.create!(
                       :project => Project.find(3),
                       :url     => 'svn://localhost/test')
                 with_settings :commit_cross_project_ref => '0' do
                   c = Changeset.new(:repository   => r,
                                     :committed_on => Time.now,
                                     :comments     => 'refs #4, an issue of a different project',
                                     :revision     => '12345')
                   assert c.save
                   assert_equal [], c.issue_ids
                 end
               end
               def test_commit_referencing_a_project_with_commit_cross_project_ref_enabled
                 r = Repository::Subversion.create!(
                       :project => Project.find(3),
                       :url     => 'svn://localhost/test')
                 with_settings :commit_cross_project_ref => '1' do
                   c = Changeset.new(:repository   => r,
                                     :committed_on => Time.now,
                                     :comments     => 'refs #4, an issue of a different project',
                                     :revision     => '12345')
                   assert c.save
                   assert_equal [4], c.issue_ids
                 end
               end
               def test_old_commits_should_not_update_issues_nor_log_time
                 Setting.commit_ref_keywords = '*'
                 Setting.commit_update_keywords = {'fixes , closes' => {'status_id' => '5', 'done_ratio' => '90'}}
                 Setting.commit_logtime_enabled = '1'
                 repository = Project.find(1).repository
                 repository.created_on = Time.now
                 repository.save!
                 c = Changeset.new(:repository   => repository,
                                   :committed_on => 1.month.ago,
                                   :comments     => 'New commit (#2). Fixes #1 @1h',
                                   :revision     => '12345')
                 assert_no_difference 'TimeEntry.count' do
                   assert c.save
                 end
                 assert_equal [1, 2], c.issue_ids.sort
                 issue = Issue.find(1)
                 assert_equal 1, issue.status_id
                 assert_equal 0, issue.done_ratio
               end
+              def test_2_repositories_with_same_backend_should_not_link_issue_multiple_times
+                Setting.commit_ref_keywords = '*'
+                r1 = Repository::Subversion.create!(:project_id => 1, :identifier => 'svn1', :url => 'file:///svn1')
+                r2 = Repository::Subversion.create!(:project_id => 1, :identifier => 'svn2', :url => 'file:///svn1')
+                now = Time.now
+                assert_difference 'Issue.find(1).changesets.count' do
+                  c1 = Changeset.create!(:repository => r1, :committed_on => now, :comments => 'Fixes #1', :revision => '12345')
+                  c1 = Changeset.create!(:repository => r2, :committed_on => now, :comments => 'Fixes #1', :revision => '12345')
+                end
+              end
               def test_text_tag_revision
                 c = Changeset.new(:revision => '520')
                 assert_equal 'r520', c.text_tag
               end
               def test_text_tag_revision_with_same_project
                 c = Changeset.new(:revision => '520', :repository => Project.find(1).repository)
                 assert_equal 'r520', c.text_tag(Project.find(1))
               end
               def test_text_tag_revision_with_different_project
                 c = Changeset.new(:revision => '520', :repository => Project.find(1).repository)
                 assert_equal 'ecookbook:r520', c.text_tag(Project.find(2))
               end
               def test_text_tag_revision_with_repository_identifier
                 r = Repository::Subversion.create!(
                       :project_id => 1,
                       :url     => 'svn://localhost/test',
                       :identifier => 'documents')
                 c = Changeset.new(:revision => '520', :repository => r)
                 assert_equal 'documents|r520', c.text_tag
                 assert_equal 'ecookbook:documents|r520', c.text_tag(Project.find(2))
               end
               def test_text_tag_hash
                 c = Changeset.new(
                       :scmid    => '7234cb2750b63f47bff735edc50a1c0a433c2518',
                       :revision => '7234cb2750b63f47bff735edc50a1c0a433c2518')
                 assert_equal 'commit:7234cb2750b63f47bff735edc50a1c0a433c2518', c.text_tag
               end
               def test_text_tag_hash_with_same_project
                 c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => Project.find(1).repository)
                 assert_equal 'commit:7234cb27', c.text_tag(Project.find(1))
               end
               def test_text_tag_hash_with_different_project
                 c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => Project.find(1).repository)
                 assert_equal 'ecookbook:commit:7234cb27', c.text_tag(Project.find(2))
               end
               def test_text_tag_hash_all_number
                 c = Changeset.new(:scmid => '0123456789', :revision => '0123456789')
                 assert_equal 'commit:0123456789', c.text_tag
               end
               def test_text_tag_hash_with_repository_identifier
                 r = Repository::Subversion.new(
                       :project_id => 1,
                       :url     => 'svn://localhost/test',
                       :identifier => 'documents')
                 c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => r)
                 assert_equal 'commit:documents|7234cb27', c.text_tag
                 assert_equal 'ecookbook:commit:documents|7234cb27', c.text_tag(Project.find(2))
               end
               def test_previous
                 changeset = Changeset.find_by_revision('3')
                 assert_equal Changeset.find_by_revision('2'), changeset.previous
               end
               def test_previous_nil
                 changeset = Changeset.find_by_revision('1')
                 assert_nil changeset.previous
               end
               def test_next
                 changeset = Changeset.find_by_revision('2')
                 assert_equal Changeset.find_by_revision('3'), changeset.next
               end
               def test_next_nil
                 changeset = Changeset.find_by_revision('10')
                 assert_nil changeset.next
               end
               def test_comments_should_be_converted_to_utf8
                 proj = Project.find(3)
                 # str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
                 str = "Texte encod\xe9 en ISO-8859-1."
                 str.force_encoding("ASCII-8BIT") if str.respond_to?(:force_encoding)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                         :log_encoding => 'ISO-8859-1' )
                 assert r
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => str)
                 assert( c.save )
                 str_utf8 = "Texte encod\xc3\xa9 en ISO-8859-1."
                 str_utf8.force_encoding("UTF-8") if str_utf8.respond_to?(:force_encoding)
                 assert_equal str_utf8, c.comments
               end
               def test_invalid_utf8_sequences_in_comments_should_be_replaced_latin1
                 proj = Project.find(3)
                 # str = File.read("#{RAILS_ROOT}/test/fixtures/encoding/iso-8859-1.txt")
                 str1 = "Texte encod\xe9 en ISO-8859-1."
                 str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
                 str1.force_encoding("UTF-8") if str1.respond_to?(:force_encoding)
                 str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                         :log_encoding => 'UTF-8' )
                 assert r
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => str1,
                                   :committer    => str2)
                 assert( c.save )
                 assert_equal "Texte encod? en ISO-8859-1.", c.comments
                 assert_equal "?a?b?c?d?e test", c.committer
               end
               def test_invalid_utf8_sequences_in_comments_should_be_replaced_ja_jis
                 proj = Project.find(3)
                 str = "test\xb5\xfetest\xb5\xfe"
                 if str.respond_to?(:force_encoding)
                   str.force_encoding('ASCII-8BIT')
                 end
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                         :log_encoding => 'ISO-2022-JP' )
                 assert r
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => str)
                 assert( c.save )
                 assert_equal "test??test??", c.comments
               end
               def test_comments_should_be_converted_all_latin1_to_utf8
                 s1 = "\xC2\x80"
                 s2 = "\xc3\x82\xc2\x80"
                 s4 = s2.dup
                 if s1.respond_to?(:force_encoding)
                   s3 = s1.dup
                   s1.force_encoding('ASCII-8BIT')
                   s2.force_encoding('ASCII-8BIT')
                   s3.force_encoding('ISO-8859-1')
                   s4.force_encoding('UTF-8')
                   assert_equal s3.encode('UTF-8'), s4
                 end
                 proj = Project.find(3)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                         :log_encoding => 'ISO-8859-1' )
                 assert r
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => s1)
                 assert( c.save )
                 assert_equal s4, c.comments
               end
               def test_invalid_utf8_sequences_in_paths_should_be_replaced
                 proj = Project.find(3)
                 str1 = "Texte encod\xe9 en ISO-8859-1"
                 str2 = "\xe9a\xe9b\xe9c\xe9d\xe9e test"
                 str1.force_encoding("UTF-8")      if str1.respond_to?(:force_encoding)
                 str2.force_encoding("ASCII-8BIT") if str2.respond_to?(:force_encoding)
                 r = Repository::Bazaar.create!(
                         :project => proj,
                         :url => '/tmp/test/bazaar',
                         :log_encoding => 'UTF-8' )
                 assert r
                 cs = Changeset.new(
                            :repository   => r,
                            :committed_on => Time.now,
                            :revision     => '123',
                            :scmid        => '12345',
                            :comments     => "test")
                 assert(cs.save)
                 ch = Change.new(
                               :changeset     => cs,
                               :action        => "A",
                               :path          => str1,
                               :from_path     => str2,
                               :from_revision => "345")
                 assert(ch.save)
                 assert_equal "Texte encod? en ISO-8859-1", ch.path
                 assert_equal "?a?b?c?d?e test", ch.from_path
               end
               def test_comments_nil
                 proj = Project.find(3)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                         :log_encoding => 'ISO-8859-1' )
                 assert r
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => nil,
                                   :committer    => nil)
                 assert( c.save )
                 assert_equal "", c.comments
                 assert_equal nil, c.committer
                 if c.comments.respond_to?(:force_encoding)
                   assert_equal "UTF-8", c.comments.encoding.to_s
                 end
               end
               def test_comments_empty
                 proj = Project.find(3)
                 r = Repository::Bazaar.create!(
                         :project      => proj,
                         :url          => '/tmp/test/bazaar',
                         :log_encoding => 'ISO-8859-1' )
                 assert r
                 c = Changeset.new(:repository   => r,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => "",
                                   :committer    => "")
                 assert( c.save )
                 assert_equal "", c.comments
                 assert_equal "", c.committer
                 if c.comments.respond_to?(:force_encoding)
                   assert_equal "UTF-8", c.comments.encoding.to_s
                   assert_equal "UTF-8", c.committer.encoding.to_s
                 end
               end
               def test_comments_should_accept_more_than_64k
                 c = Changeset.new(:repository   => Repository.first,
                                   :committed_on => Time.now,
                                   :revision     => '123',
                                   :scmid        => '12345',
                                   :comments     => "a" * 500.kilobyte)
                 assert c.save
                 c.reload
                 assert_equal 500.kilobyte, c.comments.size
               end
               def test_identifier
                 c = Changeset.find_by_revision('1')
                 assert_equal c.revision, c.identifier
               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