annotate .svn/pristine/a1/a10004c586b008b5d6a646ee54831265d7e69cc1.svn-base @ 1327:287f201c2802 redmine-2.2-integration

Add italic
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Wed, 19 Jun 2013 20:56:22 +0100
parents 038ba2d95de8
children
rev   line source
Chris@1296 1 # Redmine - project management software
Chris@1296 2 # Copyright (C) 2006-2012 Jean-Philippe Lang
Chris@1296 3 #
Chris@1296 4 # This program is free software; you can redistribute it and/or
Chris@1296 5 # modify it under the terms of the GNU General Public License
Chris@1296 6 # as published by the Free Software Foundation; either version 2
Chris@1296 7 # of the License, or (at your option) any later version.
Chris@1296 8 #
Chris@1296 9 # This program is distributed in the hope that it will be useful,
Chris@1296 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1296 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1296 12 # GNU General Public License for more details.
Chris@1296 13 #
Chris@1296 14 # You should have received a copy of the GNU General Public License
Chris@1296 15 # along with this program; if not, write to the Free Software
Chris@1296 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1296 17
Chris@1296 18 require 'redmine/scm/adapters/abstract_adapter'
Chris@1296 19
Chris@1296 20 module Redmine
Chris@1296 21 module Scm
Chris@1296 22 module Adapters
Chris@1296 23 class GitAdapter < AbstractAdapter
Chris@1296 24
Chris@1296 25 # Git executable name
Chris@1296 26 GIT_BIN = Redmine::Configuration['scm_git_command'] || "git"
Chris@1296 27
Chris@1296 28 class GitBranch < Branch
Chris@1296 29 attr_accessor :is_default
Chris@1296 30 end
Chris@1296 31
Chris@1296 32 class << self
Chris@1296 33 def client_command
Chris@1296 34 @@bin ||= GIT_BIN
Chris@1296 35 end
Chris@1296 36
Chris@1296 37 def sq_bin
Chris@1296 38 @@sq_bin ||= shell_quote_command
Chris@1296 39 end
Chris@1296 40
Chris@1296 41 def client_version
Chris@1296 42 @@client_version ||= (scm_command_version || [])
Chris@1296 43 end
Chris@1296 44
Chris@1296 45 def client_available
Chris@1296 46 !client_version.empty?
Chris@1296 47 end
Chris@1296 48
Chris@1296 49 def scm_command_version
Chris@1296 50 scm_version = scm_version_from_command_line.dup
Chris@1296 51 if scm_version.respond_to?(:force_encoding)
Chris@1296 52 scm_version.force_encoding('ASCII-8BIT')
Chris@1296 53 end
Chris@1296 54 if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
Chris@1296 55 m[2].scan(%r{\d+}).collect(&:to_i)
Chris@1296 56 end
Chris@1296 57 end
Chris@1296 58
Chris@1296 59 def scm_version_from_command_line
Chris@1296 60 shellout("#{sq_bin} --version --no-color") { |io| io.read }.to_s
Chris@1296 61 end
Chris@1296 62 end
Chris@1296 63
Chris@1296 64 def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
Chris@1296 65 super
Chris@1296 66 @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
Chris@1296 67 end
Chris@1296 68
Chris@1296 69 def path_encoding
Chris@1296 70 @path_encoding
Chris@1296 71 end
Chris@1296 72
Chris@1296 73 def info
Chris@1296 74 begin
Chris@1296 75 Info.new(:root_url => url, :lastrev => lastrev('',nil))
Chris@1296 76 rescue
Chris@1296 77 nil
Chris@1296 78 end
Chris@1296 79 end
Chris@1296 80
Chris@1296 81 def branches
Chris@1296 82 return @branches if @branches
Chris@1296 83 @branches = []
Chris@1296 84 cmd_args = %w|branch --no-color --verbose --no-abbrev|
Chris@1296 85 git_cmd(cmd_args) do |io|
Chris@1296 86 io.each_line do |line|
Chris@1296 87 branch_rev = line.match('\s*(\*?)\s*(.*?)\s*([0-9a-f]{40}).*$')
Chris@1296 88 bran = GitBranch.new(branch_rev[2])
Chris@1296 89 bran.revision = branch_rev[3]
Chris@1296 90 bran.scmid = branch_rev[3]
Chris@1296 91 bran.is_default = ( branch_rev[1] == '*' )
Chris@1296 92 @branches << bran
Chris@1296 93 end
Chris@1296 94 end
Chris@1296 95 @branches.sort!
Chris@1296 96 rescue ScmCommandAborted
Chris@1296 97 nil
Chris@1296 98 end
Chris@1296 99
Chris@1296 100 def tags
Chris@1296 101 return @tags if @tags
Chris@1296 102 cmd_args = %w|tag|
Chris@1296 103 git_cmd(cmd_args) do |io|
Chris@1296 104 @tags = io.readlines.sort!.map{|t| t.strip}
Chris@1296 105 end
Chris@1296 106 rescue ScmCommandAborted
Chris@1296 107 nil
Chris@1296 108 end
Chris@1296 109
Chris@1296 110 def default_branch
Chris@1296 111 bras = self.branches
Chris@1296 112 return nil if bras.nil?
Chris@1296 113 default_bras = bras.select{|x| x.is_default == true}
Chris@1296 114 return default_bras.first.to_s if ! default_bras.empty?
Chris@1296 115 master_bras = bras.select{|x| x.to_s == 'master'}
Chris@1296 116 master_bras.empty? ? bras.first.to_s : 'master'
Chris@1296 117 end
Chris@1296 118
Chris@1296 119 def entry(path=nil, identifier=nil)
Chris@1296 120 parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
Chris@1296 121 search_path = parts[0..-2].join('/')
Chris@1296 122 search_name = parts[-1]
Chris@1296 123 if search_path.blank? && search_name.blank?
Chris@1296 124 # Root entry
Chris@1296 125 Entry.new(:path => '', :kind => 'dir')
Chris@1296 126 else
Chris@1296 127 # Search for the entry in the parent directory
Chris@1296 128 es = entries(search_path, identifier,
Chris@1296 129 options = {:report_last_commit => false})
Chris@1296 130 es ? es.detect {|e| e.name == search_name} : nil
Chris@1296 131 end
Chris@1296 132 end
Chris@1296 133
Chris@1296 134 def entries(path=nil, identifier=nil, options={})
Chris@1296 135 path ||= ''
Chris@1296 136 p = scm_iconv(@path_encoding, 'UTF-8', path)
Chris@1296 137 entries = Entries.new
Chris@1296 138 cmd_args = %w|ls-tree -l|
Chris@1296 139 cmd_args << "HEAD:#{p}" if identifier.nil?
Chris@1296 140 cmd_args << "#{identifier}:#{p}" if identifier
Chris@1296 141 git_cmd(cmd_args) do |io|
Chris@1296 142 io.each_line do |line|
Chris@1296 143 e = line.chomp.to_s
Chris@1296 144 if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\t(.+)$/
Chris@1296 145 type = $1
Chris@1296 146 sha = $2
Chris@1296 147 size = $3
Chris@1296 148 name = $4
Chris@1296 149 if name.respond_to?(:force_encoding)
Chris@1296 150 name.force_encoding(@path_encoding)
Chris@1296 151 end
Chris@1296 152 full_path = p.empty? ? name : "#{p}/#{name}"
Chris@1296 153 n = scm_iconv('UTF-8', @path_encoding, name)
Chris@1296 154 full_p = scm_iconv('UTF-8', @path_encoding, full_path)
Chris@1296 155 entries << Entry.new({:name => n,
Chris@1296 156 :path => full_p,
Chris@1296 157 :kind => (type == "tree") ? 'dir' : 'file',
Chris@1296 158 :size => (type == "tree") ? nil : size,
Chris@1296 159 :lastrev => options[:report_last_commit] ?
Chris@1296 160 lastrev(full_path, identifier) : Revision.new
Chris@1296 161 }) unless entries.detect{|entry| entry.name == name}
Chris@1296 162 end
Chris@1296 163 end
Chris@1296 164 end
Chris@1296 165 entries.sort_by_name
Chris@1296 166 rescue ScmCommandAborted
Chris@1296 167 nil
Chris@1296 168 end
Chris@1296 169
Chris@1296 170 def lastrev(path, rev)
Chris@1296 171 return nil if path.nil?
Chris@1296 172 cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1|
Chris@1296 173 cmd_args << rev if rev
Chris@1296 174 cmd_args << "--" << path unless path.empty?
Chris@1296 175 lines = []
Chris@1296 176 git_cmd(cmd_args) { |io| lines = io.readlines }
Chris@1296 177 begin
Chris@1296 178 id = lines[0].split[1]
Chris@1296 179 author = lines[1].match('Author:\s+(.*)$')[1]
Chris@1296 180 time = Time.parse(lines[4].match('CommitDate:\s+(.*)$')[1])
Chris@1296 181
Chris@1296 182 Revision.new({
Chris@1296 183 :identifier => id,
Chris@1296 184 :scmid => id,
Chris@1296 185 :author => author,
Chris@1296 186 :time => time,
Chris@1296 187 :message => nil,
Chris@1296 188 :paths => nil
Chris@1296 189 })
Chris@1296 190 rescue NoMethodError => e
Chris@1296 191 logger.error("The revision '#{path}' has a wrong format")
Chris@1296 192 return nil
Chris@1296 193 end
Chris@1296 194 rescue ScmCommandAborted
Chris@1296 195 nil
Chris@1296 196 end
Chris@1296 197
Chris@1296 198 def revisions(path, identifier_from, identifier_to, options={})
Chris@1296 199 revs = Revisions.new
Chris@1296 200 cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller --parents --stdin|
Chris@1296 201 cmd_args << "--reverse" if options[:reverse]
Chris@1296 202 cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
Chris@1296 203 cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
Chris@1296 204 revisions = []
Chris@1296 205 if identifier_from || identifier_to
Chris@1296 206 revisions << ""
Chris@1296 207 revisions[0] << "#{identifier_from}.." if identifier_from
Chris@1296 208 revisions[0] << "#{identifier_to}" if identifier_to
Chris@1296 209 else
Chris@1296 210 unless options[:includes].blank?
Chris@1296 211 revisions += options[:includes]
Chris@1296 212 end
Chris@1296 213 unless options[:excludes].blank?
Chris@1296 214 revisions += options[:excludes].map{|r| "^#{r}"}
Chris@1296 215 end
Chris@1296 216 end
Chris@1296 217
Chris@1296 218 git_cmd(cmd_args, {:write_stdin => true}) do |io|
Chris@1296 219 io.binmode
Chris@1296 220 io.puts(revisions.join("\n"))
Chris@1296 221 io.close_write
Chris@1296 222 files=[]
Chris@1296 223 changeset = {}
Chris@1296 224 parsing_descr = 0 #0: not parsing desc or files, 1: parsing desc, 2: parsing files
Chris@1296 225
Chris@1296 226 io.each_line do |line|
Chris@1296 227 if line =~ /^commit ([0-9a-f]{40})(( [0-9a-f]{40})*)$/
Chris@1296 228 key = "commit"
Chris@1296 229 value = $1
Chris@1296 230 parents_str = $2
Chris@1296 231 if (parsing_descr == 1 || parsing_descr == 2)
Chris@1296 232 parsing_descr = 0
Chris@1296 233 revision = Revision.new({
Chris@1296 234 :identifier => changeset[:commit],
Chris@1296 235 :scmid => changeset[:commit],
Chris@1296 236 :author => changeset[:author],
Chris@1296 237 :time => Time.parse(changeset[:date]),
Chris@1296 238 :message => changeset[:description],
Chris@1296 239 :paths => files,
Chris@1296 240 :parents => changeset[:parents]
Chris@1296 241 })
Chris@1296 242 if block_given?
Chris@1296 243 yield revision
Chris@1296 244 else
Chris@1296 245 revs << revision
Chris@1296 246 end
Chris@1296 247 changeset = {}
Chris@1296 248 files = []
Chris@1296 249 end
Chris@1296 250 changeset[:commit] = $1
Chris@1296 251 unless parents_str.nil? or parents_str == ""
Chris@1296 252 changeset[:parents] = parents_str.strip.split(' ')
Chris@1296 253 end
Chris@1296 254 elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
Chris@1296 255 key = $1
Chris@1296 256 value = $2
Chris@1296 257 if key == "Author"
Chris@1296 258 changeset[:author] = value
Chris@1296 259 elsif key == "CommitDate"
Chris@1296 260 changeset[:date] = value
Chris@1296 261 end
Chris@1296 262 elsif (parsing_descr == 0) && line.chomp.to_s == ""
Chris@1296 263 parsing_descr = 1
Chris@1296 264 changeset[:description] = ""
Chris@1296 265 elsif (parsing_descr == 1 || parsing_descr == 2) \
Chris@1296 266 && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\t(.+)$/
Chris@1296 267 parsing_descr = 2
Chris@1296 268 fileaction = $1
Chris@1296 269 filepath = $2
Chris@1296 270 p = scm_iconv('UTF-8', @path_encoding, filepath)
Chris@1296 271 files << {:action => fileaction, :path => p}
Chris@1296 272 elsif (parsing_descr == 1 || parsing_descr == 2) \
Chris@1296 273 && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\d+\s+(\S+)\t(.+)$/
Chris@1296 274 parsing_descr = 2
Chris@1296 275 fileaction = $1
Chris@1296 276 filepath = $3
Chris@1296 277 p = scm_iconv('UTF-8', @path_encoding, filepath)
Chris@1296 278 files << {:action => fileaction, :path => p}
Chris@1296 279 elsif (parsing_descr == 1) && line.chomp.to_s == ""
Chris@1296 280 parsing_descr = 2
Chris@1296 281 elsif (parsing_descr == 1)
Chris@1296 282 changeset[:description] << line[4..-1]
Chris@1296 283 end
Chris@1296 284 end
Chris@1296 285
Chris@1296 286 if changeset[:commit]
Chris@1296 287 revision = Revision.new({
Chris@1296 288 :identifier => changeset[:commit],
Chris@1296 289 :scmid => changeset[:commit],
Chris@1296 290 :author => changeset[:author],
Chris@1296 291 :time => Time.parse(changeset[:date]),
Chris@1296 292 :message => changeset[:description],
Chris@1296 293 :paths => files,
Chris@1296 294 :parents => changeset[:parents]
Chris@1296 295 })
Chris@1296 296 if block_given?
Chris@1296 297 yield revision
Chris@1296 298 else
Chris@1296 299 revs << revision
Chris@1296 300 end
Chris@1296 301 end
Chris@1296 302 end
Chris@1296 303 revs
Chris@1296 304 rescue ScmCommandAborted => e
Chris@1296 305 err_msg = "git log error: #{e.message}"
Chris@1296 306 logger.error(err_msg)
Chris@1296 307 if block_given?
Chris@1296 308 raise CommandFailed, err_msg
Chris@1296 309 else
Chris@1296 310 revs
Chris@1296 311 end
Chris@1296 312 end
Chris@1296 313
Chris@1296 314 def diff(path, identifier_from, identifier_to=nil)
Chris@1296 315 path ||= ''
Chris@1296 316 cmd_args = []
Chris@1296 317 if identifier_to
Chris@1296 318 cmd_args << "diff" << "--no-color" << identifier_to << identifier_from
Chris@1296 319 else
Chris@1296 320 cmd_args << "show" << "--no-color" << identifier_from
Chris@1296 321 end
Chris@1296 322 cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty?
Chris@1296 323 diff = []
Chris@1296 324 git_cmd(cmd_args) do |io|
Chris@1296 325 io.each_line do |line|
Chris@1296 326 diff << line
Chris@1296 327 end
Chris@1296 328 end
Chris@1296 329 diff
Chris@1296 330 rescue ScmCommandAborted
Chris@1296 331 nil
Chris@1296 332 end
Chris@1296 333
Chris@1296 334 def annotate(path, identifier=nil)
Chris@1296 335 identifier = 'HEAD' if identifier.blank?
Chris@1296 336 cmd_args = %w|blame|
Chris@1296 337 cmd_args << "-p" << identifier << "--" << scm_iconv(@path_encoding, 'UTF-8', path)
Chris@1296 338 blame = Annotate.new
Chris@1296 339 content = nil
Chris@1296 340 git_cmd(cmd_args) { |io| io.binmode; content = io.read }
Chris@1296 341 # git annotates binary files
Chris@1296 342 return nil if content.is_binary_data?
Chris@1296 343 identifier = ''
Chris@1296 344 # git shows commit author on the first occurrence only
Chris@1296 345 authors_by_commit = {}
Chris@1296 346 content.split("\n").each do |line|
Chris@1296 347 if line =~ /^([0-9a-f]{39,40})\s.*/
Chris@1296 348 identifier = $1
Chris@1296 349 elsif line =~ /^author (.+)/
Chris@1296 350 authors_by_commit[identifier] = $1.strip
Chris@1296 351 elsif line =~ /^\t(.*)/
Chris@1296 352 blame.add_line($1, Revision.new(
Chris@1296 353 :identifier => identifier,
Chris@1296 354 :revision => identifier,
Chris@1296 355 :scmid => identifier,
Chris@1296 356 :author => authors_by_commit[identifier]
Chris@1296 357 ))
Chris@1296 358 identifier = ''
Chris@1296 359 author = ''
Chris@1296 360 end
Chris@1296 361 end
Chris@1296 362 blame
Chris@1296 363 rescue ScmCommandAborted
Chris@1296 364 nil
Chris@1296 365 end
Chris@1296 366
Chris@1296 367 def cat(path, identifier=nil)
Chris@1296 368 if identifier.nil?
Chris@1296 369 identifier = 'HEAD'
Chris@1296 370 end
Chris@1296 371 cmd_args = %w|show --no-color|
Chris@1296 372 cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}"
Chris@1296 373 cat = nil
Chris@1296 374 git_cmd(cmd_args) do |io|
Chris@1296 375 io.binmode
Chris@1296 376 cat = io.read
Chris@1296 377 end
Chris@1296 378 cat
Chris@1296 379 rescue ScmCommandAborted
Chris@1296 380 nil
Chris@1296 381 end
Chris@1296 382
Chris@1296 383 class Revision < Redmine::Scm::Adapters::Revision
Chris@1296 384 # Returns the readable identifier
Chris@1296 385 def format_identifier
Chris@1296 386 identifier[0,8]
Chris@1296 387 end
Chris@1296 388 end
Chris@1296 389
Chris@1296 390 def git_cmd(args, options = {}, &block)
Chris@1296 391 repo_path = root_url || url
Chris@1296 392 full_args = ['--git-dir', repo_path]
Chris@1296 393 if self.class.client_version_above?([1, 7, 2])
Chris@1296 394 full_args << '-c' << 'core.quotepath=false'
Chris@1296 395 full_args << '-c' << 'log.decorate=no'
Chris@1296 396 end
Chris@1296 397 full_args += args
Chris@1296 398 ret = shellout(
Chris@1296 399 self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '),
Chris@1296 400 options,
Chris@1296 401 &block
Chris@1296 402 )
Chris@1296 403 if $? && $?.exitstatus != 0
Chris@1296 404 raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"
Chris@1296 405 end
Chris@1296 406 ret
Chris@1296 407 end
Chris@1296 408 private :git_cmd
Chris@1296 409 end
Chris@1296 410 end
Chris@1296 411 end
Chris@1296 412 end