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

add empty line after guard clause to MercurialAdapter

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19926 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-07-21 13:40:28 +00:00
parent 7f5463b24a
commit 3407550ab0
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/redmine/scm/adapters/mercurial_adapter.rb
View File

@ -131,6 +131,7 @@ module Redmine
def summary def summary
return @summary if @summary return @summary if @summary
hg 'rhsummary' do |io| hg 'rhsummary' do |io|
output = io.read.force_encoding('UTF-8') output = io.read.force_encoding('UTF-8')
begin begin
@ -283,6 +284,7 @@ module Redmine
hg 'rhannotate', '-ncu', "-r#{CGI.escape(hgrev(identifier))}", '--', hgtarget(p) do |io| hg 'rhannotate', '-ncu', "-r#{CGI.escape(hgrev(identifier))}", '--', hgtarget(p) do |io|
io.each_line do |line| io.each_line do |line|
next unless line.b =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$} next unless line.b =~ %r{^([^:]+)\s(\d+)\s([0-9a-f]+):\s(.*)$}
r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3, r = Revision.new(:author => $1.strip, :revision => $2, :scmid => $3,
:identifier => $3) :identifier => $3)
blame.add_line($4.rstrip, r) blame.add_line($4.rstrip, r)
@ -329,6 +331,7 @@ module Redmine
if $? && $?.exitstatus != 0 if $? && $?.exitstatus != 0
raise HgCommandAborted, "hg exited with non-zero status: #{$?.exitstatus}" raise HgCommandAborted, "hg exited with non-zero status: #{$?.exitstatus}"
end end
ret ret
end end
private :hg private :hg
@ -349,6 +352,7 @@ module Redmine
def as_ary(o) def as_ary(o)
return [] unless o return [] unless o
o.is_a?(Array) ? o : Array[o] o.is_a?(Array) ? o : Array[o]
end end
private :as_ary private :as_ary