jro_apps/redmine Commit - r6010:5cfc42982b96

scm: return nil at model default_branch and override at git model (#8458, #6713)....

Toshi MARUYAMA -

r6010:5cfc42982b96

parent child

Context file:

r6010:5cfc42982b96

Collapse all files

app/models/repository.rb +1 -1

              # 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.
              class ScmFetchError < Exception; end
              class Repository < ActiveRecord::Base
                include Redmine::Ciphering
                belongs_to :project
                has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
                has_many :changes, :through => :changesets
                serialize :extra_info
                # 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
                # Checks if the SCM is enabled when creating a repository
                validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
                def self.human_attribute_name(attribute_key_name)
                  attr_name = attribute_key_name
                  if attr_name == "log_encoding"
                    attr_name = "commit_logs_encoding"
                  end
                  super(attr_name)
                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
                  @scm ||= self.scm_adapter.new(url, root_url,
                                                login, password, path_encoding)
                  update_attribute(:root_url, @scm.root_url) if root_url.blank?
                  @scm
                end
                def scm_name
                  self.class.scm_name
                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 entry(path=nil, identifier=nil)
                  scm.entry(path, identifier)
                end
                def entries(path=nil, identifier=nil)
                  scm.entries(path, identifier)
                end
                def branches
                  scm.branches
                end
                def tags
                  scm.tags
                end
                def default_branch
-                 scm.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?
                  changesets.find(:first, :conditions => (name.match(/^\d*$/) ?
                        ["revision = ?", name.to_s] : ["revision LIKE ?", name + '%']))
                end
                def latest_changeset
                  @latest_changeset ||= changesets.find(: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.find(
                       :all,
                       :include => :user,
                       :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                       :limit => limit)
                  else
                    changes.find(
                       :all,
                       :include => {:changeset => :user},
                       :conditions => ["path = ?", path.with_leading_slash],
                       :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC",
                       :limit => limit
                     ).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.update_all(
                             "user_id = #{ new_user_id.nil? ? 'NULL' : new_user_id }",
                             ["repository_id = ? AND committer = ?", id, committer])
                      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.find(:first, :conditions => {:committer => committer}, :include => :user)
                    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).find(:all, :include => :repository).each do |project|
                    if project.repository
                      begin
                        project.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
                  find(: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
                private
                def before_save
                  # Strips url and root_url
                  url.strip!
                  root_url.strip!
                  true
                end
                def clear_changesets
                  cs, ch, ci = Changeset.table_name, Change.table_name, "#{table_name_prefix}changesets_issues#{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 #{cs} WHERE #{cs}.repository_id = #{id}")
                end
              end

app/models/repository/git.rb +4 0

              # Redmine - project management software
              # Copyright (C) 2006-2011  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)
                  attr_name = attribute_key_name
                  if attr_name == "url"
                    attr_name = "path_to_repository"
                  end
                  super(attr_name)
                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 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
+               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
                # 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"]       ||= {}
                  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
                  scm_brs.each do |br|
                    from_scmid = nil
                    from_scmid = h["branches"][br]["last_scmid"] if h["branches"][br]
                    h["branches"][br] ||= {}
                    scm.revisions('', from_scmid, br, {:reverse => true}) do |rev|
                      db_rev = find_changeset_by_name(rev.revision)
                      transaction do
                        if db_rev.nil?
                          save_revision(rev)
                        end
                        h["branches"][br]["last_scmid"] = rev.scmid
                        merge_extra_info(h)
                        self.save
                      end
                    end
                  end
                end
                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
                end
                private :save_revision
                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

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