Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-12-16 05:20:28 +01:00
Code Issues Packages Projects Releases Activity

fix source indent of lib/redmine/scm/adapters/bazaar_adapter.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20193 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-10-26 13:34:44 +00:00
parent decd5366b5
commit 544fe70b5f
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
lib/redmine/scm/adapters/bazaar_adapter.rb
View File

@@ -73,13 +73,14 @@ module Redmine
info = nil info = nil
scm_cmd(*cmd_args) do |io| scm_cmd(*cmd_args) do |io|
if io.read =~ %r{^(\d+)\r?$} if io.read =~ %r{^(\d+)\r?$}
info = Info.new( info =
{ Info.new(
:root_url => url, {
:lastrev => :root_url => url,
Revision.new({:identifier => $1}) :lastrev =>
} Revision.new({:identifier => $1})
) }
)
end end
end end
info info
@@ -106,15 +107,16 @@ module Redmine
name_locale, slash, revision = $3.strip, $4, $5.strip name_locale, slash, revision = $3.strip, $4, $5.strip
name = scm_iconv('UTF-8', @path_encoding, name_locale) name = scm_iconv('UTF-8', @path_encoding, name_locale)
entries << Entry.new( entries <<
{ Entry.new(
:name => name, {
:path => ((path.empty? ? "" : "#{path}/") + name), :name => name,
:kind => (slash.blank? ? 'file' : 'dir'), :path => ((path.empty? ? "" : "#{path}/") + name),
:size => nil, :kind => (slash.blank? ? 'file' : 'dir'),
:lastrev => Revision.new(:revision => revision) :size => nil,
} :lastrev => Revision.new(:revision => revision)
) }
)
end end
end end
if logger && logger.debug? if logger && logger.debug?
@@ -305,11 +307,12 @@ module Redmine
full_args.map do |e| full_args.map do |e|
full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e) full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
end end
ret = shellout( ret =
self.class.sq_bin + ' ' + shellout(
full_args_locale.map {|e| shell_quote e.to_s}.join(' '), self.class.sq_bin + ' ' +
&block full_args_locale.map {|e| shell_quote e.to_s}.join(' '),
) &block
)
if $? && $?.exitstatus != 0 if $? && $?.exitstatus != 0
raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}" raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}"
end end
@@ -325,11 +328,12 @@ module Redmine
full_args.map do |e| full_args.map do |e|
full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e) full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
end end
ret = shellout( ret =
self.class.sq_bin + ' ' + shellout(
full_args_locale.map {|e| shell_quote e.to_s}.join(' '), self.class.sq_bin + ' ' +
&block full_args_locale.map {|e| shell_quote e.to_s}.join(' '),
) &block
)
ret ret
end end
private :scm_cmd_no_raise private :scm_cmd_no_raise