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

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
107f92ab · Toshi MARUYAMA · Eric Davis · efa1d583 · 107f92ab
Commit 107f92ab authored Mar 08, 2011 by Toshi MARUYAMA Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

git_adapter.rb lib/redmine/scm/adapters/git_adapter.rb +9 -5

No files found.
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -274,14 +274,14 @@ module Redmine
        rescue ScmCommandAborted
          nil
        end
        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 }
+          scm_cmd(*cmd_args) { |io| io.binmode; content = io.read }
-          return nil if $? && $?.exitstatus != 0
          # 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)