summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm/adapters
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-11 08:34:18 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-11 08:34:18 +0000
commita6798d6cc2232f116c2c007fa5c7f9239b9b646c (patch)
tree90915e6993eb48489f49eef1d11f8c47240b1f14 /lib/redmine/scm/adapters
parent4491f714417b089d67bb40ced787d8e09e91bf5a (diff)
downloadredmine-a6798d6cc2232f116c2c007fa5c7f9239b9b646c.tar.gz
redmine-a6798d6cc2232f116c2c007fa5c7f9239b9b646c.zip
scm: cvs: set identifier nil in blame.
Redmine can not handle cvs revision (e.g. 1.2) as changeset identifier. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5401 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters')
-rw-r--r--lib/redmine/scm/adapters/cvs_adapter.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 0918b2861..00119c839 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -316,7 +316,13 @@ module Redmine
shellout(cmd) do |io|
io.each_line do |line|
next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
- blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
+ blame.add_line(
+ $3.rstrip,
+ Revision.new(
+ :revision => $1,
+ :identifier => nil,
+ :author => $2.strip
+ ))
end
end
return nil if $? && $?.exitstatus != 0