annotate .svn/pristine/fb/fb006bff613cd3967737c6ae62ce3ae28c040bbd.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents 261b3d9a4903
children
rev   line source
Chris@1464 1 # redMine - project management software
Chris@1464 2 # Copyright (C) 2006-2007 Jean-Philippe Lang
Chris@1464 3 #
Chris@1464 4 # This program is free software; you can redistribute it and/or
Chris@1464 5 # modify it under the terms of the GNU General Public License
Chris@1464 6 # as published by the Free Software Foundation; either version 2
Chris@1464 7 # of the License, or (at your option) any later version.
Chris@1464 8 #
Chris@1464 9 # This program is distributed in the hope that it will be useful,
Chris@1464 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1464 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1464 12 # GNU General Public License for more details.
Chris@1464 13 #
Chris@1464 14 # You should have received a copy of the GNU General Public License
Chris@1464 15 # along with this program; if not, write to the Free Software
Chris@1464 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1464 17
Chris@1464 18 require 'redmine/scm/adapters/abstract_adapter'
Chris@1464 19
Chris@1464 20 module Redmine
Chris@1464 21 module Scm
Chris@1464 22 module Adapters
Chris@1464 23 class CvsAdapter < AbstractAdapter
Chris@1464 24
Chris@1464 25 # CVS executable name
Chris@1464 26 CVS_BIN = Redmine::Configuration['scm_cvs_command'] || "cvs"
Chris@1464 27
Chris@1464 28 class << self
Chris@1464 29 def client_command
Chris@1464 30 @@bin ||= CVS_BIN
Chris@1464 31 end
Chris@1464 32
Chris@1464 33 def sq_bin
Chris@1464 34 @@sq_bin ||= shell_quote_command
Chris@1464 35 end
Chris@1464 36
Chris@1464 37 def client_version
Chris@1464 38 @@client_version ||= (scm_command_version || [])
Chris@1464 39 end
Chris@1464 40
Chris@1464 41 def client_available
Chris@1464 42 client_version_above?([1, 12])
Chris@1464 43 end
Chris@1464 44
Chris@1464 45 def scm_command_version
Chris@1464 46 scm_version = scm_version_from_command_line.dup
Chris@1464 47 if scm_version.respond_to?(:force_encoding)
Chris@1464 48 scm_version.force_encoding('ASCII-8BIT')
Chris@1464 49 end
Chris@1464 50 if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)}m)
Chris@1464 51 m[2].scan(%r{\d+}).collect(&:to_i)
Chris@1464 52 end
Chris@1464 53 end
Chris@1464 54
Chris@1464 55 def scm_version_from_command_line
Chris@1464 56 shellout("#{sq_bin} --version") { |io| io.read }.to_s
Chris@1464 57 end
Chris@1464 58 end
Chris@1464 59
Chris@1464 60 # Guidelines for the input:
Chris@1464 61 # url -> the project-path, relative to the cvsroot (eg. module name)
Chris@1464 62 # root_url -> the good old, sometimes damned, CVSROOT
Chris@1464 63 # login -> unnecessary
Chris@1464 64 # password -> unnecessary too
Chris@1464 65 def initialize(url, root_url=nil, login=nil, password=nil,
Chris@1464 66 path_encoding=nil)
Chris@1464 67 @path_encoding = path_encoding.blank? ? 'UTF-8' : path_encoding
Chris@1464 68 @url = url
Chris@1464 69 # TODO: better Exception here (IllegalArgumentException)
Chris@1464 70 raise CommandFailed if root_url.blank?
Chris@1464 71 @root_url = root_url
Chris@1464 72
Chris@1464 73 # These are unused.
Chris@1464 74 @login = login if login && !login.empty?
Chris@1464 75 @password = (password || "") if @login
Chris@1464 76 end
Chris@1464 77
Chris@1464 78 def path_encoding
Chris@1464 79 @path_encoding
Chris@1464 80 end
Chris@1464 81
Chris@1464 82 def info
Chris@1464 83 logger.debug "<cvs> info"
Chris@1464 84 Info.new({:root_url => @root_url, :lastrev => nil})
Chris@1464 85 end
Chris@1464 86
Chris@1464 87 def get_previous_revision(revision)
Chris@1464 88 CvsRevisionHelper.new(revision).prevRev
Chris@1464 89 end
Chris@1464 90
Chris@1464 91 # Returns an Entries collection
Chris@1464 92 # or nil if the given path doesn't exist in the repository
Chris@1464 93 # this method is used by the repository-browser (aka LIST)
Chris@1464 94 def entries(path=nil, identifier=nil, options={})
Chris@1464 95 logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
Chris@1464 96 path_locale = scm_iconv(@path_encoding, 'UTF-8', path)
Chris@1464 97 path_locale.force_encoding("ASCII-8BIT") if path_locale.respond_to?(:force_encoding)
Chris@1464 98 entries = Entries.new
Chris@1464 99 cmd_args = %w|-q rls -e|
Chris@1464 100 cmd_args << "-D" << time_to_cvstime_rlog(identifier) if identifier
Chris@1464 101 cmd_args << path_with_proj(path)
Chris@1464 102 scm_cmd(*cmd_args) do |io|
Chris@1464 103 io.each_line() do |line|
Chris@1464 104 fields = line.chop.split('/',-1)
Chris@1464 105 logger.debug(">>InspectLine #{fields.inspect}")
Chris@1464 106 if fields[0]!="D"
Chris@1464 107 time = nil
Chris@1464 108 # Thu Dec 13 16:27:22 2007
Chris@1464 109 time_l = fields[-3].split(' ')
Chris@1464 110 if time_l.size == 5 && time_l[4].length == 4
Chris@1464 111 begin
Chris@1464 112 time = Time.parse(
Chris@1464 113 "#{time_l[1]} #{time_l[2]} #{time_l[3]} GMT #{time_l[4]}")
Chris@1464 114 rescue
Chris@1464 115 end
Chris@1464 116 end
Chris@1464 117 entries << Entry.new(
Chris@1464 118 {
Chris@1464 119 :name => scm_iconv('UTF-8', @path_encoding, fields[-5]),
Chris@1464 120 #:path => fields[-4].include?(path)?fields[-4]:(path + "/"+ fields[-4]),
Chris@1464 121 :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[-5]}"),
Chris@1464 122 :kind => 'file',
Chris@1464 123 :size => nil,
Chris@1464 124 :lastrev => Revision.new(
Chris@1464 125 {
Chris@1464 126 :revision => fields[-4],
Chris@1464 127 :name => scm_iconv('UTF-8', @path_encoding, fields[-4]),
Chris@1464 128 :time => time,
Chris@1464 129 :author => ''
Chris@1464 130 })
Chris@1464 131 })
Chris@1464 132 else
Chris@1464 133 entries << Entry.new(
Chris@1464 134 {
Chris@1464 135 :name => scm_iconv('UTF-8', @path_encoding, fields[1]),
Chris@1464 136 :path => scm_iconv('UTF-8', @path_encoding, "#{path_locale}/#{fields[1]}"),
Chris@1464 137 :kind => 'dir',
Chris@1464 138 :size => nil,
Chris@1464 139 :lastrev => nil
Chris@1464 140 })
Chris@1464 141 end
Chris@1464 142 end
Chris@1464 143 end
Chris@1464 144 entries.sort_by_name
Chris@1464 145 rescue ScmCommandAborted
Chris@1464 146 nil
Chris@1464 147 end
Chris@1464 148
Chris@1464 149 STARTLOG="----------------------------"
Chris@1464 150 ENDLOG ="============================================================================="
Chris@1464 151
Chris@1464 152 # Returns all revisions found between identifier_from and identifier_to
Chris@1464 153 # in the repository. both identifier have to be dates or nil.
Chris@1464 154 # these method returns nothing but yield every result in block
Chris@1464 155 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={}, &block)
Chris@1464 156 path_with_project_utf8 = path_with_proj(path)
Chris@1464 157 path_with_project_locale = scm_iconv(@path_encoding, 'UTF-8', path_with_project_utf8)
Chris@1464 158 logger.debug "<cvs> revisions path:" +
Chris@1464 159 "'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
Chris@1464 160 cmd_args = %w|-q rlog|
Chris@1464 161 cmd_args << "-d" << ">#{time_to_cvstime_rlog(identifier_from)}" if identifier_from
Chris@1464 162 cmd_args << path_with_project_utf8
Chris@1464 163 scm_cmd(*cmd_args) do |io|
Chris@1464 164 state = "entry_start"
Chris@1464 165 commit_log = String.new
Chris@1464 166 revision = nil
Chris@1464 167 date = nil
Chris@1464 168 author = nil
Chris@1464 169 entry_path = nil
Chris@1464 170 entry_name = nil
Chris@1464 171 file_state = nil
Chris@1464 172 branch_map = nil
Chris@1464 173 io.each_line() do |line|
Chris@1464 174 if state != "revision" && /^#{ENDLOG}/ =~ line
Chris@1464 175 commit_log = String.new
Chris@1464 176 revision = nil
Chris@1464 177 state = "entry_start"
Chris@1464 178 end
Chris@1464 179 if state == "entry_start"
Chris@1464 180 branch_map = Hash.new
Chris@1464 181 if /^RCS file: #{Regexp.escape(root_url_path)}\/#{Regexp.escape(path_with_project_locale)}(.+),v$/ =~ line
Chris@1464 182 entry_path = normalize_cvs_path($1)
Chris@1464 183 entry_name = normalize_path(File.basename($1))
Chris@1464 184 logger.debug("Path #{entry_path} <=> Name #{entry_name}")
Chris@1464 185 elsif /^head: (.+)$/ =~ line
Chris@1464 186 entry_headRev = $1 #unless entry.nil?
Chris@1464 187 elsif /^symbolic names:/ =~ line
Chris@1464 188 state = "symbolic" #unless entry.nil?
Chris@1464 189 elsif /^#{STARTLOG}/ =~ line
Chris@1464 190 commit_log = String.new
Chris@1464 191 state = "revision"
Chris@1464 192 end
Chris@1464 193 next
Chris@1464 194 elsif state == "symbolic"
Chris@1464 195 if /^(.*):\s(.*)/ =~ (line.strip)
Chris@1464 196 branch_map[$1] = $2
Chris@1464 197 else
Chris@1464 198 state = "tags"
Chris@1464 199 next
Chris@1464 200 end
Chris@1464 201 elsif state == "tags"
Chris@1464 202 if /^#{STARTLOG}/ =~ line
Chris@1464 203 commit_log = ""
Chris@1464 204 state = "revision"
Chris@1464 205 elsif /^#{ENDLOG}/ =~ line
Chris@1464 206 state = "head"
Chris@1464 207 end
Chris@1464 208 next
Chris@1464 209 elsif state == "revision"
Chris@1464 210 if /^#{ENDLOG}/ =~ line || /^#{STARTLOG}/ =~ line
Chris@1464 211 if revision
Chris@1464 212 revHelper = CvsRevisionHelper.new(revision)
Chris@1464 213 revBranch = "HEAD"
Chris@1464 214 branch_map.each() do |branch_name, branch_point|
Chris@1464 215 if revHelper.is_in_branch_with_symbol(branch_point)
Chris@1464 216 revBranch = branch_name
Chris@1464 217 end
Chris@1464 218 end
Chris@1464 219 logger.debug("********** YIELD Revision #{revision}::#{revBranch}")
Chris@1464 220 yield Revision.new({
Chris@1464 221 :time => date,
Chris@1464 222 :author => author,
Chris@1464 223 :message => commit_log.chomp,
Chris@1464 224 :paths => [{
Chris@1464 225 :revision => revision.dup,
Chris@1464 226 :branch => revBranch.dup,
Chris@1464 227 :path => scm_iconv('UTF-8', @path_encoding, entry_path),
Chris@1464 228 :name => scm_iconv('UTF-8', @path_encoding, entry_name),
Chris@1464 229 :kind => 'file',
Chris@1464 230 :action => file_state
Chris@1464 231 }]
Chris@1464 232 })
Chris@1464 233 end
Chris@1464 234 commit_log = String.new
Chris@1464 235 revision = nil
Chris@1464 236 if /^#{ENDLOG}/ =~ line
Chris@1464 237 state = "entry_start"
Chris@1464 238 end
Chris@1464 239 next
Chris@1464 240 end
Chris@1464 241
Chris@1464 242 if /^branches: (.+)$/ =~ line
Chris@1464 243 # TODO: version.branch = $1
Chris@1464 244 elsif /^revision (\d+(?:\.\d+)+).*$/ =~ line
Chris@1464 245 revision = $1
Chris@1464 246 elsif /^date:\s+(\d+.\d+.\d+\s+\d+:\d+:\d+)/ =~ line
Chris@1464 247 date = Time.parse($1)
Chris@1464 248 line_utf8 = scm_iconv('UTF-8', options[:log_encoding], line)
Chris@1464 249 author_utf8 = /author: ([^;]+)/.match(line_utf8)[1]
Chris@1464 250 author = scm_iconv(options[:log_encoding], 'UTF-8', author_utf8)
Chris@1464 251 file_state = /state: ([^;]+)/.match(line)[1]
Chris@1464 252 # TODO:
Chris@1464 253 # linechanges only available in CVS....
Chris@1464 254 # maybe a feature our SVN implementation.
Chris@1464 255 # I'm sure, they are useful for stats or something else
Chris@1464 256 # linechanges =/lines: \+(\d+) -(\d+)/.match(line)
Chris@1464 257 # unless linechanges.nil?
Chris@1464 258 # version.line_plus = linechanges[1]
Chris@1464 259 # version.line_minus = linechanges[2]
Chris@1464 260 # else
Chris@1464 261 # version.line_plus = 0
Chris@1464 262 # version.line_minus = 0
Chris@1464 263 # end
Chris@1464 264 else
Chris@1464 265 commit_log << line unless line =~ /^\*\*\* empty log message \*\*\*/
Chris@1464 266 end
Chris@1464 267 end
Chris@1464 268 end
Chris@1464 269 end
Chris@1464 270 rescue ScmCommandAborted
Chris@1464 271 Revisions.new
Chris@1464 272 end
Chris@1464 273
Chris@1464 274 def diff(path, identifier_from, identifier_to=nil)
Chris@1464 275 logger.debug "<cvs> diff path:'#{path}'" +
Chris@1464 276 ",identifier_from #{identifier_from}, identifier_to #{identifier_to}"
Chris@1464 277 cmd_args = %w|rdiff -u|
Chris@1464 278 cmd_args << "-r#{identifier_to}"
Chris@1464 279 cmd_args << "-r#{identifier_from}"
Chris@1464 280 cmd_args << path_with_proj(path)
Chris@1464 281 diff = []
Chris@1464 282 scm_cmd(*cmd_args) do |io|
Chris@1464 283 io.each_line do |line|
Chris@1464 284 diff << line
Chris@1464 285 end
Chris@1464 286 end
Chris@1464 287 diff
Chris@1464 288 rescue ScmCommandAborted
Chris@1464 289 nil
Chris@1464 290 end
Chris@1464 291
Chris@1464 292 def cat(path, identifier=nil)
Chris@1464 293 identifier = (identifier) ? identifier : "HEAD"
Chris@1464 294 logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
Chris@1464 295 cmd_args = %w|-q co|
Chris@1464 296 cmd_args << "-D" << time_to_cvstime(identifier) if identifier
Chris@1464 297 cmd_args << "-p" << path_with_proj(path)
Chris@1464 298 cat = nil
Chris@1464 299 scm_cmd(*cmd_args) do |io|
Chris@1464 300 io.binmode
Chris@1464 301 cat = io.read
Chris@1464 302 end
Chris@1464 303 cat
Chris@1464 304 rescue ScmCommandAborted
Chris@1464 305 nil
Chris@1464 306 end
Chris@1464 307
Chris@1464 308 def annotate(path, identifier=nil)
Chris@1464 309 identifier = (identifier) ? identifier : "HEAD"
Chris@1464 310 logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
Chris@1464 311 cmd_args = %w|rannotate|
Chris@1464 312 cmd_args << "-D" << time_to_cvstime(identifier) if identifier
Chris@1464 313 cmd_args << path_with_proj(path)
Chris@1464 314 blame = Annotate.new
Chris@1464 315 scm_cmd(*cmd_args) do |io|
Chris@1464 316 io.each_line do |line|
Chris@1464 317 next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
Chris@1464 318 blame.add_line(
Chris@1464 319 $3.rstrip,
Chris@1464 320 Revision.new(
Chris@1464 321 :revision => $1,
Chris@1464 322 :identifier => nil,
Chris@1464 323 :author => $2.strip
Chris@1464 324 ))
Chris@1464 325 end
Chris@1464 326 end
Chris@1464 327 blame
Chris@1464 328 rescue ScmCommandAborted
Chris@1464 329 Annotate.new
Chris@1464 330 end
Chris@1464 331
Chris@1464 332 private
Chris@1464 333
Chris@1464 334 # Returns the root url without the connexion string
Chris@1464 335 # :pserver:anonymous@foo.bar:/path => /path
Chris@1464 336 # :ext:cvsservername:/path => /path
Chris@1464 337 def root_url_path
Chris@1464 338 root_url.to_s.gsub(%r{^:.+?(?=/)}, '')
Chris@1464 339 end
Chris@1464 340
Chris@1464 341 # convert a date/time into the CVS-format
Chris@1464 342 def time_to_cvstime(time)
Chris@1464 343 return nil if time.nil?
Chris@1464 344 time = Time.now if time == 'HEAD'
Chris@1464 345
Chris@1464 346 unless time.kind_of? Time
Chris@1464 347 time = Time.parse(time)
Chris@1464 348 end
Chris@1464 349 return time_to_cvstime_rlog(time)
Chris@1464 350 end
Chris@1464 351
Chris@1464 352 def time_to_cvstime_rlog(time)
Chris@1464 353 return nil if time.nil?
Chris@1464 354 t1 = time.clone.localtime
Chris@1464 355 return t1.strftime("%Y-%m-%d %H:%M:%S")
Chris@1464 356 end
Chris@1464 357
Chris@1464 358 def normalize_cvs_path(path)
Chris@1464 359 normalize_path(path.gsub(/Attic\//,''))
Chris@1464 360 end
Chris@1464 361
Chris@1464 362 def normalize_path(path)
Chris@1464 363 path.sub(/^(\/)*(.*)/,'\2').sub(/(.*)(,v)+/,'\1')
Chris@1464 364 end
Chris@1464 365
Chris@1464 366 def path_with_proj(path)
Chris@1464 367 "#{url}#{with_leading_slash(path)}"
Chris@1464 368 end
Chris@1464 369 private :path_with_proj
Chris@1464 370
Chris@1464 371 class Revision < Redmine::Scm::Adapters::Revision
Chris@1464 372 # Returns the readable identifier
Chris@1464 373 def format_identifier
Chris@1464 374 revision.to_s
Chris@1464 375 end
Chris@1464 376 end
Chris@1464 377
Chris@1464 378 def scm_cmd(*args, &block)
Chris@1464 379 full_args = ['-d', root_url]
Chris@1464 380 full_args += args
Chris@1464 381 full_args_locale = []
Chris@1464 382 full_args.map do |e|
Chris@1464 383 full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
Chris@1464 384 end
Chris@1464 385 ret = shellout(
Chris@1464 386 self.class.sq_bin + ' ' + full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
Chris@1464 387 &block
Chris@1464 388 )
Chris@1464 389 if $? && $?.exitstatus != 0
Chris@1464 390 raise ScmCommandAborted, "cvs exited with non-zero status: #{$?.exitstatus}"
Chris@1464 391 end
Chris@1464 392 ret
Chris@1464 393 end
Chris@1464 394 private :scm_cmd
Chris@1464 395 end
Chris@1464 396
Chris@1464 397 class CvsRevisionHelper
Chris@1464 398 attr_accessor :complete_rev, :revision, :base, :branchid
Chris@1464 399
Chris@1464 400 def initialize(complete_rev)
Chris@1464 401 @complete_rev = complete_rev
Chris@1464 402 parseRevision()
Chris@1464 403 end
Chris@1464 404
Chris@1464 405 def branchPoint
Chris@1464 406 return @base
Chris@1464 407 end
Chris@1464 408
Chris@1464 409 def branchVersion
Chris@1464 410 if isBranchRevision
Chris@1464 411 return @base+"."+@branchid
Chris@1464 412 end
Chris@1464 413 return @base
Chris@1464 414 end
Chris@1464 415
Chris@1464 416 def isBranchRevision
Chris@1464 417 !@branchid.nil?
Chris@1464 418 end
Chris@1464 419
Chris@1464 420 def prevRev
Chris@1464 421 unless @revision == 0
Chris@1464 422 return buildRevision( @revision - 1 )
Chris@1464 423 end
Chris@1464 424 return buildRevision( @revision )
Chris@1464 425 end
Chris@1464 426
Chris@1464 427 def is_in_branch_with_symbol(branch_symbol)
Chris@1464 428 bpieces = branch_symbol.split(".")
Chris@1464 429 branch_start = "#{bpieces[0..-3].join(".")}.#{bpieces[-1]}"
Chris@1464 430 return ( branchVersion == branch_start )
Chris@1464 431 end
Chris@1464 432
Chris@1464 433 private
Chris@1464 434 def buildRevision(rev)
Chris@1464 435 if rev == 0
Chris@1464 436 if @branchid.nil?
Chris@1464 437 @base + ".0"
Chris@1464 438 else
Chris@1464 439 @base
Chris@1464 440 end
Chris@1464 441 elsif @branchid.nil?
Chris@1464 442 @base + "." + rev.to_s
Chris@1464 443 else
Chris@1464 444 @base + "." + @branchid + "." + rev.to_s
Chris@1464 445 end
Chris@1464 446 end
Chris@1464 447
Chris@1464 448 # Interpretiert die cvs revisionsnummern wie z.b. 1.14 oder 1.3.0.15
Chris@1464 449 def parseRevision()
Chris@1464 450 pieces = @complete_rev.split(".")
Chris@1464 451 @revision = pieces.last.to_i
Chris@1464 452 baseSize = 1
Chris@1464 453 baseSize += (pieces.size / 2)
Chris@1464 454 @base = pieces[0..-baseSize].join(".")
Chris@1464 455 if baseSize > 2
Chris@1464 456 @branchid = pieces[-2]
Chris@1464 457 end
Chris@1464 458 end
Chris@1464 459 end
Chris@1464 460 end
Chris@1464 461 end
Chris@1464 462 end