Skip to content

O
OHR Support
Commit 21ae869d authored by Enrique García Cota's avatar Enrique García Cota
Browse files
Options

increased scm file download in scm views

parent c4f80d5e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 395 additions and 361 deletions
app/controllers/repositories_controller.rb
View file @ 21ae869d
...@@ -118,41 +118,48 @@ class RepositoriesController < ApplicationController ...@@ -118,41 +118,48 @@ class RepositoriesController < ApplicationController
# If the entry is a dir, show the browser # If the entry is a dir, show the browser
(show; return) if @entry.is_dir? (show; return) if @entry.is_dir?
@content = @repository.cat(@path, @rev) @repository.cat_to_tempfile(@path, @rev) do |f|
(show_error_not_found; return) unless @content if params[:format] == 'raw' || is_too_large_to_show?(f) || is_binary?(f, @path)
if 'raw' == params[:format] ||
(@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
! is_entry_text_data?(@content, @path)
# Force the download
send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
send_type = Redmine::MimeType.of(@path) send_type = Redmine::MimeType.of(@path)
send_opt[:type] = send_type.to_s if send_type options = {
send_data @content, send_opt :filename => filename_for_content_disposition(@path.split('/').last),
:disposition => 'attachment',
:x_sendfile => false # x_sendfile does not work well with tempfiles
}
options[:type] = send_type.to_s if send_type
send_file(f.path, options)
else else
# Prevent empty lines when displaying a file with Windows style eol @content = f.read
# TODO: UTF-16
# Is this needs? AttachmentsController reads file simply.
@content.gsub!("\r\n", "\n")
@changeset = @repository.find_changeset_by_name(@rev) @changeset = @repository.find_changeset_by_name(@rev)
end end
end end
rescue Errno::ENOENT
show_error_not_found
end
def is_entry_text_data?(ent, path) def is_too_large_to_show?(f)
# UTF-16 contains "\x00". f.size > Setting.file_max_size_displayed.to_i.kilobyte
# It is very strict that file contains less than 30% of ascii symbols
# in non Western Europe.
return true if Redmine::MimeType.is_type?('text', path)
# Ruby 1.8.6 has a bug of integer divisions.
# http://apidock.com/ruby/v1_8_6_287/String/is_binary_data%3F
if ent.respond_to?("is_binary_data?") && ent.is_binary_data? # Ruby 1.8.x and <1.9.2
return false
elsif ent.respond_to?(:force_encoding) && (ent.dup.force_encoding("UTF-8") != ent.dup.force_encoding("BINARY") ) # Ruby 1.9.2
# TODO: need to handle edge cases of non-binary content that isn't UTF-8
return false
end end
true private :is_too_large_to_show?
def is_binary?(file, path)
return false if Redmine::MimeType.is_type?('text', path)
# First block of the file is examined for odd
# characters such as strange control codes or char-
# acters with the high bit set. If too many strange
# characters (>30%) are found, it's a binary file,
# otherwise it's a text file. Also, any file con-
# taining null in the first block is considered a
# binary file.
blk = file.read(Setting.file_max_size_displayed.to_i.kilobyte)
return blk.size == 0 ||
blk.count("^ -~", "^\r\n") / blk.size > 0.3 ||
blk.count("\x00") > 0
end end
private :is_entry_text_data? private :is_binary?
def annotate def annotate
@entry = @repository.entry(@path, @rev) @entry = @repository.entry(@path, @rev)
......
app/models/repository.rb
View file @ 21ae869d
...@@ -104,6 +104,10 @@ class Repository < ActiveRecord::Base ...@@ -104,6 +104,10 @@ class Repository < ActiveRecord::Base
scm.cat(path, identifier) scm.cat(path, identifier)
end end
def cat_to_tempfile(path, identifier, &block)
scm.cat_to_tempfile(path, identifier, &block)
end
def diff(path, rev, rev_to) def diff(path, rev, rev_to)
scm.diff(path, rev, rev_to) scm.diff(path, rev, rev_to)
end end
......
lib/redmine/scm/adapters/abstract_adapter.rb
View file @ 21ae869d
...@@ -69,7 +69,7 @@ module Redmine ...@@ -69,7 +69,7 @@ module Redmine
end end
def adapter_name def adapter_name
'Abstract' self.class.name.gsub("Adapter","")
end end
def supports_cat? def supports_cat?
...@@ -143,6 +143,19 @@ module Redmine ...@@ -143,6 +143,19 @@ module Redmine
return nil return nil
end end
def cat_to_tempfile(path, identifier, &block)
prefix = path.split("/").last
tmp_path = Rails.root.join('tmp')
Tempfile.open(prefix, tmp_path) do |f|
save_entry_in_file(f,path,identifier)
block.call(f)
end
end
def save_entry_in_file(file, path, identifier)
return nil
end
def with_leading_slash(path) def with_leading_slash(path)
path ||= '' path ||= ''
(path[0,1]!="/") ? "/#{path}" : path (path[0,1]!="/") ? "/#{path}" : path
...@@ -183,34 +196,56 @@ module Redmine ...@@ -183,34 +196,56 @@ module Redmine
self.class.logger self.class.logger
end end
def shellout(cmd, &block) def shellout(cmd, output_path=nil, &block)
self.class.shellout(cmd, &block) self.class.shellout(cmd, output_path, &block)
end
def build_scm_cmd(cmd_args)
([ self.class.sq_bin ] + cmd_args).join(' ')
end
def scm_cmd(cmd_args, output_path=nil, &block)
cmd = build_scm_cmd(cmd_args)
begin
ret = shellout(cmd, output_path, &block)
rescue Exception => e
msg = strip_credential(e.message)
cmd = strip_credential(cmd)
logger.error("Error executing #{adapter_name} command [#{cmd}]: #{msg}")
end
return nil if $? && $?.exitstatus != 0
ret
end end
def self.logger def self.logger
RAILS_DEFAULT_LOGGER RAILS_DEFAULT_LOGGER
end end
def self.shellout(cmd, &block) def self.process_cmd(cmd, output_path)
logger.debug "Shelling out: #{strip_credential(cmd)}" if logger && logger.debug? cmd = Rails.env == 'development' ? "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log" : cmd
if Rails.env == 'development' cmd = "#{cmd} >> #{output_path}" if output_path.present?
# Capture stderr when running in dev environment cmd
cmd = "#{cmd} 2>>#{RAILS_ROOT}/log/scm.stderr.log"
end end
begin
if RUBY_VERSION < '1.9' def self.get_reading_mode_for_ruby_version
mode = "r+" RUBY_VERSION < '1.9' ? 'r+' : 'r+:ASCII-8BIT'
else
mode = "r+:ASCII-8BIT"
end end
def self.shellout(cmd, output_path=nil, &block)
logger.debug("Shelling out: #{strip_credential(cmd)}") if logger && logger.respond_to?(:debug)
cmd = process_cmd(cmd, output_path)
mode = get_reading_mode_for_ruby_version
begin
result = nil
IO.popen(cmd, mode) do |io| IO.popen(cmd, mode) do |io|
io.close_write io.close_write
block.call(io) if block_given? result = block.call(io) if block_given?
end end
result
rescue Errno::ENOENT => e rescue Errno::ENOENT => e
msg = strip_credential(e.message) msg = strip_credential(e.message)
# The command failed, log it and re-raise cmd = strip_credential(cmd)
logger.error("SCM command failed, make sure that your SCM binary (eg. svn) is in PATH (#{ENV['PATH']}): #{strip_credential(cmd)}\n with: #{msg}") logger.error("SCM command failed, make sure that your SCM binary (eg. svn) is in PATH (#{ENV['PATH']}): #{cmd}\n with: #{msg}")
raise CommandFailed.new(msg) raise CommandFailed.new(msg)
end end
end end
......
lib/redmine/scm/adapters/bazaar_adapter.rb
View file @ 21ae869d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# See doc/COPYRIGHT.rdoc for more details. # See doc/COPYRIGHT.rdoc for more details.
#++ #++
require 'redmine/scm/adapters/abstract_adapter' require_dependency 'redmine/scm/adapters/abstract_adapter'
module Redmine module Redmine
module Scm module Scm
......
lib/redmine/scm/adapters/cvs_adapter.rb
View file @ 21ae869d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# See doc/COPYRIGHT.rdoc for more details. # See doc/COPYRIGHT.rdoc for more details.
#++ #++
require 'redmine/scm/adapters/abstract_adapter' require_dependency 'redmine/scm/adapters/abstract_adapter'
module Redmine module Redmine
module Scm module Scm
......
lib/redmine/scm/adapters/darcs_adapter.rb
View file @ 21ae869d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# See doc/COPYRIGHT.rdoc for more details. # See doc/COPYRIGHT.rdoc for more details.
#++ #++
require 'redmine/scm/adapters/abstract_adapter' require_dependency 'redmine/scm/adapters/abstract_adapter'
require 'rexml/document' require 'rexml/document'
module Redmine module Redmine
......
lib/redmine/scm/adapters/filesystem_adapter.rb
View file @ 21ae869d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# See doc/COPYRIGHT.rdoc for more details. # See doc/COPYRIGHT.rdoc for more details.
#++ #++
require 'redmine/scm/adapters/abstract_adapter' require_dependency 'redmine/scm/adapters/abstract_adapter'
require 'find' require 'find'
module Redmine module Redmine
...@@ -91,6 +91,14 @@ module Redmine ...@@ -91,6 +91,14 @@ module Redmine
raise CommandFailed.new(err.message) raise CommandFailed.new(err.message)
end end
def save_entry_in_file(f, path, identifier)
p = scm_iconv(@path_encoding, 'UTF-8', target(path))
FileUtils.cp(p, f.path)
rescue => err
logger.error "scm: filesystem: error: #{err.message}"
raise CommandFailed.new(err.message)
end
private private
# AbstractAdapter::target is implicitly made to quote paths. # AbstractAdapter::target is implicitly made to quote paths.
......
lib/redmine/scm/adapters/git_adapter.rb
View file @ 21ae869d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# See doc/COPYRIGHT.rdoc for more details. # See doc/COPYRIGHT.rdoc for more details.
#++ #++
require 'redmine/scm/adapters/abstract_adapter' require_dependency 'redmine/scm/adapters/abstract_adapter'
module Redmine module Redmine
module Scm module Scm
...@@ -24,9 +24,6 @@ module Redmine ...@@ -24,9 +24,6 @@ module Redmine
# Git executable name # Git executable name
GIT_BIN = Redmine::Configuration['scm_git_command'] || "git" unless defined?(GIT_BIN) GIT_BIN = Redmine::Configuration['scm_git_command'] || "git" unless defined?(GIT_BIN)
# raised if scm command exited with error, e.g. unknown revision.
class ScmCommandAborted < CommandFailed; end
class << self class << self
def client_command def client_command
@@bin ||= GIT_BIN @@bin ||= GIT_BIN
...@@ -75,26 +72,22 @@ module Redmine ...@@ -75,26 +72,22 @@ module Redmine
def branches def branches
return @branches if @branches return @branches if @branches
@branches = []
cmd_args = %w|branch --no-color| cmd_args = %w|branch --no-color|
scm_cmd(*cmd_args) do |io| scm_cmd(cmd_args) do |io|
@branches = []
io.each_line do |line| io.each_line do |line|
@branches << line.match('\s*\*?\s*(.*)$')[1] @branches << line.match('\s*\*?\s*(.*)$')[1]
end end
end
@branches.sort! @branches.sort!
rescue ScmCommandAborted end
nil
end end
def tags def tags
return @tags if @tags return @tags if @tags
cmd_args = %w|tag| cmd_args = %w|tag|
scm_cmd(*cmd_args) do |io| scm_cmd(cmd_args) do |io|
@tags = io.readlines.sort!.map{|t| t.strip} @tags = io.readlines.sort!.map{|t| t.strip}
end end
rescue ScmCommandAborted
nil
end end
def default_branch def default_branch
...@@ -106,11 +99,14 @@ module Redmine ...@@ -106,11 +99,14 @@ module Redmine
def entries(path=nil, identifier=nil) def entries(path=nil, identifier=nil)
path ||= '' path ||= ''
p = scm_iconv(@path_encoding, 'UTF-8', path) p = scm_iconv(@path_encoding, 'UTF-8', path)
entries = Entries.new
cmd_args = %w|ls-tree -l| cmd_args = %w|ls-tree -l|
cmd_args << "HEAD:#{p}" if identifier.nil? cmd_args << "HEAD:#{p}" if identifier.nil?
cmd_args << "#{identifier}:#{p}" if identifier cmd_args << "#{identifier}:#{p}" if identifier
scm_cmd(*cmd_args) do |io|
scm_cmd(cmd_args) do |io|
entries = Entries.new
io.each_line do |line| io.each_line do |line|
e = line.chomp.to_s e = line.chomp.to_s
if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/ if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
...@@ -124,18 +120,20 @@ module Redmine ...@@ -124,18 +120,20 @@ module Redmine
full_path = p.empty? ? name : "#{p}/#{name}" full_path = p.empty? ? name : "#{p}/#{name}"
n = scm_iconv('UTF-8', @path_encoding, name) n = scm_iconv('UTF-8', @path_encoding, name)
full_p = scm_iconv('UTF-8', @path_encoding, full_path) full_p = scm_iconv('UTF-8', @path_encoding, full_path)
unless entries.detect{|entry| entry.name == name}
entries << Entry.new({:name => n, entries << Entry.new({:name => n,
:path => full_p, :path => full_p,
:kind => (type == "tree") ? 'dir' : 'file', :kind => (type == "tree") ? 'dir' : 'file',
:size => (type == "tree") ? nil : size, :size => (type == "tree") ? nil : size,
:lastrev => @flag_report_last_commit ? lastrev(full_path, identifier) : Revision.new :lastrev => @flag_report_last_commit ? lastrev(full_path, identifier) : Revision.new
}) unless entries.detect{|entry| entry.name == name} })
end end
end end
end end
entries.sort_by_name entries.sort_by_name
rescue ScmCommandAborted end
nil
end end
def lastrev(path, rev) def lastrev(path, rev)
...@@ -143,8 +141,8 @@ module Redmine ...@@ -143,8 +141,8 @@ module Redmine
cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1| cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1|
cmd_args << rev if rev cmd_args << rev if rev
cmd_args << "--" << path unless path.empty? cmd_args << "--" << path unless path.empty?
lines = [] lines = scm_cmd(cmd_args) { |io| io.readlines }
scm_cmd(*cmd_args) { |io| lines = io.readlines } if lines
begin begin
id = lines[0].split[1] id = lines[0].split[1]
author = lines[1].match('Author:\s+(.*)$')[1] author = lines[1].match('Author:\s+(.*)$')[1]
...@@ -162,12 +160,12 @@ module Redmine ...@@ -162,12 +160,12 @@ module Redmine
logger.error("The revision '#{path}' has a wrong format") logger.error("The revision '#{path}' has a wrong format")
return nil return nil
end end
rescue ScmCommandAborted end
nil
end end
def revisions(path, identifier_from, identifier_to, options={}) def revisions(path, identifier_from, identifier_to, options={})
revisions = Revisions.new revisions = Revisions.new
cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller| cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller|
cmd_args << "--reverse" if options[:reverse] cmd_args << "--reverse" if options[:reverse]
cmd_args << "--all" if options[:all] cmd_args << "--all" if options[:all]
...@@ -179,7 +177,7 @@ module Redmine ...@@ -179,7 +177,7 @@ module Redmine
cmd_args << "--since='#{options[:since].strftime("%Y-%m-%d %H:%M:%S")}'" if options[:since] cmd_args << "--since='#{options[:since].strftime("%Y-%m-%d %H:%M:%S")}'" if options[:since]
cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty? cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
scm_cmd *cmd_args do |io| scm_cmd cmd_args do |io|
files=[] files=[]
changeset = {} changeset = {}
parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
...@@ -255,11 +253,10 @@ module Redmine ...@@ -255,11 +253,10 @@ module Redmine
revisions << revision revisions << revision
end end
end end
end
revisions
rescue ScmCommandAborted
revisions revisions
end end
end
def diff(path, identifier_from, identifier_to=nil) def diff(path, identifier_from, identifier_to=nil)
path ||= '' path ||= ''
...@@ -271,14 +268,12 @@ module Redmine ...@@ -271,14 +268,12 @@ module Redmine
end end
cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty? cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty?
diff = [] diff = []
scm_cmd *cmd_args do |io| scm_cmd cmd_args do |io|
io.each_line do |line| io.each_line do |line|
diff << line diff << line
end end
end
diff diff
rescue ScmCommandAborted end
nil
end end
def annotate(path, identifier=nil) def annotate(path, identifier=nil)
...@@ -286,8 +281,11 @@ module Redmine ...@@ -286,8 +281,11 @@ module Redmine
cmd_args = %w|blame| cmd_args = %w|blame|
cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path) cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path)
blame = Annotate.new blame = Annotate.new
content = nil content = scm_cmd(cmd_args) do |io|
scm_cmd(*cmd_args) { |io| io.binmode; content = io.read } io.binmode
io.read
end
if content
# git annotates binary files # git annotates binary files
if content.respond_to?("is_binary_data?") && content.is_binary_data? # Ruby 1.8.x and <1.9.2 if content.respond_to?("is_binary_data?") && content.is_binary_data? # Ruby 1.8.x and <1.9.2
return nil return nil
...@@ -312,8 +310,7 @@ module Redmine ...@@ -312,8 +310,7 @@ module Redmine
end end
end end
blame blame
rescue ScmCommandAborted end
nil
end end
def cat(path, identifier=nil) def cat(path, identifier=nil)
...@@ -322,14 +319,16 @@ module Redmine ...@@ -322,14 +319,16 @@ module Redmine
end end
cmd_args = %w|show --no-color| cmd_args = %w|show --no-color|
cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}" cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}"
cat = nil scm_cmd(cmd_args) do |io|
scm_cmd(*cmd_args) do |io|
io.binmode io.binmode
cat = io.read io.read
end end
cat end
rescue ScmCommandAborted
nil def save_entry_in_file(f, path, identifier)
cmd_args = %w|show --no-color|
cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}"
scm_cmd(cmd_args, f.path)
end end
class Revision < Redmine::Scm::Adapters::Revision class Revision < Redmine::Scm::Adapters::Revision
...@@ -339,20 +338,15 @@ module Redmine ...@@ -339,20 +338,15 @@ module Redmine
end end
end end
def scm_cmd(*args, &block) private
repo_path = root_url || url # returns the string that will represent the command for shelling out
full_args = [GIT_BIN, '--git-dir', repo_path] def build_scm_cmd(args)
full_args = [GIT_BIN, '--git-dir', root_url || url ]
if self.class.client_version_above?([1, 7, 2]) if self.class.client_version_above?([1, 7, 2])
full_args << '-c' << 'core.quotepath=false' full_args << '-c' << 'core.quotepath=false'
end end
full_args += args (full_args + args).map { |e| shell_quote e.to_s }.join(' ')
ret = shellout(full_args.map { |e| shell_quote e.to_s }.join(' '), &block)
if $? && $?.exitstatus != 0
raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"
end
ret
end end
private :scm_cmd
end end
end end
end end
......
lib/redmine/scm/adapters/subversion_adapter.rb
View file @ 21ae869d
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
# See doc/COPYRIGHT.rdoc for more details. # See doc/COPYRIGHT.rdoc for more details.
#++ #++
require 'redmine/scm/adapters/abstract_adapter' require_dependency 'redmine/scm/adapters/abstract_adapter'
require 'uri' require 'uri'
module Redmine module Redmine
...@@ -57,47 +57,37 @@ module Redmine ...@@ -57,47 +57,37 @@ module Redmine
# Get info about the svn repository # Get info about the svn repository
def info def info
cmd = "#{self.class.sq_bin} info --xml #{target}" cmd_args = ['info','--xml', target, credentials_string]
cmd << credentials_string scm_cmd(cmd_args) do |io|
info = nil
shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
#root_url = doc.elements["info/entry/repository/root"].text #root_url = doc.elements["info/entry/repository/root"].text
info = Info.new({:root_url => doc['info']['entry']['repository']['root']['__content__'], Info.new({
:root_url => doc['info']['entry']['repository']['root']['__content__'],
:lastrev => Revision.new({ :lastrev => Revision.new({
:identifier => doc['info']['entry']['commit']['revision'], :identifier => doc['info']['entry']['commit']['revision'],
:time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime, :time => Time.parse(doc['info']['entry']['commit']['date']['__content__']).localtime,
:author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "") :author => (doc['info']['entry']['commit']['author'] ? doc['info']['entry']['commit']['author']['__content__'] : "")
}) })
}) })
rescue
end end
end end
return nil if $? && $?.exitstatus != 0
info
rescue CommandFailed
return nil
end
# Returns an Entries collection # Returns an Entries collection
# or nil if the given path doesn't exist in the repository # or nil if the given path doesn't exist in the repository
def entries(path=nil, identifier=nil) def entries(path=nil, identifier=nil)
path ||= '' path ||= ''
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = initialize_identifier(identifier)
entries = Entries.new entries = Entries.new
cmd = "#{self.class.sq_bin} list --xml #{target(path)}@#{identifier}" cmd_args = ['list', '--xml', "#{target(path)}@#{identifier}", credentials_string]
cmd << credentials_string scm_cmd(cmd_args) do |io|
shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
each_xml_element(doc['lists']['list'], 'entry') do |entry| each_xml_element(doc['lists']['list'], 'entry') do |entry|
commit = entry['commit'] commit = entry['commit']
...@@ -117,67 +107,61 @@ module Redmine ...@@ -117,67 +107,61 @@ module Redmine
}) })
}) })
end 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? logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
entries.sort_by_name entries.sort_by_name
end end
end
def properties(path, identifier=nil) def properties(path, identifier=nil)
# proplist xml output supported in svn 1.5.0 and higher # proplist xml output supported in svn 1.5.0 and higher
return nil unless self.class.client_version_above?([1, 5, 0]) return nil unless self.class.client_version_above?([1, 5, 0])
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = initialize_identifier(identifier)
cmd = "#{self.class.sq_bin} proplist --verbose --xml #{target(path)}@#{identifier}" cmd_args = ['proplist', '--verbose', '--xml', "#{target(path)}@#{identifier}", credentials_string]
cmd << credentials_string
properties = {} properties = {}
shellout(cmd) do |io| scm_cmd(cmd_args) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
each_xml_element(doc['properties']['target'], 'property') do |property| each_xml_element(doc['properties']['target'], 'property') do |property|
properties[ property['name'] ] = property['__content__'].to_s properties[ property['name'] ] = property['__content__'].to_s
end end
rescue
end
end
return nil if $? && $?.exitstatus != 0
properties properties
end end
end
def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}) def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
path ||= '' path ||= ''
identifier_from = (identifier_from && identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD" identifier_from = initialize_identifier(identifier_from)
identifier_to = (identifier_to && identifier_to.to_i > 0) ? identifier_to.to_i : 1 identifier_to = initialize_identifier(identifier_to, 1)
cmd_args = ['log', '--xml', '-r', "#{identifier_from}:#{identifier_to}", credentials_string]
cmd_args << " --verbose " if options[:with_paths]
cmd_args << " --limit #{options[:limit].to_i}" if options[:limit]
cmd_args << target(path)
revisions = Revisions.new revisions = Revisions.new
cmd = "#{self.class.sq_bin} log --xml -r #{identifier_from}:#{identifier_to}"
cmd << credentials_string scm_cmd(cmd_args) do |io|
cmd << " --verbose " if options[:with_paths]
cmd << " --limit #{options[:limit].to_i}" if options[:limit]
cmd << ' ' + target(path)
shellout(cmd) do |io|
output = io.read output = io.read
if output.respond_to?(:force_encoding) if output.respond_to?(:force_encoding)
output.force_encoding('UTF-8') output.force_encoding('UTF-8')
end end
begin
doc = ActiveSupport::XmlMini.parse(output) doc = ActiveSupport::XmlMini.parse(output)
each_xml_element(doc['log'], 'logentry') do |logentry| each_xml_element(doc['log'], 'logentry') do |logentry|
paths = [] paths = []
if logentry['paths'] && logentry['paths']['path']
each_xml_element(logentry['paths'], 'path') do |path| each_xml_element(logentry['paths'], 'path') do |path|
paths << {:action => path['action'], paths << {:action => path['action'],
:path => path['__content__'], :path => path['__content__'],
:from_path => path['copyfrom-path'], :from_path => path['copyfrom-path'],
:from_revision => path['copyfrom-rev'] :from_revision => path['copyfrom-rev']
} }
end if logentry['paths'] && logentry['paths']['path'] end
end
paths.sort! { |x,y| x[:path] <=> y[:path] } paths.sort! { |x,y| x[:path] <=> y[:path] }
revisions << Revision.new({:identifier => logentry['revision'], revisions << Revision.new({:identifier => logentry['revision'],
...@@ -187,64 +171,64 @@ module Redmine ...@@ -187,64 +171,64 @@ module Redmine
:paths => paths :paths => paths
}) })
end end
rescue
end
end
return nil if $? && $?.exitstatus != 0
revisions revisions
end end
end
def diff(path, identifier_from, identifier_to=nil, type="inline") def diff(path, identifier_from, identifier_to=nil, type="inline")
path ||= '' 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) identifier_from = initialize_identifier(identifier_from, '')
identifier_to = initialize_identifier(identifier_to, identifier_from.to_i - 1)
cmd = "#{self.class.sq_bin} diff -r " cmd_args = ["diff -r",
cmd << "#{identifier_to}:" "#{identifier_to}:#{identifier_from}",
cmd << "#{identifier_from}" "#{target(path)}@#{identifier_from}",
cmd << " #{target(path)}@#{identifier_from}" credentials_string]
cmd << credentials_string
diff = [] diff = []
shellout(cmd) do |io| scm_cmd(cmd_args) do |io|
io.each_line do |line| io.each_line do |line|
diff << line diff << line
end end
end
return nil if $? && $?.exitstatus != 0
diff diff
end end
end
def cat(path, identifier=nil) def cat(path, identifier=nil)
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = initialize_identifier(identifier)
cmd = "#{self.class.sq_bin} cat #{target(path)}@#{identifier}"
cmd << credentials_string cmd_args = ['cat', "#{target(path)}@#{identifier}", credentials_string]
cat = nil scm_cmd(cmd_args) do |io|
shellout(cmd) do |io|
io.binmode io.binmode
cat = io.read io.read
end end
return nil if $? && $?.exitstatus != 0 end
cat
def save_entry_in_file(f, path, identifier)
identifier = initialize_identifier(identifier)
cmd_args = ['cat', "#{target(path)}@#{identifier}", credentials_string]
scm_cmd(cmd_args, f.path)
end end
def annotate(path, identifier=nil) def annotate(path, identifier=nil)
identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD" identifier = initialize_identifier(identifier)
cmd = "#{self.class.sq_bin} blame #{target(path)}@#{identifier}" cmd_args = ['blame', "#{target(path)}@#{identifier}", credentials_string]
cmd << credentials_string
blame = Annotate.new blame = Annotate.new
shellout(cmd) do |io| scm_cmd(cmd_args) do |io|
io.each_line do |line| io.each_line do |line|
next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$} next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip)) blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
end end
end
return nil if $? && $?.exitstatus != 0
blame blame
end end
end
private private
def initialize_identifier(identifier, default="HEAD")
(identifier && identifier.to_i > 0) ? identifier.to_i : default
end
def credentials_string def credentials_string
str = '' str = ''
str << " --username #{shell_quote(@login)}" unless @login.blank? str << " --username #{shell_quote(@login)}" unless @login.blank?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment