jro_apps/redmine Commit - r5408:82d5de4b4e3e

scm: mercurial: change "url" human attribute name from "Root directory" to "Path to repository"....

Toshi MARUYAMA -

r5408:82d5de4b4e3e

parent child

Context file:

r5408:82d5de4b4e3e

Collapse all files

app/helpers/repositories_helper.rb +4 -2

             # redMine - project management software
             # Copyright (C) 2006  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 'iconv'
             require 'redmine/codeset_util'
             module RepositoriesHelper
               def format_revision(revision)
                 if revision.respond_to? :format_identifier
                   revision.format_identifier
                 else
                   revision.to_s
                 end
               end
               def truncate_at_line_break(text, length = 255)
                 if text
                   text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
                 end
               end
               def render_properties(properties)
                 unless properties.nil? || properties.empty?
                   content = ''
                   properties.keys.sort.each do |property|
                     content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
                   end
                   content_tag('ul', content, :class => 'properties')
                 end
               end
               def render_changeset_changes
                 changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
                   case change.action
                   when 'A'
                     # Detects moved/copied files
                     if !change.from_path.blank?
                       change.action =
                          @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
                     end
                     change
                   when 'D'
                     @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
                   else
                     change
                   end
                 end.compact
                 tree = { }
                 changes.each do |change|
                   p = tree
                   dirs = change.path.to_s.split('/').select {|d| !d.blank?}
                   path = ''
                   dirs.each do |dir|
                     path += '/' + dir
                     p[:s] ||= {}
                     p = p[:s]
                     p[path] ||= {}
                     p = p[path]
                   end
                   p[:c] = change
                 end
                 render_changes_tree(tree[:s])
               end
               def render_changes_tree(tree)
                 return '' if tree.nil?
                 output = ''
                 output << '<ul>'
                 tree.keys.sort.each do |file|
                   style = 'change'
                   text = File.basename(h(file))
                   if s = tree[file][:s]
                     style << ' folder'
                     path_param = to_path_param(@repository.relative_path(file))
                     text = link_to(text, :controller => 'repositories',
                                          :action => 'show',
                                          :id => @project,
                                          :path => path_param,
                                          :rev => @changeset.identifier)
                     output << "<li class='#{style}'>#{text}</li>"
                     output << render_changes_tree(s)
                   elsif c = tree[file][:c]
                     style << " change-#{c.action}"
                     path_param = to_path_param(@repository.relative_path(c.path))
                     text = link_to(text, :controller => 'repositories',
                                          :action => 'entry',
                                          :id => @project,
                                          :path => path_param,
                                          :rev => @changeset.identifier) unless c.action == 'D'
                     text << " - #{c.revision}" unless c.revision.blank?
                     text << ' (' + link_to('diff', :controller => 'repositories',
                                                    :action => 'diff',
                                                    :id => @project,
                                                    :path => path_param,
                                                    :rev => @changeset.identifier) + ') ' if c.action == 'M'
                     text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
                     output << "<li class='#{style}'>#{text}</li>"
                   end
                 end
                 output << '</ul>'
                 output
               end
               def to_utf8(str)
                 return str if str.nil?
                 str = to_utf8_internal(str)
                 if str.respond_to?(:force_encoding)
                   str.force_encoding('UTF-8')
                 end
                 str
               end
               def to_utf8_internal(str)
                 return str if str.nil?
                 if str.respond_to?(:force_encoding)
                   str.force_encoding('ASCII-8BIT')
                 end
                 return str if str.empty?
                 return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
                 if str.respond_to?(:force_encoding)
                   str.force_encoding('UTF-8')
                 end
                 @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
                 @encodings.each do |encoding|
                   begin
                     return Iconv.conv('UTF-8', encoding, str)
                   rescue Iconv::Failure
                     # do nothing here and try the next encoding
                   end
                 end
                 str = Redmine::CodesetUtil.replace_invalid_utf8(str)
               end
               private :to_utf8_internal
               def repository_field_tags(form, repository)
                 method = repository.class.name.demodulize.underscore + "_field_tags"
                 if repository.is_a?(Repository) &&
                     respond_to?(method) && method != 'repository_field_tags'
                   send(method, form, repository)
                 end
               end
               def scm_select_tag(repository)
                 scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
                 Redmine::Scm::Base.all.each do |scm|
                 if Setting.enabled_scm.include?(scm) ||
                       (repository && repository.class.name.demodulize == scm)
                     scm_options << ["Repository::#{scm}".constantize.scm_name, scm]
                   end
                 end
                 select_tag('repository_scm',
                            options_for_select(scm_options, repository.class.name.demodulize),
                            :disabled => (repository && !repository.new_record?),
                            :onchange => remote_function(
                               :url => {
                                   :controller => 'repositories',
                                   :action => 'edit',
                                   :id => @project
                                     },
                            :method => :get,
                            :with => "Form.serialize(this.form)")
                            )
               end
               def with_leading_slash(path)
                 path.to_s.starts_with?('/') ? path : "/#{path}"
               end
               def without_leading_slash(path)
                 path.gsub(%r{^/+}, '')
               end
               def subversion_field_tags(form, repository)
                   content_tag('p', form.text_field(:url, :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
                   content_tag('p', form.text_field(:login, :size => 30)) +
                   content_tag('p', form.password_field(
                                         :password, :size => 30, :name => 'ignore',
                                         :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
                                         :onfocus => "this.value=''; this.name='repository[password]';",
                                         :onchange => "this.name='repository[password]';"))
               end
               def darcs_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Path to repository',
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l("field_commit_logs_encoding"), :required => true))
               end
               def mercurial_field_tags(form, repository)
-                content_tag('p', form.text_field(:url, :label => 'Root directory',
+                content_tag('p', form.text_field(
+                                   :url, :label => 'Path to repository',
                                    :size => 60, :required => true,
-                                   :disabled => (repository && !repository.root_url.blank?)) +
+                                   :disabled => (repository && !repository.root_url.blank?)
+                                     ) +
                                  '<br />Local repository (e.g. /hgrepo, c:\hgrepo)' ) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l("field_scm_path_encoding")
                                     ) +
                                  '<br />' + l("text_scm_path_encoding_note"))
               end
               def git_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Path to repository',
                                    :size => 60, :required => true,
                                    :disabled => (repository && !repository.root_url.blank?)) +
                                    '<br />Bare and local repository (e.g. /gitrepo, c:\gitrepo)') +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l("field_scm_path_encoding")
                                     ) +
                                  '<br />' + l("text_scm_path_encoding_note"))
               end
               def cvs_field_tags(form, repository)
                 content_tag('p', form.text_field(:root_url,
                                  :label => 'CVSROOT', :size => 60, :required => true,
                                  :disabled => !repository.new_record?)) +
                 content_tag('p', form.text_field(:url, :label => 'Module',
                                  :size => 30, :required => true,
                                  :disabled => !repository.new_record?)) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l("field_commit_logs_encoding"), :required => true)) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l("field_scm_path_encoding")
                                     ) +
                                  '<br />' + l("text_scm_path_encoding_note"))
               end
               def bazaar_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Path to repository',
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.new_record?))) +
                 content_tag('p', form.select(
                                  :log_encoding, [nil] + Setting::ENCODINGS,
                                  :label => l("field_commit_logs_encoding"), :required => true))
               end
               def filesystem_field_tags(form, repository)
                 content_tag('p', form.text_field(:url, :label => 'Root directory',
                                  :size => 60, :required => true,
                                  :disabled => (repository && !repository.root_url.blank?))) +
                 content_tag('p', form.select(
                                     :path_encoding, [nil] + Setting::ENCODINGS,
                                     :label => l("field_scm_path_encoding")
                                     ) +
                                  '<br />' + l("text_scm_path_encoding_note"))
               end
             end

app/models/repository/mercurial.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006-2007  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 'redmine/scm/adapters/mercurial_adapter'
             class Repository::Mercurial < Repository
               # sort changesets by revision number
               has_many :changesets, :order => "#{Changeset.table_name}.id DESC", :foreign_key => 'repository_id'
               attr_protected :root_url
               validates_presence_of :url
               FETCH_AT_ONCE = 100  # number of changesets to fetch at once
               ATTRIBUTE_KEY_NAMES = {
-                  "url"          => "Root directory",
+                  "url"          => "Path to repository",
                 }
               def self.human_attribute_name(attribute_key_name)
                 ATTRIBUTE_KEY_NAMES[attribute_key_name] || super
               end
               def self.scm_adapter_class
                 Redmine::Scm::Adapters::MercurialAdapter
               end
               def self.scm_name
                 'Mercurial'
               end
               def supports_directory_revisions?
                 true
               end
               def repo_log_encoding
                 'UTF-8'
               end
               # Returns the readable identifier for the given mercurial changeset
               def self.format_changeset_identifier(changeset)
                 "#{changeset.revision}:#{changeset.scmid}"
               end
               # Returns the identifier for the given Mercurial changeset
               def self.changeset_identifier(changeset)
                 changeset.scmid
               end
               def diff_format_revisions(cs, cs_to, sep=':')
                 super(cs, cs_to, ' ')
               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.nil? || name.empty?
                 if /[^\d]/ =~ name or name.to_s.size > 8
                   e = changesets.find(:first, :conditions => ['scmid = ?', name.to_s])
                 else
                   e = changesets.find(:first, :conditions => ['revision = ?', name.to_s])
                 end
                 return e if e
                 changesets.find(:first, :conditions => ['scmid LIKE ?', "#{name}%"])  # last ditch
               end
               # Returns the latest changesets for +path+; sorted by revision number
               #
               # Because :order => 'id DESC' is defined at 'has_many',
               # there is no need to set 'order'.
               # But, MySQL test fails.
               # Sqlite3 and PostgreSQL pass.
               # Is this MySQL bug?
               def latest_changesets(path, rev, limit=10)
                 changesets.find(:all, :include => :user,
                                 :conditions => latest_changesets_cond(path, rev, limit),
                                 :limit => limit, :order => "#{Changeset.table_name}.id DESC")
               end
               def latest_changesets_cond(path, rev, limit)
                 cond, args = [], []
                 if scm.branchmap.member? rev
                   # Mercurial named branch is *stable* in each revision.
                   # So, named branch can be stored in database.
                   # Mercurial provides *bookmark* which is equivalent with git branch.
                   # But, bookmark is not implemented.
                   cond << "#{Changeset.table_name}.scmid IN (?)"
                   # Revisions in root directory and sub directory are not equal.
                   # So, in order to get correct limit, we need to get all revisions.
                   # But, it is very heavy.
                   # Mercurial does not treat direcotry.
                   # So, "hg log DIR" is very heavy.
                   branch_limit = path.blank? ? limit : ( limit * 5 )
                   args << scm.nodes_in_branch(rev, :limit => branch_limit)
                 elsif last = rev ? find_changeset_by_name(scm.tagmap[rev] || rev) : nil
                   cond << "#{Changeset.table_name}.id <= ?"
                   args << last.id
                 end
                 unless path.blank?
                   cond << "EXISTS (SELECT * FROM #{Change.table_name}
                              WHERE #{Change.table_name}.changeset_id = #{Changeset.table_name}.id
                              AND (#{Change.table_name}.path = ?
                                    OR #{Change.table_name}.path LIKE ? ESCAPE ?))"
                   args << path.with_leading_slash
                   args << "#{path.with_leading_slash.gsub(/[%_\\]/) { |s| "\\#{s}" }}/%" << '\\'
                 end
                 [cond.join(' AND '), *args] unless cond.empty?
               end
               private :latest_changesets_cond
               def fetch_changesets
                 scm_rev = scm.info.lastrev.revision.to_i
                 db_rev = latest_changeset ? latest_changeset.revision.to_i : -1
                 return unless db_rev < scm_rev  # already up-to-date
                 logger.debug "Fetching changesets for repository #{url}" if logger
                 (db_rev + 1).step(scm_rev, FETCH_AT_ONCE) do |i|
                   transaction do
                     scm.each_revision('', i, [i + FETCH_AT_ONCE - 1, scm_rev].min) do |re|
                       cs = Changeset.create(:repository => self,
                                             :revision => re.revision,
                                             :scmid => re.scmid,
                                             :committer => re.author,
                                             :committed_on => re.time,
                                             :comments => re.message)
                       re.paths.each { |e| cs.create_change(e) }
                     end
                   end
                 end
                 self
               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