jro_apps/redmine Commit - r1350:a73f68a185df

Fixed: Links to repository directories don't work (#1119)....

Jean-Philippe Lang -

r1350:a73f68a185df

parent child

Context file:

r1350:a73f68a185df

Collapse all files

app/controllers/repositories_controller.rb +8 -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 'SVG/Graph/Bar'
             require 'SVG/Graph/BarHorizontal'
             require 'digest/sha1'
             class ChangesetNotFound < Exception; end
             class InvalidRevisionParam < Exception; end
             class RepositoriesController < ApplicationController
               layout 'base'
               menu_item :repository
               before_filter :find_repository, :except => :edit
               before_filter :find_project, :only => :edit
               before_filter :authorize
               accept_key_auth :revisions
               def edit
                 @repository = @project.repository
                 if !@repository
                   @repository = Repository.factory(params[:repository_scm])
                   @repository.project = @project
                 end
                 if request.post?
                   @repository.attributes = params[:repository]
                   @repository.save
                 end
                 render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
               end
               def destroy
                 @repository.destroy
                 redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
               end
               def show
                 # check if new revisions have been committed in the repository
                 @repository.fetch_changesets if Setting.autofetch_changesets?
                 # root entries
                 @entries = @repository.entries('', @rev)
                 # latest changesets
                 @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
                 show_error_not_found unless @entries || @changesets.any?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def browse
                 @entries = @repository.entries(@path, @rev)
                 if request.xhr?
                   @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
                 else
-                  show_error_not_found unless @entries
+                  show_error_not_found and return unless @entries
+                  render :action => 'browse'
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def changes
                 @entry = @repository.scm.entry(@path, @rev)
                 show_error_not_found and return unless @entry
                 @changesets = @repository.changesets_for_path(@path)
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
             								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,
             						:offset =>  @changeset_pages.current.offset)
                 respond_to do |format|
                   format.html { render :layout => false if request.xhr? }
                   format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
                 end
               end
               def entry
+                @entry = @repository.scm.entry(@path, @rev)
+                show_error_not_found and return unless @entry
+                # If the entry is a dir, show the browser
+                browse and return if @entry.is_dir?
                 @content = @repository.scm.cat(@path, @rev)
                 show_error_not_found and return unless @content
                 if 'raw' == params[:format] || @content.is_binary_data?
                   # Force the download if it's a binary file
                   send_data @content, :filename => @path.split('/').last
                 else
                   # Prevent empty lines when displaying a file with Windows style eol
                   @content.gsub!("\r\n", "\n")
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def annotate
                 @annotate = @repository.scm.annotate(@path, @rev)
                 render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def revision
                 @changeset = @repository.changesets.find_by_revision(@rev)
                 raise ChangesetNotFound unless @changeset
                 @changes_count = @changeset.changes.size
                 @changes_pages = Paginator.new self, @changes_count, 150, params['page']
                 @changes = @changeset.changes.find(:all,
               						:limit  =>  @changes_pages.items_per_page,
               						:offset =>  @changes_pages.current.offset)
                 respond_to do |format|
                   format.html
                   format.js {render :layout => false}
                 end
               rescue ChangesetNotFound
                 show_error_not_found
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def diff
                 @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
                 @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
                 # Save diff type as user preference
                 if User.current.logged? && @diff_type != User.current.pref[:diff_type]
                   User.current.pref[:diff_type] = @diff_type
                   User.current.preference.save
                 end
                 @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
                 unless read_fragment(@cache_key)
                   @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
                   show_error_not_found unless @diff
                 end
               rescue Redmine::Scm::Adapters::CommandFailed => e
                 show_error_command_failed(e.message)
               end
               def stats
               end
               def graph
                 data = nil
                 case params[:graph]
                 when "commits_per_month"
                   data = graph_commits_per_month(@repository)
                 when "commits_per_author"
                   data = graph_commits_per_author(@repository)
                 end
                 if data
                   headers["Content-Type"] = "image/svg+xml"
                   send_data(data, :type => "image/svg+xml", :disposition => "inline")
                 else
                   render_404
                 end
               end
             private
               def find_project
                 @project = Project.find(params[:id])
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               REV_PARAM_RE = %r{^[a-f0-9]*$}
               def find_repository
                 @project = Project.find(params[:id])
                 @repository = @project.repository
                 render_404 and return false unless @repository
                 @path = params[:path].join('/') unless params[:path].nil?
                 @path ||= ''
                 @rev = params[:rev]
                 @rev_to = params[:rev_to]
                 raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
               rescue ActiveRecord::RecordNotFound
                 render_404
               rescue InvalidRevisionParam
                 show_error_not_found
               end
               def show_error_not_found
                 render_error l(:error_scm_not_found)
               end
               def show_error_command_failed(msg)
                 render_error l(:error_scm_command_failed, msg)
               end
               def graph_commits_per_month(repository)
                 @date_to = Date.today
                 @date_from = @date_to << 11
                 @date_from = Date.civil(@date_from.year, @date_from.month, 1)
                 commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 commits_by_month = [0] * 12
                 commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
                 changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
                 changes_by_month = [0] * 12
                 changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
                 fields = []
                 month_names = l(:actionview_datehelper_select_month_names_abbr).split(',')
 .times {|m| fields << month_names[((Date.today.month - 1 - m) % 12)]}
                 graph = SVG::Graph::Bar.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields.reverse,
                   :stack => :side,
                   :scale_integers => true,
                   :step_x_labels => 2,
                   :show_data_values => false,
                   :graph_title => l(:label_commits_per_month),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_by_month[0..11].reverse,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_by_month[0..11].reverse,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
               def graph_commits_per_author(repository)
                 commits_by_author = repository.changesets.count(:all, :group => :committer)
                 commits_by_author.sort! {|x, y| x.last <=> y.last}
                 changes_by_author = repository.changes.count(:all, :group => :committer)
                 h = changes_by_author.inject({}) {|o, i| o[i.first] = i.last; o}
                 fields = commits_by_author.collect {|r| r.first}
                 commits_data = commits_by_author.collect {|r| r.last}
                 changes_data = commits_by_author.collect {|r| h[r.first] || 0}
                 fields = fields + [""]*(10 - fields.length) if fields.length<10
                 commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
                 changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
                 # Remove email adress in usernames
                 fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
                 graph = SVG::Graph::BarHorizontal.new(
                   :height => 300,
                   :width => 500,
                   :fields => fields,
                   :stack => :side,
                   :scale_integers => true,
                   :show_data_values => false,
                   :rotate_y_labels => false,
                   :graph_title => l(:label_commits_per_author),
                   :show_graph_title => true
                 )
                 graph.add_data(
                   :data => commits_data,
                   :title => l(:label_revision_plural)
                 )
                 graph.add_data(
                   :data => changes_data,
                   :title => l(:label_change_plural)
                 )
                 graph.burn
               end
             end
             class Date
               def months_ago(date = Date.today)
                 (date.year - self.year)*12 + (date.month - self.month)
               end
               def weeks_ago(date = Date.today)
                 (date.year - self.year)*52 + (date.cweek - self.cweek)
               end
             end
             class String
               def with_leading_slash
                 starts_with?('/') ? self : "/#{self}"
               end
             end

lib/redmine/scm/adapters/abstract_adapter.rb +11 -2

             # 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 'cgi'
             module Redmine
               module Scm
                 module Adapters
                   class CommandFailed < StandardError #:nodoc:
                   end
                   class AbstractAdapter #:nodoc:
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       @root_url = root_url.blank? ? retrieve_root_url : root_url
                     end
                     def adapter_name
                       'Abstract'
                     end
                     def supports_cat?
                       true
                     end
                     def supports_annotate?
                       respond_to?('annotate')
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     # get info about the svn repository
                     def info
                       return nil
                     end
                     # Returns the entry identified by path and revision identifier
                     # or nil if entry doesn't exist in the repository
                     def entry(path=nil, identifier=nil)
-                      e = entries(path, identifier)
+                      parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
-                      e ? e.first : nil
+                      search_path = parts[0..-2].join('/')
+                      search_name = parts[-1]
+                      if search_path.blank? && search_name.blank?
+                        # Root entry
+                        Entry.new(:path => '', :kind => 'dir')
+                      else
+                        # Search for the entry in the parent directory
+                        es = entries(search_path, identifier)
+                        es ? es.detect {|e| e.name == search_name} : nil
+                      end
                     end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       return nil
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       return nil
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       return nil
                     end
                     def cat(path, identifier=nil)
                       return nil
                     end
                     def with_leading_slash(path)
                       path ||= ''
                       (path[0,1]!="/") ? "/#{path}" : path
                     end
                     def shell_quote(str)
                       if RUBY_PLATFORM =~ /mswin/
                         '"' + str.gsub(/"/, '\\"') + '"'
                       else
                         "'" + str.gsub(/'/, "'\"'\"'") + "'"
                       end
                     end
                   private
                     def retrieve_root_url
                       info = self.info
                       info ? info.root_url : nil
                     end
                     def target(path)
                       path ||= ''
                       base = path.match(/^\//) ? root_url : url
                       shell_quote("#{base}/#{path}".gsub(/[?<>\*]/, ''))
                     end
                     def logger
                       RAILS_DEFAULT_LOGGER
                     end
                     def shellout(cmd, &block)
                       logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
                       begin
                         IO.popen(cmd, "r+") do |io|
                           io.close_write
                           block.call(io) if block_given?
                         end
                       rescue Errno::ENOENT => e
                         # The command failed, log it and re-raise
                         logger.error("SCM command failed: #{cmd}\n  with: #{e.message}")
                         raise CommandFailed.new(e.message)
                       end
                     end
                   end
                   class Entries < Array
                     def sort_by_name
                       sort {|x,y|
                         if x.kind == y.kind
                           x.name <=> y.name
                         else
                           x.kind <=> y.kind
                         end
                       }
                     end
                     def revisions
                       revisions ||= Revisions.new(collect{|entry| entry.lastrev}.compact)
                     end
                   end
                   class Info
                     attr_accessor :root_url, :lastrev
                     def initialize(attributes={})
                       self.root_url = attributes[:root_url] if attributes[:root_url]
                       self.lastrev = attributes[:lastrev]
                     end
                   end
                   class Entry
                     attr_accessor :name, :path, :kind, :size, :lastrev
                     def initialize(attributes={})
                       self.name = attributes[:name] if attributes[:name]
                       self.path = attributes[:path] if attributes[:path]
                       self.kind = attributes[:kind] if attributes[:kind]
                       self.size = attributes[:size].to_i if attributes[:size]
                       self.lastrev = attributes[:lastrev]
                     end
                     def is_file?
                       'file' == self.kind
                     end
                     def is_dir?
                       'dir' == self.kind
                     end
                     def is_text?
                       Redmine::MimeType.is_type?('text', name)
                     end
                   end
                   class Revisions < Array
                     def latest
                       sort {|x,y|
                         unless x.time.nil? or y.time.nil?
                           x.time <=> y.time
                         else
                         end
                       }.last
                     end
                   end
                   class Revision
                     attr_accessor :identifier, :scmid, :name, :author, :time, :message, :paths, :revision, :branch
                     def initialize(attributes={})
                       self.identifier = attributes[:identifier]
                       self.scmid = attributes[:scmid]
                       self.name = attributes[:name] || self.identifier
                       self.author = attributes[:author]
                       self.time = attributes[:time]
                       self.message = attributes[:message] || ""
                       self.paths = attributes[:paths]
                       self.revision = attributes[:revision]
                       self.branch = attributes[:branch]
                     end
                   end
                   # A line of Diff
                   class Diff
                     attr_accessor :nb_line_left
                     attr_accessor :line_left
                     attr_accessor :nb_line_right
                     attr_accessor :line_right
                     attr_accessor :type_diff_right
                     attr_accessor :type_diff_left
                     def initialize ()
                       self.nb_line_left = ''
                       self.nb_line_right = ''
                       self.line_left = ''
                       self.line_right = ''
                       self.type_diff_right = ''
                       self.type_diff_left = ''
                     end
                     def inspect
                       puts '### Start Line Diff ###'
                       puts self.nb_line_left
                       puts self.line_left
                       puts self.nb_line_right
                       puts self.line_right
                     end
                   end
                   class DiffTableList < Array
                     def initialize (diff, type="inline")
                         diff_table = DiffTable.new type
                         diff.each do |line|
                             if line =~ /^(---|\+\+\+) (.*)$/
                                 self << diff_table if diff_table.length > 1
                                 diff_table = DiffTable.new type
                             end
                             a = diff_table.add_line line
                         end
                         self << diff_table unless diff_table.empty?
                         self
                     end
                   end
                   # Class for create a Diff
                   class DiffTable < Hash
                     attr_reader :file_name, :line_num_l, :line_num_r
                     # Initialize with a Diff file and the type of Diff View
                     # The type view must be inline or sbs (side_by_side)
                     def initialize(type="inline")
                       @parsing = false
                       @nb_line = 1
                       @start = false
                       @before = 'same'
                       @second = true
                       @type = type
                     end
                     # Function for add a line of this Diff
                     def add_line(line)
                       unless @parsing
                         if line =~ /^(---|\+\+\+) (.*)$/
                           @file_name = $2
                           return false
                         elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
                           @line_num_l = $5.to_i
                           @line_num_r = $2.to_i
                           @parsing = true
                         end
                       else
                         if line =~ /^[^\+\-\s@\\]/
                           self.delete(self.keys.sort.last)
                           @parsing = false
                           return false
                         elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
                           @line_num_l = $5.to_i
                           @line_num_r = $2.to_i
                         else
                           @nb_line += 1 if parse_line(line, @type)
                         end
                       end
                       return true
                     end
                     def inspect
                       puts '### DIFF TABLE ###'
                       puts "file : #{file_name}"
                       self.each do |d|
                         d.inspect
                       end
                     end
                   private
                     # Test if is a Side By Side type
                     def sbs?(type, func)
                       if @start and type == "sbs"
                         if @before == func and @second
                           tmp_nb_line = @nb_line
                           self[tmp_nb_line] = Diff.new
                         else
                             @second = false
                             tmp_nb_line = @start
                             @start += 1
                             @nb_line -= 1
                         end
                       else
                         tmp_nb_line = @nb_line
                         @start = @nb_line
                         self[tmp_nb_line] = Diff.new
                         @second = true
                       end
                       unless self[tmp_nb_line]
                         @nb_line += 1
                         self[tmp_nb_line] = Diff.new
                       else
                         self[tmp_nb_line]
                       end
                     end
                     # Escape the HTML for the diff
                     def escapeHTML(line)
                         CGI.escapeHTML(line)
                     end
                     def parse_line(line, type="inline")
                       if line[0, 1] == "+"
                         diff = sbs? type, 'add'
                         @before = 'add'
                         diff.line_left = escapeHTML line[1..-1]
                         diff.nb_line_left = @line_num_l
                         diff.type_diff_left = 'diff_in'
                         @line_num_l += 1
                         true
                       elsif line[0, 1] == "-"
                         diff = sbs? type, 'remove'
                         @before = 'remove'
                         diff.line_right = escapeHTML line[1..-1]
                         diff.nb_line_right = @line_num_r
                         diff.type_diff_right = 'diff_out'
                         @line_num_r += 1
                         true
                       elsif line[0, 1] =~ /\s/
                         @before = 'same'
                         @start = false
                         diff = Diff.new
                         diff.line_right = escapeHTML line[1..-1]
                         diff.nb_line_right = @line_num_r
                         diff.line_left = escapeHTML line[1..-1]
                         diff.nb_line_left = @line_num_l
                         self[@nb_line] = diff
                         @line_num_l += 1
                         @line_num_r += 1
                         true
                       elsif line[0, 1] = "\\"
                         true
                       else
                         false
                       end
                     end
                   end
                   class Annotate
                     attr_reader :lines, :revisions
                     def initialize
                       @lines = []
                       @revisions = []
                     end
                     def add_line(line, revision)
                       @lines << line
                       @revisions << revision
                     end
                     def content
                       content = lines.join("\n")
                     end
                     def empty?
                       lines.empty?
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/bazaar_adapter.rb 0 -12

             # 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/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class BazaarAdapter < AbstractAdapter
                     # Bazaar executable name
                     BZR_BIN = "bzr"
                     # Get info about the repository
                     def info
                       cmd = "#{BZR_BIN} revno #{target('')}"
                       info = nil
                       shellout(cmd) do |io|
                         if io.read =~ %r{^(\d+)$}
                           info = Info.new({:root_url => url,
                                            :lastrev => Revision.new({
                                              :identifier => $1
                                            })
                                          })
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
-                    # Returns the entry identified by path and revision identifier
-                    # or nil if entry doesn't exist in the repository
-                    def entry(path=nil, identifier=nil)
-                      path ||= ''
-                      parts = path.split(%r{[\/\\]}).select {|p| !p.blank?}
-                      if parts.size > 0
-                        parent = parts[0..-2].join('/')
-                        entries = entries(parent, identifier)
-                        entries ? entries.detect {|e| e.name == parts.last} : nil
-                      end
-                    end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{BZR_BIN} ls -v --show-ids"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       shellout(cmd) do |io|
                         prefix = "#{url}/#{path}".gsub('\\', '/')
                         logger.debug "PREFIX: #{prefix}"
                         re = %r{^V\s+#{Regexp.escape(prefix)}(\/?)([^\/]+)(\/?)\s+(\S+)$}
                         io.each_line do |line|
                           next unless line =~ re
                           entries << Entry.new({:name => $2.strip,
                                                 :path => ((path.empty? ? "" : "#{path}/") + $2.strip),
                                                 :kind => ($3.blank? ? 'file' : 'dir'),
                                                 :size => nil,
                                                 :lastrev => Revision.new(:revision => $4.strip)
                                               })
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = 'last:1' unless identifier_from and identifier_from.to_i > 0
                       identifier_to = 1 unless identifier_to and identifier_to.to_i > 0
                       revisions = Revisions.new
                       cmd = "#{BZR_BIN} log -v --show-ids -r#{identifier_to.to_i}..#{identifier_from} #{target(path)}"
                       shellout(cmd) do |io|
                         revision = nil
                         parsing = nil
                         io.each_line do |line|
                           if line =~ /^----/
                             revisions << revision if revision
                             revision = Revision.new(:paths => [], :message => '')
                             parsing = nil
                           else
                             next unless revision
                             if line =~ /^revno: (\d+)$/
                               revision.identifier = $1.to_i
                             elsif line =~ /^committer: (.+)$/
                               revision.author = $1.strip
                             elsif line =~ /^revision-id:(.+)$/
                               revision.scmid = $1.strip
                             elsif line =~ /^timestamp: (.+)$/
                               revision.time = Time.parse($1).localtime
                             elsif line =~ /^    -----/
                               # partial revisions
                               parsing = nil unless parsing == 'message'
                             elsif line =~ /^(message|added|modified|removed|renamed):/
                               parsing = $1
                             elsif line =~ /^  (.*)$/
                               if parsing == 'message'
                                 revision.message << "#{$1}\n"
                               else
                                 if $1 =~ /^(.*)\s+(\S+)$/
                                   path = $1.strip
                                   revid = $2
                                   case parsing
                                   when 'added'
                                     revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
                                   when 'modified'
                                     revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
                                   when 'removed'
                                     revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
                                   when 'renamed'
                                     new_path = path.split('=>').last
                                     revision.paths << {:action => 'M', :path => "/#{new_path.strip}", :revision => revid} if new_path
                                   end
                                 end
                               end
                             else
                               parsing = nil
                             end
                           end
                         end
                         revisions << revision if revision
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path ||= ''
                       if identifier_to
                         identifier_to = identifier_to.to_i
                       else
                         identifier_to = identifier_from.to_i - 1
                       end
                       cmd = "#{BZR_BIN} diff -r#{identifier_to}..#{identifier_from} #{target(path)}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       #return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{BZR_BIN} cat"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       cmd = "#{BZR_BIN} annotate --all"
                       cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
                       cmd << " #{target(path)}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         author = nil
                         identifier = nil
                         io.each_line do |line|
                           next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/cvs_adapter.rb 0 -9

             # 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/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class CvsAdapter < AbstractAdapter
                     # CVS executable name
                     CVS_BIN = "cvs"
                     # Guidelines for the input:
                     #  url -> the project-path, relative to the cvsroot (eg. module name)
                     #  root_url -> the good old, sometimes damned, CVSROOT
                     #  login -> unnecessary
                     #  password -> unnecessary too
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @login = login if login && !login.empty?
                       @password = (password || "") if @login
                       #TODO: better Exception here (IllegalArgumentException)
                       raise CommandFailed if root_url.blank?
                       @root_url = root_url
                     end
                     def root_url
                       @root_url
                     end
                     def url
                       @url
                     end
                     def info
                       logger.debug "<cvs> info"
                       Info.new({:root_url => @root_url, :lastrev => nil})
                     end
                     def get_previous_revision(revision)
                       CvsRevisionHelper.new(revision).prevRev
                     end
-                    # Returns the entry identified by path and revision identifier
-                    # or nil if entry doesn't exist in the repository
-                    # this method returns all revisions from one single SCM-Entry
-                    def entry(path=nil, identifier="HEAD")
-                      e = entries(path, identifier)
-                      logger.debug("<cvs-result> #{e.first.inspect}") if e
-                      e ? e.first : nil
-                    end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     # this method is used by the repository-browser (aka LIST)
                     def entries(path=nil, identifier=nil)
                       logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       entries = Entries.new
                       cmd = "#{CVS_BIN} -d #{root_url} rls -ed"
                       cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
                       cmd << " #{path_with_project}"
                       shellout(cmd) do |io|
                         io.each_line(){|line|
                           fields=line.chop.split('/',-1)
                           logger.debug(">>InspectLine #{fields.inspect}")
                           if fields[0]!="D"
                             entries << Entry.new({:name => fields[-5],
                               #:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
                               :path => "#{path}/#{fields[-5]}",
                               :kind => 'file',
                               :size => nil,
                               :lastrev => Revision.new({
                                 :revision => fields[-4],
                                 :name => fields[-4],
                                 :time => Time.parse(fields[-3]),
                                 :author => ''
                               })
                             })
                           else
                             entries << Entry.new({:name => fields[1],
                               :path => "#{path}/#{fields[1]}",
                               :kind => 'dir',
                               :size => nil,
                               :lastrev => nil
                             })
                           end
                         }
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     STARTLOG="----------------------------"
                     ENDLOG  ="============================================================================="
                     # Returns all revisions found between identifier_from and identifier_to
                     # in the repository. both identifier have to be dates or nil.
                     # these method returns nothing but yield every result in block
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
                       logger.debug "<cvs> revisions path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} rlog"
                       cmd << " -d\">#{time_to_cvstime(identifier_from)}\"" if identifier_from
                       cmd << " #{path_with_project}"
                       shellout(cmd) do |io|
                         state="entry_start"
                         commit_log=String.new
                         revision=nil
                         date=nil
                         author=nil
                         entry_path=nil
                         entry_name=nil
                         file_state=nil
                         branch_map=nil
                         io.each_line() do |line|
                           if state!="revision" && /^#{ENDLOG}/ =~ line
                             commit_log=String.new
                             revision=nil
                             state="entry_start"
                           end
                           if state=="entry_start"
                             branch_map=Hash.new
                             # gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url
                             if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
                               entry_path = normalize_cvs_path($1)
                               entry_name = normalize_path(File.basename($1))
                               logger.debug("Path #{entry_path} <=> Name #{entry_name}")
                             elsif /^head: (.+)$/ =~ line
                               entry_headRev = $1 #unless entry.nil?
                             elsif /^symbolic names:/ =~ line
                               state="symbolic" #unless entry.nil?
                             elsif /^#{STARTLOG}/ =~ line
                               commit_log=String.new
                               state="revision"
                             end
                             next
                           elsif state=="symbolic"
                             if /^(.*):\s(.*)/ =~ (line.strip)
                               branch_map[$1]=$2
                             else
                               state="tags"
                               next
                             end
                           elsif state=="tags"
                             if /^#{STARTLOG}/ =~ line
                               commit_log = ""
                               state="revision"
                             elsif /^#{ENDLOG}/ =~ line
                               state="head"
                             end
                             next
                           elsif state=="revision"
                             if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
                               if revision
                                 revHelper=CvsRevisionHelper.new(revision)
                                 revBranch="HEAD"
                                 branch_map.each() do |branch_name,branch_point|
                                   if revHelper.is_in_branch_with_symbol(branch_point)
                                     revBranch=branch_name
                                   end
                                 end
                                 logger.debug("********** YIELD Revision #{revision}::#{revBranch}")
                                 yield Revision.new({
                                   :time => date,
                                   :author => author,
                                   :message=>commit_log.chomp,
                                   :paths => [{
                                     :revision => revision,
                                     :branch=> revBranch,
                                     :path=>entry_path,
                                     :name=>entry_name,
                                     :kind=>'file',
                                     :action=>file_state
                                   }]
                                 })
                               end
                               commit_log=String.new
                               revision=nil
                               if /^#{ENDLOG}/ =~ line
                                 state="entry_start"
                               end
                               next
                             end
                             if /^branches: (.+)$/ =~ line
                               #TODO: version.branch = $1
                             elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
                               revision = $1
                             elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
                               date      = Time.parse($1)
                               author    = /author: ([^;]+)/.match(line)[1]
                               file_state     = /state: ([^;]+)/.match(line)[1]
                               #TODO: linechanges only available in CVS.... maybe a feature our SVN implementation. i'm sure, they are
                               #    useful for stats or something else
                               #                linechanges =/lines: \+(\d+) -(\d+)/.match(line)
                               #                unless linechanges.nil?
                               #                  version.line_plus  = linechanges[1]
                               #                  version.line_minus = linechanges[2]
                               #                else
                               #                  version.line_plus  = 0
                               #                  version.line_minus = 0
                               #                end
                             else
                               commit_log << line unless line =~ /^\*\*\* empty log message \*\*\*/
                             end
                           end
                         end
                       end
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{path_with_project}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier) ? identifier : "HEAD"
                       logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} co -r#{identifier} -p #{path_with_project}"
                       cat = nil
                       shellout(cmd) do |io|
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier) ? identifier : "HEAD"
                       logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
                       path_with_project="#{url}#{with_leading_slash(path)}"
                       cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{path_with_project}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     # convert a date/time into the CVS-format
                     def time_to_cvstime(time)
                       return nil if time.nil?
                       unless time.kind_of? Time
                         time = Time.parse(time)
                       end
                       return time.strftime("%Y-%m-%d %H:%M:%S")
                     end
                     def normalize_cvs_path(path)
                       normalize_path(path.gsub(/Attic\//,''))
                     end
                     def normalize_path(path)
                       path.sub(/^(\/)*(.*)/,'\2').sub(/(.*)(,v)+/,'\1')
                     end
                   end
                   class CvsRevisionHelper
                     attr_accessor :complete_rev, :revision, :base, :branchid
                     def initialize(complete_rev)
                       @complete_rev = complete_rev
                       parseRevision()
                     end
                     def branchPoint
                       return @base
                     end
                     def branchVersion
                       if isBranchRevision
                         return @base+"."+@branchid
                       end
                       return @base
                     end
                     def isBranchRevision
                       !@branchid.nil?
                     end
                     def prevRev
                       unless @revision==0
                         return buildRevision(@revision-1)
                       end
                       return buildRevision(@revision)
                     end
                     def is_in_branch_with_symbol(branch_symbol)
                       bpieces=branch_symbol.split(".")
                       branch_start="#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
                       return (branchVersion==branch_start)
                     end
                     private
                     def buildRevision(rev)
                       if rev== 0
                         @base
                       elsif @branchid.nil?
                         @base+"."+rev.to_s
                       else
                         @base+"."+@branchid+"."+rev.to_s
                       end
                     end
                     # Interpretiert die cvs revisionsnummern wie z.b. 1.14 oder 1.3.0.15
                     def parseRevision()
                       pieces=@complete_rev.split(".")
                       @revision=pieces.last.to_i
                       baseSize=1
                       baseSize+=(pieces.size/2)
                       @base=pieces[0..-baseSize].join(".")
                       if baseSize > 2
                         @branchid=pieces[-2]
                       end
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/darcs_adapter.rb 0 -7

             # 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/abstract_adapter'
             require 'rexml/document'
             module Redmine
               module Scm
                 module Adapters
                   class DarcsAdapter < AbstractAdapter
                     # Darcs executable name
                     DARCS_BIN = "darcs"
                     def initialize(url, root_url=nil, login=nil, password=nil)
                       @url = url
                       @root_url = url
                     end
                     def supports_cat?
                       false
                     end
                     # Get info about the svn repository
                     def info
                       rev = revisions(nil,nil,nil,{:limit => 1})
                       rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
                     end
-                    # Returns the entry identified by path and revision identifier
-                    # or nil if entry doesn't exist in the repository
-                    def entry(path=nil, identifier=nil)
-                      e = entries(path, identifier)
-                      e ? e.first : nil
-                    end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path_prefix = (path.blank? ? '' : "#{path}/")
                       path = '.' if path.blank?
                       entries = Entries.new
                       cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output"
                       cmd << " --match \"hash #{identifier}\"" if identifier
                       cmd << " #{path}"
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           if doc.root.name == 'directory'
                             doc.elements.each('directory/*') do |element|
                               next unless ['file', 'directory'].include? element.name
                               entries << entry_from_xml(element, path_prefix)
                             end
                           elsif doc.root.name == 'file'
                             entries << entry_from_xml(doc.root, path_prefix)
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path = '.' if path.blank?
                       revisions = Revisions.new
                       cmd = "#{DARCS_BIN} changes --repodir #{@url} --xml-output"
                       cmd << " --from-match \"hash #{identifier_from}\"" if identifier_from
                       cmd << " --last #{options[:limit].to_i}" if options[:limit]
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           doc.elements.each("changelog/patch") do |patch|
                             message = patch.elements['name'].text
                             message << "\n" + patch.elements['comment'].text.gsub(/\*\*\*END OF DESCRIPTION\*\*\*.*\z/m, '') if patch.elements['comment']
                             revisions << Revision.new({:identifier => nil,
                                           :author => patch.attributes['author'],
                                           :scmid => patch.attributes['hash'],
                                           :time => Time.parse(patch.attributes['local_date']),
                                           :message => message,
                                           :paths => (options[:with_path] ? get_paths_for_patch(patch.attributes['hash']) : nil)
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path = '*' if path.blank?
                       cmd = "#{DARCS_BIN} diff --repodir #{@url}"
                       if identifier_to.nil?
                         cmd << " --match \"hash #{identifier_from}\""
                       else
                         cmd << " --to-match \"hash #{identifier_from}\""
                         cmd << " --from-match \"hash #{identifier_to}\""
                       end
                       cmd << " -u #{path}"
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     private
                     def entry_from_xml(element, path_prefix)
                       Entry.new({:name => element.attributes['name'],
                                  :path => path_prefix + element.attributes['name'],
                                  :kind => element.name == 'file' ? 'file' : 'dir',
                                  :size => nil,
                                  :lastrev => Revision.new({
                                    :identifier => nil,
                                    :scmid => element.elements['modified'].elements['patch'].attributes['hash']
                                    })
                                  })
                     end
                     # Retrieve changed paths for a single patch
                     def get_paths_for_patch(hash)
                       cmd = "#{DARCS_BIN} annotate --repodir #{@url} --summary --xml-output"
                       cmd << " --match \"hash #{hash}\" "
                       paths = []
                       shellout(cmd) do |io|
                         begin
                           # Darcs xml output has multiple root elements in this case (tested with darcs 1.0.7)
                           # A root element is added so that REXML doesn't raise an error
                           doc = REXML::Document.new("<fake_root>" + io.read + "</fake_root>")
                           doc.elements.each('fake_root/summary/*') do |modif|
                             paths << {:action => modif.name[0,1].upcase,
                                       :path => "/" + modif.text.chomp.gsub(/^\s*/, '')
                                      }
                           end
                         rescue
                         end
                       end
                       paths
                     rescue CommandFailed
                       paths
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/git_adapter.rb 0 -8

             # 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/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class GitAdapter < AbstractAdapter
                     # Git executable name
                     GIT_BIN = "git"
                     # Get the revision of a particuliar file
                     def get_rev (rev,path)
                       cmd="git --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
                       cmd="git --git-dir #{target('')} log -1 master -- #{shell_quote path}" if
                         rev=='latest' or rev.nil?
                       rev=[]
                       i=0
                       shellout(cmd) do |io|
                         files=[]
                         changeset = {}
                         parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
                         io.each_line do |line|
                           if line =~ /^commit ([0-9a-f]{40})$/
                             key = "commit"
                             value = $1
                             if (parsing_descr == 1 || parsing_descr == 2)
                               parsing_descr = 0
                               rev = Revision.new({:identifier => changeset[:commit],
                                                   :scmid => changeset[:commit],
                                                   :author => changeset[:author],
                                                   :time => Time.parse(changeset[:date]),
                                                   :message => changeset[:description],
                                                   :paths => files
                                                  })
                               changeset = {}
                               files = []
                             end
                             changeset[:commit] = $1
                           elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
                             key = $1
                             value = $2
                             if key == "Author"
                               changeset[:author] = value
                             elsif key == "Date"
                               changeset[:date] = value
                             end
                           elsif (parsing_descr == 0) && line.chomp.to_s == ""
                             parsing_descr = 1
                             changeset[:description] = ""
                           elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
                             parsing_descr = 2
                             fileaction = $1
                             filepath = $2
                             files << {:action => fileaction, :path => filepath}
                           elsif (parsing_descr == 1) && line.chomp.to_s == ""
                             parsing_descr = 2
                           elsif (parsing_descr == 1)
                             changeset[:description] << line
                           end
                         end
                         rev = Revision.new({:identifier => changeset[:commit],
                                             :scmid => changeset[:commit],
                                             :author => changeset[:author],
                                             :time => (changeset[:date] ? Time.parse(changeset[:date]) : nil),
                                             :message => changeset[:description],
                                             :paths => files
                                            })
                       end
                       get_rev('latest',path) if rev == []
                       return nil if $? && $?.exitstatus != 0
                       return rev
                     end
                     def info
                       revs = revisions(url,nil,nil,{:limit => 1})
                       if revs && revs.any?
                         Info.new(:root_url => url, :lastrev => revs.first)
                       else
                         nil
                       end
                     rescue Errno::ENOENT => e
                       return nil
                     end
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} ls-tree -l "
                       cmd << shell_quote("HEAD:" + path) if identifier.nil?
                       cmd << shell_quote(identifier + ":" + path) if identifier
                       shellout(cmd)  do |io|
                         io.each_line do |line|
                           e = line.chomp.to_s
                           if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\s+(.+)$/
                             type = $1
                             sha = $2
                             size = $3
                             name = $4
                             entries << Entry.new({:name => name,
                                                    :path => (path.empty? ? name : "#{path}/#{name}"),
                                                    :kind => ((type == "tree") ? 'dir' : 'file'),
                                                    :size => ((type == "tree") ? nil : size),
                                                    :lastrev => get_rev(identifier,(path.empty? ? name : "#{path}/#{name}"))
                                                  }) unless entries.detect{|entry| entry.name == name}
                           end
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
-                    def entry(path=nil, identifier=nil)
-                      path ||= ''
-                      search_path = path.split('/')[0..-2].join('/')
-                      entry_name = path.split('/').last
-                      e = entries(search_path, identifier)
-                      e ? e.detect{|entry| entry.name == entry_name} : nil
-                    end
                     def revisions(path, identifier_from, identifier_to, options={})
                       revisions = Revisions.new
                       cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "
                       cmd << " -n #{options[:limit].to_i} " if (!options.nil?) && options[:limit]
                       cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
                       cmd << " #{shell_quote identifier_to} " if identifier_to
                       #cmd << " HEAD " if !identifier_to
                       shellout(cmd) do |io|
                         files=[]
                         changeset = {}
                         parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
                         revno = 1
                         io.each_line do |line|
                           if line =~ /^commit ([0-9a-f]{40})$/
                             key = "commit"
                             value = $1
                             if (parsing_descr == 1 || parsing_descr == 2)
                               parsing_descr = 0
                               revisions << Revision.new({:identifier => changeset[:commit],
                                                          :scmid => changeset[:commit],
                                                          :author => changeset[:author],
                                                          :time => Time.parse(changeset[:date]),
                                                          :message => changeset[:description],
                                                          :paths => files
                                                         })
                               changeset = {}
                               files = []
                               revno = revno + 1
                             end
                             changeset[:commit] = $1
                           elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
                             key = $1
                             value = $2
                             if key == "Author"
                               changeset[:author] = value
                             elsif key == "Date"
                               changeset[:date] = value
                             end
                           elsif (parsing_descr == 0) && line.chomp.to_s == ""
                             parsing_descr = 1
                             changeset[:description] = ""
                           elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
                             parsing_descr = 2
                             fileaction = $1
                             filepath = $2
                             files << {:action => fileaction, :path => filepath}
                           elsif (parsing_descr == 1) && line.chomp.to_s == ""
                             parsing_descr = 2
                           elsif (parsing_descr == 1)
                             changeset[:description] << line[4..-1]
                           end
                         end
                         revisions << Revision.new({:identifier => changeset[:commit],
                                                    :scmid => changeset[:commit],
                                                    :author => changeset[:author],
                                                    :time => Time.parse(changeset[:date]),
                                                    :message => changeset[:description],
                                                    :paths => files
                                                   }) if changeset[:commit]
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path ||= ''
                       if !identifier_to
                         identifier_to = nil
                       end
                       cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" if identifier_to.nil?
                       cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" if !identifier_to.nil?
                       cmd << " -- #{shell_quote path}" unless path.empty?
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     def annotate(path, identifier=nil)
                       identifier = 'HEAD' if identifier.blank?
                       cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"
                       blame = Annotate.new
                       content = nil
                       shellout(cmd) { |io| io.binmode; content = io.read }
                       return nil if $? && $?.exitstatus != 0
                       # git annotates binary files
                       return nil if content.is_binary_data?
                       content.split("\n").each do |line|
                         next unless line =~ /([0-9a-f]{39,40})\s\((\w*)[^\)]*\)(.*)/
                         blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
                       end
                       blame
                     end
                     def cat(path, identifier=nil)
                       if identifier.nil?
                         identifier = 'HEAD'
                       end
                       cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/mercurial_adapter.rb 0 -8

             # 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/abstract_adapter'
             module Redmine
               module Scm
                 module Adapters
                   class MercurialAdapter < AbstractAdapter
                     # Mercurial executable name
                     HG_BIN = "hg"
                     def info
                       cmd = "#{HG_BIN} -R #{target('')} root"
                       root_url = nil
                       shellout(cmd) do |io|
                         root_url = io.gets
                       end
                       return nil if $? && $?.exitstatus != 0
                       info = Info.new({:root_url => root_url.chomp,
                                        :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
                                      })
                       info
                     rescue CommandFailed
                       return nil
                     end
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       entries = Entries.new
                       cmd = "#{HG_BIN} -R #{target('')} --cwd #{target(path)} locate"
                       cmd << " -r #{identifier.to_i}" if identifier
                       cmd << " " + shell_quote('glob:**')
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           e = line.chomp.split(%r{[\/\\]})
                           entries << Entry.new({:name => e.first,
                                                 :path => (path.empty? ? e.first : "#{path}/#{e.first}"),
                                                 :kind => (e.size > 1 ? 'dir' : 'file'),
                                                 :lastrev => Revision.new
                                                 }) unless entries.detect{|entry| entry.name == e.first}
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       entries.sort_by_name
                     end
-                    def entry(path=nil, identifier=nil)
-                      path ||= ''
-                      search_path = path.split('/')[0..-2].join('/')
-                      entry_name = path.split('/').last
-                      e = entries(search_path, identifier)
-                      e ? e.detect{|entry| entry.name == entry_name} : nil
-                    end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       revisions = Revisions.new
                       cmd = "#{HG_BIN} -v --encoding utf8 -R #{target('')} log"
                       if identifier_from && identifier_to
                         cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
                       elsif identifier_from
                         cmd << " -r #{identifier_from.to_i}:"
                       end
                       cmd << " --limit #{options[:limit].to_i}" if options[:limit]
                       shellout(cmd) do |io|
                         changeset = {}
                         parsing_descr = false
                         line_feeds = 0
                         io.each_line do |line|
                           if line =~ /^(\w+):\s*(.*)$/
                             key = $1
                             value = $2
                             if parsing_descr && line_feeds > 1
                               parsing_descr = false
                               revisions << build_revision_from_changeset(changeset)
                               changeset = {}
                             end
                             if !parsing_descr
                               changeset.store key.to_sym, value
                               if $1 == "description"
                                 parsing_descr = true
                                 line_feeds = 0
                                 next
                               end
                             end
                           end
                           if parsing_descr
                             changeset[:description] << line
                             line_feeds += 1 if line.chomp.empty?
                           end
                         end
                         # Add the last changeset if there is one left
                         revisions << build_revision_from_changeset(changeset) if changeset[:date]
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path ||= ''
                       if identifier_to
                         identifier_to = identifier_to.to_i
                       else
                         identifier_to = identifier_from.to_i - 1
                       end
                       cmd = "#{HG_BIN} -R #{target('')} diff -r #{identifier_to} -r #{identifier_from} --nodates"
                       cmd << " -I #{target(path)}" unless path.empty?
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     def cat(path, identifier=nil)
                       cmd = "#{HG_BIN} -R #{target('')} cat"
                       cmd << " -r #{identifier.to_i}" if identifier
                       cmd << " #{target(path)}"
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       path ||= ''
                       cmd = "#{HG_BIN} -R #{target('')}"
                       cmd << " annotate -n -u"
                       cmd << " -r #{identifier.to_i}" if identifier
                       cmd << " #{target(path)}"
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^([^:]+)\s(\d+):(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $2.to_i, :author => $1.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     # Builds a revision objet from the changeset returned by hg command
                     def build_revision_from_changeset(changeset)
                       rev_id = changeset[:changeset].to_s.split(':').first.to_i
                       # Changes
                       paths = (rev_id == 0) ?
                         # Can't get changes for revision 0 with hg status
                         changeset[:files].to_s.split.collect{|path| {:action => 'A', :path => "/#{path}"}} :
                         status(rev_id)
                       Revision.new({:identifier => rev_id,
                                     :scmid => changeset[:changeset].to_s.split(':').last,
                                     :author => changeset[:user],
                                     :time => Time.parse(changeset[:date]),
                                     :message => changeset[:description],
                                     :paths => paths
                                    })
                     end
                     # Returns the file changes for a given revision
                     def status(rev_id)
                       cmd = "#{HG_BIN} -R #{target('')} status --rev #{rev_id.to_i - 1}:#{rev_id.to_i}"
                       result = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           action, file = line.chomp.split
                           next unless action && file
                           file.gsub!("\\", "/")
                           case action
                           when 'R'
                             result << { :action => 'D' , :path => "/#{file}" }
                           else
                             result << { :action => action, :path => "/#{file}" }
                           end
                         end
                       end
                       result
                     end
                   end
                 end
               end
             end

lib/redmine/scm/adapters/subversion_adapter.rb 0 -7

             # 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/abstract_adapter'
             require 'rexml/document'
             module Redmine
               module Scm
                 module Adapters
                   class SubversionAdapter < AbstractAdapter
                     # SVN executable name
                     SVN_BIN = "svn"
                     # Get info about the svn repository
                     def info
                       cmd = "#{SVN_BIN} info --xml #{target('')}"
                       cmd << credentials_string
                       info = nil
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           #root_url = doc.elements["info/entry/repository/root"].text
                           info = Info.new({:root_url => doc.elements["info/entry/repository/root"].text,
                                            :lastrev => Revision.new({
                                              :identifier => doc.elements["info/entry/commit"].attributes['revision'],
                                              :time => Time.parse(doc.elements["info/entry/commit/date"].text).localtime,
                                              :author => (doc.elements["info/entry/commit/author"] ? doc.elements["info/entry/commit/author"].text : "")
                                            })
                                          })
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       info
                     rescue CommandFailed
                       return nil
                     end
-                    # Returns the entry identified by path and revision identifier
-                    # or nil if entry doesn't exist in the repository
-                    def entry(path=nil, identifier=nil)
-                      e = entries(path, identifier)
-                      e ? e.first : nil
-                    end
                     # Returns an Entries collection
                     # or nil if the given path doesn't exist in the repository
                     def entries(path=nil, identifier=nil)
                       path ||= ''
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       entries = Entries.new
                       cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       shellout(cmd) do |io|
                         output = io.read
                         begin
                           doc = REXML::Document.new(output)
                           doc.elements.each("lists/list/entry") do |entry|
                             entries << Entry.new({:name => entry.elements['name'].text,
                                         :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
                                         :kind => entry.attributes['kind'],
                                         :size => (entry.elements['size'] and entry.elements['size'].text).to_i,
                                         :lastrev => Revision.new({
                                           :identifier => entry.elements['commit'].attributes['revision'],
                                           :time => Time.parse(entry.elements['commit'].elements['date'].text).localtime,
                                           :author => (entry.elements['commit'].elements['author'] ? entry.elements['commit'].elements['author'].text : "")
                                           })
                                         })
                           end
                         rescue Exception => e
                           logger.error("Error parsing svn output: #{e.message}")
                           logger.error("Output was:\n #{output}")
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
                       entries.sort_by_name
                     end
                     def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
                       revisions = Revisions.new
                       cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
                       cmd << credentials_string
                       cmd << " --verbose " if  options[:with_paths]
                       cmd << ' ' + target(path)
                       shellout(cmd) do |io|
                         begin
                           doc = REXML::Document.new(io)
                           doc.elements.each("log/logentry") do |logentry|
                             paths = []
                             logentry.elements.each("paths/path") do |path|
                               paths << {:action => path.attributes['action'],
                                         :path => path.text,
                                         :from_path => path.attributes['copyfrom-path'],
                                         :from_revision => path.attributes['copyfrom-rev']
                                         }
                             end
                             paths.sort! { |x,y| x[:path] <=> y[:path] }
                             revisions << Revision.new({:identifier => logentry.attributes['revision'],
                                           :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
                                           :time => Time.parse(logentry.elements['date'].text).localtime,
                                           :message => logentry.elements['msg'].text,
                                           :paths => paths
                                         })
                           end
                         rescue
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       revisions
                     end
                     def diff(path, identifier_from, identifier_to=nil, type="inline")
                       path ||= ''
                       identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
                       identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
                       cmd = "#{SVN_BIN} diff -r "
                       cmd << "#{identifier_to}:"
                       cmd << "#{identifier_from}"
                       cmd << " #{target(path)}@#{identifier_from}"
                       cmd << credentials_string
                       diff = []
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           diff << line
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       DiffTableList.new diff, type
                     end
                     def cat(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} cat #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       cat = nil
                       shellout(cmd) do |io|
                         io.binmode
                         cat = io.read
                       end
                       return nil if $? && $?.exitstatus != 0
                       cat
                     end
                     def annotate(path, identifier=nil)
                       identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
                       cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
                       cmd << credentials_string
                       blame = Annotate.new
                       shellout(cmd) do |io|
                         io.each_line do |line|
                           next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
                           blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
                         end
                       end
                       return nil if $? && $?.exitstatus != 0
                       blame
                     end
                     private
                     def credentials_string
                       str = ''
                       str << " --username #{shell_quote(@login)}" unless @login.blank?
                       str << " --password #{shell_quote(@password)}" unless @login.blank? || @password.blank?
                       str
                     end
                   end
                 end
               end
             end

test/functional/repositories_bazaar_controller_test.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006-2008  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.dirname(__FILE__) + '/../test_helper'
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesBazaarControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 Repository::Bazaar.create(:project => Project.find(3), :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 3
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal 2, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'directory' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'doc-mkdir.txt' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :browse, :id => 3, :path => ['directory']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['doc-ls.txt', 'document.txt', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'directory/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :browse, :id => 3, :path => [], :rev => 3
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['directory', 'doc-deleted.txt', 'doc-ls.txt', 'doc-mkdir.txt'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['doc-mkdir.txt']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'doc-mkdir.txt'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['directory', 'doc-ls.txt']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /29/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /Show help message/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['directory', 'doc-ls.txt'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('Show help message')
                 end
+                def test_directory_entry
+                  get :entry, :id => 3, :path => ['directory']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'directory', assigns(:entry).name
+                end
                 def test_diff
                   # Full diff of changeset 3
                   get :diff, :id => 3, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => /2/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_in/ },
                                            :content => /Main purpose/ }
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['doc-mkdir.txt']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 2, revision 3
                   assert_tag :tag => 'th', :content => /2/,
                              :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /3/ } },
                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /Main purpose/ }
                 end
               else
                 puts "Bazaar test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_cvs_controller_test.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006-2008  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.dirname(__FILE__) + '/../test_helper'
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesCvsControllerTest < Test::Unit::TestCase
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
               # CVS module
               MODULE_NAME = 'test'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.default_language = 'en'
                 User.current = nil
                 @project = Project.find(1)
                 @project.repository = Repository::Cvs.create(:root_url => REPOSITORY_PATH,
                                                              :url => MODULE_NAME)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 1
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal 3, assigns(:entries).size
                   entry = assigns(:entries).detect {|e| e.name == 'images'}
                   assert_equal 'dir', entry.kind
                   entry = assigns(:entries).detect {|e| e.name == 'README'}
                   assert_equal 'file', entry.kind
                 end
                 def test_browse_directory
                   get :browse, :id => 1, :path => ['images']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['add.png', 'delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   Project.find(1).repository.fetch_changesets
                   get :browse, :id => 1, :path => ['images'], :rev => 1
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                 end
                 def test_entry
                   get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['sources', 'zzz.c']
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                             :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                 end
+                def test_directory_entry
+                  get :entry, :id => 1, :path => ['sources']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'sources', assigns(:entry).name
+                end
                 def test_diff
                   Project.find(1).repository.fetch_changesets
                   get :diff, :id => 1, :rev => 3, :type => 'inline'
                   assert_response :success
                   assert_template 'diff'
                   assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_out' },
                                            :content => /watched.remove_watcher/
                   assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
                                            :content => /watched.remove_all_watcher/
                 end
                 def test_annotate
                   Project.find(1).repository.fetch_changesets
                   get :annotate, :id => 1, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # 1.1 line
                   assert_tag :tag => 'th', :attributes => { :class => 'line-num' },
                                            :content => '18',
                                            :sibling => { :tag => 'td', :attributes => { :class => 'revision' },
                                                          :content => /1.1/,
                                                          :sibling => { :tag => 'td', :attributes => { :class => 'author' },
                                                                        :content => /LANG/
                                                        }
                                            }
                   # 1.2 line
                   assert_tag :tag => 'th', :attributes => { :class => 'line-num' },
                                            :content => '32',
                                            :sibling => { :tag => 'td', :attributes => { :class => 'revision' },
                                                          :content => /1.2/,
                                                          :sibling => { :tag => 'td', :attributes => { :class => 'author' },
                                                                        :content => /LANG/
                                                        }
                                            }
                 end
               else
                 puts "CVS test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_git_controller_test.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006-2008  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.dirname(__FILE__) + '/../test_helper'
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesGitControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
               REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 3
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal 3, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :browse, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :browse, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /10/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
+                def test_directory_entry
+                  get :entry, :id => 3, :path => ['sources']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'sources', assigns(:entry).name
+                end
                 def test_diff
                   # Full diff of changeset 2f9c0091
                   get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => /22/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /def remove/ }
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, changeset 2f9c0091
                   assert_tag :tag => 'th', :content => /23/,
                              :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
                 def test_annotate_binary_file
                   get :annotate, :id => 3, :path => ['images', 'delete.png']
                   assert_response 500
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                             :content => /can not be annotated/
                 end
               else
                 puts "Git test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_mercurial_controller_test.rb +9 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  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.dirname(__FILE__) + '/../test_helper'
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesMercurialControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
               # No '..' in the repository path
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 3
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 3
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal 3, assigns(:entries).size
                   assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
                   assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
                 end
                 def test_browse_directory
                   get :browse, :id => 3, :path => ['images']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
                   assert_not_nil entry
                   assert_equal 'file', entry.kind
                   assert_equal 'images/edit.png', entry.path
                 end
                 def test_browse_at_given_revision
                   get :browse, :id => 3, :path => ['images'], :rev => 0
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['delete.png'], assigns(:entries).collect(&:name)
                 end
                 def test_changes
                   get :changes, :id => 3, :path => ['images', 'edit.png']
                   assert_response :success
                   assert_template 'changes'
                   assert_tag :tag => 'h2', :content => 'edit.png'
                 end
                 def test_entry_show
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'entry'
                   # Line 19
                   assert_tag :tag => 'th',
                              :content => /10/,
                              :attributes => { :class => /line-num/ },
                              :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
                 end
                 def test_entry_download
                   get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
                   assert_response :success
                   # File content
                   assert @response.body.include?('WITHOUT ANY WARRANTY')
                 end
+                def test_directory_entry
+                  get :entry, :id => 3, :path => ['sources']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'sources', assigns(:entry).name
+                end
                 def test_diff
                   # Full diff of changeset 4
                   get :diff, :id => 3, :rev => 4
                   assert_response :success
                   assert_template 'diff'
                   # Line 22 removed
                   assert_tag :tag => 'th',
                              :content => /22/,
                              :sibling => { :tag => 'td',
                                            :attributes => { :class => /diff_out/ },
                                            :content => /def remove/ }
                 end
                 def test_annotate
                   get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
                   assert_response :success
                   assert_template 'annotate'
                   # Line 23, revision 4
                   assert_tag :tag => 'th', :content => /23/,
                              :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /4/ } },
                              :sibling => { :tag => 'td', :content => /jsmith/ },
                              :sibling => { :tag => 'td', :content => /watcher =/ }
                 end
               else
                 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

test/functional/repositories_subversion_controller_test.rb +8 0

             # redMine - project management software
             # Copyright (C) 2006-2008  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.dirname(__FILE__) + '/../test_helper'
             require 'repositories_controller'
             # Re-raise errors caught by the controller.
             class RepositoriesController; def rescue_action(e) raise e end; end
             class RepositoriesSubversionControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
               # No '..' in the repository path for svn
               REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
               def setup
                 @controller = RepositoriesController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 Setting.default_language = 'en'
                 User.current = nil
               end
               if File.directory?(REPOSITORY_PATH)
                 def test_show
                   get :show, :id => 1
                   assert_response :success
                   assert_template 'show'
                   assert_not_nil assigns(:entries)
                   assert_not_nil assigns(:changesets)
                 end
                 def test_browse_root
                   get :browse, :id => 1
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
                   assert_equal 'dir', entry.kind
                 end
                 def test_browse_directory
                   get :browse, :id => 1, :path => ['subversion_test']
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
                   entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
                   assert_equal 'file', entry.kind
                   assert_equal 'subversion_test/helloworld.c', entry.path
                 end
                 def test_browse_at_given_revision
                   get :browse, :id => 1, :path => ['subversion_test'], :rev => 4
                   assert_response :success
                   assert_template 'browse'
                   assert_not_nil assigns(:entries)
                   assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
                 end
                 def test_entry
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'entry'
                 end
                 def test_entry_not_found
                   get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
                   assert_tag :tag => 'div', :attributes => { :class => /error/ },
                                             :content => /The entry or revision was not found in the repository/
                 end
                 def test_entry_download
                   get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'
                   assert_response :success
                 end
+                def test_directory_entry
+                  get :entry, :id => 1, :path => ['subversion_test', 'folder']
+                  assert_response :success
+                  assert_template 'browse'
+                  assert_not_nil assigns(:entry)
+                  assert_equal 'folder', assigns(:entry).name
+                end
                 def test_diff
                   get :diff, :id => 1, :rev => 3
                   assert_response :success
                   assert_template 'diff'
                 end
                 def test_annotate
                   get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']
                   assert_response :success
                   assert_template 'annotate'
                 end
               else
                 puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
                 def test_fake; assert true end
               end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages