annotate .svn/pristine/39/39e07ef2d5632f8e7ca245cda7735bd6e7674f6d.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
rev   line source
Chris@1295 1 # Redmine - project management software
Chris@1295 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
Chris@1295 3 #
Chris@1295 4 # This program is free software; you can redistribute it and/or
Chris@1295 5 # modify it under the terms of the GNU General Public License
Chris@1295 6 # as published by the Free Software Foundation; either version 2
Chris@1295 7 # of the License, or (at your option) any later version.
Chris@1295 8 #
Chris@1295 9 # This program is distributed in the hope that it will be useful,
Chris@1295 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
Chris@1295 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
Chris@1295 12 # GNU General Public License for more details.
Chris@1295 13 #
Chris@1295 14 # You should have received a copy of the GNU General Public License
Chris@1295 15 # along with this program; if not, write to the Free Software
Chris@1295 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Chris@1295 17
Chris@1295 18 require 'redmine/scm/adapters/abstract_adapter'
Chris@1295 19
Chris@1295 20 module Redmine
Chris@1295 21 module Scm
Chris@1295 22 module Adapters
Chris@1295 23 class BazaarAdapter < AbstractAdapter
Chris@1295 24
Chris@1295 25 # Bazaar executable name
Chris@1295 26 BZR_BIN = Redmine::Configuration['scm_bazaar_command'] || "bzr"
Chris@1295 27
Chris@1295 28 class << self
Chris@1295 29 def client_command
Chris@1295 30 @@bin ||= BZR_BIN
Chris@1295 31 end
Chris@1295 32
Chris@1295 33 def sq_bin
Chris@1295 34 @@sq_bin ||= shell_quote_command
Chris@1295 35 end
Chris@1295 36
Chris@1295 37 def client_version
Chris@1295 38 @@client_version ||= (scm_command_version || [])
Chris@1295 39 end
Chris@1295 40
Chris@1295 41 def client_available
Chris@1295 42 !client_version.empty?
Chris@1295 43 end
Chris@1295 44
Chris@1295 45 def scm_command_version
Chris@1295 46 scm_version = scm_version_from_command_line.dup
Chris@1295 47 if scm_version.respond_to?(:force_encoding)
Chris@1295 48 scm_version.force_encoding('ASCII-8BIT')
Chris@1295 49 end
Chris@1295 50 if m = scm_version.match(%r{\A(.*?)((\d+\.)+\d+)})
Chris@1295 51 m[2].scan(%r{\d+}).collect(&:to_i)
Chris@1295 52 end
Chris@1295 53 end
Chris@1295 54
Chris@1295 55 def scm_version_from_command_line
Chris@1295 56 shellout("#{sq_bin} --version") { |io| io.read }.to_s
Chris@1295 57 end
Chris@1295 58 end
Chris@1295 59
Chris@1295 60 def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
Chris@1295 61 @url = url
Chris@1295 62 @root_url = url
Chris@1295 63 @path_encoding = 'UTF-8'
Chris@1295 64 # do not call *super* for non ASCII repository path
Chris@1295 65 end
Chris@1295 66
Chris@1295 67 def bzr_path_encodig=(encoding)
Chris@1295 68 @path_encoding = encoding
Chris@1295 69 end
Chris@1295 70
Chris@1295 71 # Get info about the repository
Chris@1295 72 def info
Chris@1295 73 cmd_args = %w|revno|
Chris@1295 74 cmd_args << bzr_target('')
Chris@1295 75 info = nil
Chris@1295 76 scm_cmd(*cmd_args) do |io|
Chris@1295 77 if io.read =~ %r{^(\d+)\r?$}
Chris@1295 78 info = Info.new({:root_url => url,
Chris@1295 79 :lastrev => Revision.new({
Chris@1295 80 :identifier => $1
Chris@1295 81 })
Chris@1295 82 })
Chris@1295 83 end
Chris@1295 84 end
Chris@1295 85 info
Chris@1295 86 rescue ScmCommandAborted
Chris@1295 87 return nil
Chris@1295 88 end
Chris@1295 89
Chris@1295 90 # Returns an Entries collection
Chris@1295 91 # or nil if the given path doesn't exist in the repository
Chris@1295 92 def entries(path=nil, identifier=nil, options={})
Chris@1295 93 path ||= ''
Chris@1295 94 entries = Entries.new
Chris@1295 95 identifier = -1 unless identifier && identifier.to_i > 0
Chris@1295 96 cmd_args = %w|ls -v --show-ids|
Chris@1295 97 cmd_args << "-r#{identifier.to_i}"
Chris@1295 98 cmd_args << bzr_target(path)
Chris@1295 99 scm_cmd(*cmd_args) do |io|
Chris@1295 100 prefix_utf8 = "#{url}/#{path}".gsub('\\', '/')
Chris@1295 101 logger.debug "PREFIX: #{prefix_utf8}"
Chris@1295 102 prefix = scm_iconv(@path_encoding, 'UTF-8', prefix_utf8)
Chris@1295 103 prefix.force_encoding('ASCII-8BIT') if prefix.respond_to?(:force_encoding)
Chris@1295 104 re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$}
Chris@1295 105 io.each_line do |line|
Chris@1295 106 next unless line =~ re
Chris@1295 107 name_locale, slash, revision = $3.strip, $4, $5.strip
Chris@1295 108 name = scm_iconv('UTF-8', @path_encoding, name_locale)
Chris@1295 109 entries << Entry.new({:name => name,
Chris@1295 110 :path => ((path.empty? ? "" : "#{path}/") + name),
Chris@1295 111 :kind => (slash.blank? ? 'file' : 'dir'),
Chris@1295 112 :size => nil,
Chris@1295 113 :lastrev => Revision.new(:revision => revision)
Chris@1295 114 })
Chris@1295 115 end
Chris@1295 116 end
Chris@1295 117 if logger && logger.debug?
Chris@1295 118 logger.debug("Found #{entries.size} entries in the repository for #{target(path)}")
Chris@1295 119 end
Chris@1295 120 entries.sort_by_name
Chris@1295 121 rescue ScmCommandAborted
Chris@1295 122 return nil
Chris@1295 123 end
Chris@1295 124
Chris@1295 125 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
Chris@1295 126 path ||= ''
Chris@1295 127 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : 'last:1'
Chris@1295 128 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
Chris@1295 129 revisions = Revisions.new
Chris@1295 130 cmd_args = %w|log -v --show-ids|
Chris@1295 131 cmd_args << "-r#{identifier_to}..#{identifier_from}"
Chris@1295 132 cmd_args << bzr_target(path)
Chris@1295 133 scm_cmd(*cmd_args) do |io|
Chris@1295 134 revision = nil
Chris@1295 135 parsing = nil
Chris@1295 136 io.each_line do |line|
Chris@1295 137 if line =~ /^----/
Chris@1295 138 revisions << revision if revision
Chris@1295 139 revision = Revision.new(:paths => [], :message => '')
Chris@1295 140 parsing = nil
Chris@1295 141 else
Chris@1295 142 next unless revision
Chris@1295 143 if line =~ /^revno: (\d+)($|\s\[merge\]$)/
Chris@1295 144 revision.identifier = $1.to_i
Chris@1295 145 elsif line =~ /^committer: (.+)$/
Chris@1295 146 revision.author = $1.strip
Chris@1295 147 elsif line =~ /^revision-id:(.+)$/
Chris@1295 148 revision.scmid = $1.strip
Chris@1295 149 elsif line =~ /^timestamp: (.+)$/
Chris@1295 150 revision.time = Time.parse($1).localtime
Chris@1295 151 elsif line =~ /^ -----/
Chris@1295 152 # partial revisions
Chris@1295 153 parsing = nil unless parsing == 'message'
Chris@1295 154 elsif line =~ /^(message|added|modified|removed|renamed):/
Chris@1295 155 parsing = $1
Chris@1295 156 elsif line =~ /^ (.*)$/
Chris@1295 157 if parsing == 'message'
Chris@1295 158 revision.message << "#{$1}\n"
Chris@1295 159 else
Chris@1295 160 if $1 =~ /^(.*)\s+(\S+)$/
Chris@1295 161 path_locale = $1.strip
Chris@1295 162 path = scm_iconv('UTF-8', @path_encoding, path_locale)
Chris@1295 163 revid = $2
Chris@1295 164 case parsing
Chris@1295 165 when 'added'
Chris@1295 166 revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
Chris@1295 167 when 'modified'
Chris@1295 168 revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
Chris@1295 169 when 'removed'
Chris@1295 170 revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
Chris@1295 171 when 'renamed'
Chris@1295 172 new_path = path.split('=>').last
Chris@1295 173 if new_path
Chris@1295 174 revision.paths << {:action => 'M', :path => "/#{new_path.strip}",
Chris@1295 175 :revision => revid}
Chris@1295 176 end
Chris@1295 177 end
Chris@1295 178 end
Chris@1295 179 end
Chris@1295 180 else
Chris@1295 181 parsing = nil
Chris@1295 182 end
Chris@1295 183 end
Chris@1295 184 end
Chris@1295 185 revisions << revision if revision
Chris@1295 186 end
Chris@1295 187 revisions
Chris@1295 188 rescue ScmCommandAborted
Chris@1295 189 return nil
Chris@1295 190 end
Chris@1295 191
Chris@1295 192 def diff(path, identifier_from, identifier_to=nil)
Chris@1295 193 path ||= ''
Chris@1295 194 if identifier_to
Chris@1295 195 identifier_to = identifier_to.to_i
Chris@1295 196 else
Chris@1295 197 identifier_to = identifier_from.to_i - 1
Chris@1295 198 end
Chris@1295 199 if identifier_from
Chris@1295 200 identifier_from = identifier_from.to_i
Chris@1295 201 end
Chris@1295 202 diff = []
Chris@1295 203 cmd_args = %w|diff|
Chris@1295 204 cmd_args << "-r#{identifier_to}..#{identifier_from}"
Chris@1295 205 cmd_args << bzr_target(path)
Chris@1295 206 scm_cmd_no_raise(*cmd_args) do |io|
Chris@1295 207 io.each_line do |line|
Chris@1295 208 diff << line
Chris@1295 209 end
Chris@1295 210 end
Chris@1295 211 diff
Chris@1295 212 end
Chris@1295 213
Chris@1295 214 def cat(path, identifier=nil)
Chris@1295 215 cat = nil
Chris@1295 216 cmd_args = %w|cat|
Chris@1295 217 cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0
Chris@1295 218 cmd_args << bzr_target(path)
Chris@1295 219 scm_cmd(*cmd_args) do |io|
Chris@1295 220 io.binmode
Chris@1295 221 cat = io.read
Chris@1295 222 end
Chris@1295 223 cat
Chris@1295 224 rescue ScmCommandAborted
Chris@1295 225 return nil
Chris@1295 226 end
Chris@1295 227
Chris@1295 228 def annotate(path, identifier=nil)
Chris@1295 229 blame = Annotate.new
Chris@1295 230 cmd_args = %w|annotate -q --all|
Chris@1295 231 cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0
Chris@1295 232 cmd_args << bzr_target(path)
Chris@1295 233 scm_cmd(*cmd_args) do |io|
Chris@1295 234 author = nil
Chris@1295 235 identifier = nil
Chris@1295 236 io.each_line do |line|
Chris@1295 237 next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
Chris@1295 238 rev = $1
Chris@1295 239 blame.add_line($3.rstrip,
Chris@1295 240 Revision.new(
Chris@1295 241 :identifier => rev,
Chris@1295 242 :revision => rev,
Chris@1295 243 :author => $2.strip
Chris@1295 244 ))
Chris@1295 245 end
Chris@1295 246 end
Chris@1295 247 blame
Chris@1295 248 rescue ScmCommandAborted
Chris@1295 249 return nil
Chris@1295 250 end
Chris@1295 251
Chris@1295 252 def self.branch_conf_path(path)
Chris@1295 253 bcp = nil
Chris@1295 254 m = path.match(%r{^(.*[/\\])\.bzr.*$})
Chris@1295 255 if m
Chris@1295 256 bcp = m[1]
Chris@1295 257 else
Chris@1295 258 bcp = path
Chris@1295 259 end
Chris@1295 260 bcp.gsub!(%r{[\/\\]$}, "")
Chris@1295 261 if bcp
Chris@1295 262 bcp = File.join(bcp, ".bzr", "branch", "branch.conf")
Chris@1295 263 end
Chris@1295 264 bcp
Chris@1295 265 end
Chris@1295 266
Chris@1295 267 def append_revisions_only
Chris@1295 268 return @aro if ! @aro.nil?
Chris@1295 269 @aro = false
Chris@1295 270 bcp = self.class.branch_conf_path(url)
Chris@1295 271 if bcp && File.exist?(bcp)
Chris@1295 272 begin
Chris@1295 273 f = File::open(bcp, "r")
Chris@1295 274 cnt = 0
Chris@1295 275 f.each_line do |line|
Chris@1295 276 l = line.chomp.to_s
Chris@1295 277 if l =~ /^\s*append_revisions_only\s*=\s*(\w+)\s*$/
Chris@1295 278 str_aro = $1
Chris@1295 279 if str_aro.upcase == "TRUE"
Chris@1295 280 @aro = true
Chris@1295 281 cnt += 1
Chris@1295 282 elsif str_aro.upcase == "FALSE"
Chris@1295 283 @aro = false
Chris@1295 284 cnt += 1
Chris@1295 285 end
Chris@1295 286 if cnt > 1
Chris@1295 287 @aro = false
Chris@1295 288 break
Chris@1295 289 end
Chris@1295 290 end
Chris@1295 291 end
Chris@1295 292 ensure
Chris@1295 293 f.close
Chris@1295 294 end
Chris@1295 295 end
Chris@1295 296 @aro
Chris@1295 297 end
Chris@1295 298
Chris@1295 299 def scm_cmd(*args, &block)
Chris@1295 300 full_args = []
Chris@1295 301 full_args += args
Chris@1295 302 full_args_locale = []
Chris@1295 303 full_args.map do |e|
Chris@1295 304 full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
Chris@1295 305 end
Chris@1295 306 ret = shellout(
Chris@1295 307 self.class.sq_bin + ' ' +
Chris@1295 308 full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
Chris@1295 309 &block
Chris@1295 310 )
Chris@1295 311 if $? && $?.exitstatus != 0
Chris@1295 312 raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}"
Chris@1295 313 end
Chris@1295 314 ret
Chris@1295 315 end
Chris@1295 316 private :scm_cmd
Chris@1295 317
Chris@1295 318 def scm_cmd_no_raise(*args, &block)
Chris@1295 319 full_args = []
Chris@1295 320 full_args += args
Chris@1295 321 full_args_locale = []
Chris@1295 322 full_args.map do |e|
Chris@1295 323 full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
Chris@1295 324 end
Chris@1295 325 ret = shellout(
Chris@1295 326 self.class.sq_bin + ' ' +
Chris@1295 327 full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
Chris@1295 328 &block
Chris@1295 329 )
Chris@1295 330 ret
Chris@1295 331 end
Chris@1295 332 private :scm_cmd_no_raise
Chris@1295 333
Chris@1295 334 def bzr_target(path)
Chris@1295 335 target(path, false)
Chris@1295 336 end
Chris@1295 337 private :bzr_target
Chris@1295 338 end
Chris@1295 339 end
Chris@1295 340 end
Chris@1295 341 end