meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-21 16:01:14 +00:00
Code Issues Releases Wiki Activity

add empty lines after guard clause to lib/redmine/scm/adapters/bazaar_adapter.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19873 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-07-09 15:18:31 +00:00
parent 15584c9071
commit 2f23b63a21
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,7 @@ module Redmine
re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$} re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$}
io.each_line do |line| io.each_line do |line|
next unless line =~ re next unless line =~ re
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({:name => name, entries << Entry.new({:name => name,
@ -138,6 +139,7 @@ module Redmine
parsing = nil parsing = nil
else else
next unless revision next unless revision
if line =~ /^revno: (\d+)($|\s\[merge\]$)/ if line =~ /^revno: (\d+)($|\s\[merge\]$)/
revision.identifier = $1.to_i revision.identifier = $1.to_i
elsif line =~ /^committer: (.+)$/ elsif line =~ /^committer: (.+)$/
@ -233,6 +235,7 @@ module Redmine
identifier = nil identifier = nil
io.each_line do |line| io.each_line do |line|
next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$} next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
rev = $1 rev = $1
blame.add_line($3.rstrip, blame.add_line($3.rstrip,
Revision.new( Revision.new(
@ -249,6 +252,7 @@ module Redmine
def self.branch_conf_path(path) def self.branch_conf_path(path)
return if path.nil? return if path.nil?
m = path.match(%r{^(.*[/\\])\.bzr.*$}) m = path.match(%r{^(.*[/\\])\.bzr.*$})
bcp = (m ? m[1] : path).gsub(%r{[\/\\]$}, "") bcp = (m ? m[1] : path).gsub(%r{[\/\\]$}, "")
File.join(bcp, ".bzr", "branch", "branch.conf") File.join(bcp, ".bzr", "branch", "branch.conf")
@ -256,6 +260,7 @@ module Redmine
def append_revisions_only def append_revisions_only
return @aro unless @aro.nil? return @aro unless @aro.nil?
@aro = false @aro = false
bcp = self.class.branch_conf_path(url) bcp = self.class.branch_conf_path(url)
if bcp && File.exist?(bcp) if bcp && File.exist?(bcp)
@ -301,6 +306,7 @@ module Redmine
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
ret ret
end end
private :scm_cmd private :scm_cmd