| @@ -199,12 +199,12 module Redmine | |||
|
|
199 | 199 | end |
|
|
200 | 200 | |
|
|
201 | 201 | def annotate(path, identifier=nil) |
|
|
202 | cmd = "#{self.class.sq_bin} annotate --all" | |
|
|
203 | cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0 | |
|
|
204 | cmd << " #{target(path)}" | |
|
|
205 | 202 | blame = Annotate.new |
|
|
206 | shellout(cmd) do |io| | |
|
|
207 | author = nil | |
|
|
203 | cmd_args = %w|annotate --all| | |
|
|
204 | cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0 | |
|
|
205 | cmd_args << bzr_target(path) | |
|
|
206 | scm_cmd(*cmd_args) do |io| | |
|
|
207 | author = nil | |
|
|
208 | 208 | identifier = nil |
|
|
209 | 209 | io.each_line do |line| |
|
|
210 | 210 | next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$} |
| @@ -217,8 +217,9 module Redmine | |||
|
|
217 | 217 | )) |
|
|
218 | 218 | end |
|
|
219 | 219 | end |
|
|
220 | return nil if $? && $?.exitstatus != 0 | |
|
|
221 | 220 | blame |
|
|
221 | rescue ScmCommandAborted | |
|
|
222 | return nil | |
|
|
222 | 223 | end |
|
|
223 | 224 | |
|
|
224 | 225 | def self.branch_conf_path(path) |
General Comments 0
You need to be logged in to leave comments.
Login now