scm: git: support path encoding in adapter blame (#5251).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5041 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
c4b84ec510
commit
c809c0c498
|
@ -277,11 +277,11 @@ module Redmine
|
|||
|
||||
def annotate(path, identifier=nil)
|
||||
identifier = 'HEAD' if identifier.blank?
|
||||
cmd = "#{self.class.sq_bin} --git-dir #{target('')} blame -p #{shell_quote identifier} -- #{shell_quote path}"
|
||||
cmd_args = %w|blame|
|
||||
cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path)
|
||||
blame = Annotate.new
|
||||
content = nil
|
||||
shellout(cmd) { |io| io.binmode; content = io.read }
|
||||
return nil if $? && $?.exitstatus != 0
|
||||
scm_cmd(*cmd_args) { |io| io.binmode; content = io.read }
|
||||
# git annotates binary files
|
||||
return nil if content.is_binary_data?
|
||||
identifier = ''
|
||||
|
@ -293,12 +293,16 @@ module Redmine
|
|||
elsif line =~ /^author (.+)/
|
||||
authors_by_commit[identifier] = $1.strip
|
||||
elsif line =~ /^\t(.*)/
|
||||
blame.add_line($1, Revision.new(:identifier => identifier, :author => authors_by_commit[identifier]))
|
||||
blame.add_line($1, Revision.new(
|
||||
:identifier => identifier,
|
||||
:author => authors_by_commit[identifier]))
|
||||
identifier = ''
|
||||
author = ''
|
||||
end
|
||||
end
|
||||
blame
|
||||
rescue ScmCommandAborted
|
||||
nil
|
||||
end
|
||||
|
||||
def cat(path, identifier=nil)
|
||||
|
|
Loading…
Reference in New Issue