summaryrefslogtreecommitdiffstats
path: root/lib/redmine
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-11-30 15:49:36 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2020-11-30 15:49:36 +0000
commit3788d6365c0f9a044fd6b5b7414600027b5a891e (patch)
tree3416d0f411b18754453e415e71ce5bce4538c011 /lib/redmine
parent974077363d611035c59843b223696bfc322e0e89 (diff)
downloadredmine-3788d6365c0f9a044fd6b5b7414600027b5a891e.tar.gz
redmine-3788d6365c0f9a044fd6b5b7414600027b5a891e.zip
add empty line after guard clause to lib/redmine/scm/adapters/cvs_adapter.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@20530 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
-rw-r--r--lib/redmine/scm/adapters/cvs_adapter.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 8d6ec8abe..9c8272d7a 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -67,6 +67,7 @@ module Redmine
@url = url
# TODO: better Exception here (IllegalArgumentException)
raise CommandFailed if root_url.blank?
+
@root_url = root_url
# These are unused.
@@ -313,6 +314,7 @@ module Redmine
scm_cmd(*cmd_args) do |io|
io.each_line do |line|
next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
+
blame.add_line(
$3.rstrip,
Revision.new(
@@ -340,6 +342,7 @@ module Redmine
# convert a date/time into the CVS-format
def time_to_cvstime(time)
return nil if time.nil?
+
time = Time.now if (time.is_a?(String) && time == 'HEAD')
unless time.is_a?(Time)
time = Time.parse(time)
@@ -349,6 +352,7 @@ module Redmine
def time_to_cvstime_rlog(time)
return nil if time.nil?
+
t1 = time.clone.localtime
return t1.strftime("%Y-%m-%d %H:%M:%S")
end
@@ -389,6 +393,7 @@ module Redmine
if $? && $?.exitstatus != 0
raise ScmCommandAborted, "cvs exited with non-zero status: #{$?.exitstatus}"
end
+
ret
end
private :scm_cmd
@@ -406,6 +411,7 @@ module Redmine
if isBranchRevision
return @base+"."+@branchid
end
+
return @base
end
@@ -417,6 +423,7 @@ module Redmine
unless @revision == 0
return buildRevision( @revision - 1 )
end
+
return buildRevision( @revision )
end