comparison lib/redmine/scm/adapters/git_adapter.rb @ 1464:261b3d9a4903 redmine-2.4

Update to Redmine 2.4 branch rev 12663
author Chris Cannam
date Tue, 14 Jan 2014 14:37:42 +0000
parents 433d4f72a19b
children 51364c0cd58f e248c7af89ec
comparison
equal deleted inserted replaced
1296:038ba2d95de8 1464:261b3d9a4903
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
331 nil 331 nil
332 end 332 end
333 333
334 def annotate(path, identifier=nil) 334 def annotate(path, identifier=nil)
335 identifier = 'HEAD' if identifier.blank? 335 identifier = 'HEAD' if identifier.blank?
336 cmd_args = %w|blame| 336 cmd_args = %w|blame --encoding=UTF-8|
337 cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path) 337 cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path)
338 blame = Annotate.new 338 blame = Annotate.new
339 content = nil 339 content = nil
340 git_cmd(cmd_args) { |io| io.binmode; content = io.read } 340 git_cmd(cmd_args) { |io| io.binmode; content = io.read }
341 # git annotates binary files 341 # git annotates binary files