kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: cvs: use scm_cmd() in annotate of adapter.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5412 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-04-11 15:45:20 +00:00
parent 9df194ff16
commit e9a33eff14
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/redmine/scm/adapters/cvs_adapter.rb
View File

@ -308,12 +308,14 @@ module Redmine
end end
def annotate(path, identifier=nil) def annotate(path, identifier=nil)
identifier = (identifier) ? identifier.to_i : "HEAD" identifier = (identifier) ? identifier : "HEAD"
logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}" logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
path_with_project="#{url}#{with_leading_slash(path)}" path_with_project="#{url}#{with_leading_slash(path)}"
cmd = "#{self.class.sq_bin} -d #{shell_quote root_url} rannotate -r#{identifier} #{shell_quote path_with_project}" cmd_args = %w|rannotate|
cmd_args << "-D" << "#{time_to_cvstime(identifier)}" if identifier
cmd_args << path_with_project
blame = Annotate.new blame = Annotate.new
shellout(cmd) do |io| scm_cmd(*cmd_args) do |io|
io.each_line do |line| io.each_line do |line|
next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$} next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
blame.add_line( blame.add_line(
@ -325,8 +327,9 @@ module Redmine
)) ))
end end
end end
return nil if $? && $?.exitstatus != 0
blame blame
rescue ScmCommandAborted
Annotate.new
end end
private private