annotate .svn/pristine/39/39e07ef2d5632f8e7ca245cda7735bd6e7674f6d.svn-base @ 1496:17c7ffe039b1 redmine-2.4-integration

Merge from default branch
author Chris Cannam
date Mon, 17 Mar 2014 08:57:53 +0000
parents 261b3d9a4903
children
rev   line source
Chris@1464 1 # Redmine - project management software
Chris@1464 2 # Copyright (C) 2006-2013 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 BazaarAdapter < AbstractAdapter
Chris@1464 24
Chris@1464 25 # Bazaar executable name
Chris@1464 26 BZR_BIN = Redmine::Configuration['scm_bazaar_command'] || "bzr"
Chris@1464 27
Chris@1464 28 class << self
Chris@1464 29 def client_command
Chris@1464 30 @@bin ||= BZR_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.empty?
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+)})
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 def initialize(url, root_url=nil, login=nil, password=nil, path_encoding=nil)
Chris@1464 61 @url = url
Chris@1464 62 @root_url = url
Chris@1464 63 @path_encoding = 'UTF-8'
Chris@1464 64 # do not call *super* for non ASCII repository path
Chris@1464 65 end
Chris@1464 66
Chris@1464 67 def bzr_path_encodig=(encoding)
Chris@1464 68 @path_encoding = encoding
Chris@1464 69 end
Chris@1464 70
Chris@1464 71 # Get info about the repository
Chris@1464 72 def info
Chris@1464 73 cmd_args = %w|revno|
Chris@1464 74 cmd_args << bzr_target('')
Chris@1464 75 info = nil
Chris@1464 76 scm_cmd(*cmd_args) do |io|
Chris@1464 77 if io.read =~ %r{^(\d+)\r?$}
Chris@1464 78 info = Info.new({:root_url => url,
Chris@1464 79 :lastrev => Revision.new({
Chris@1464 80 :identifier => $1
Chris@1464 81 })
Chris@1464 82 })
Chris@1464 83 end
Chris@1464 84 end
Chris@1464 85 info
Chris@1464 86 rescue ScmCommandAborted
Chris@1464 87 return nil
Chris@1464 88 end
Chris@1464 89
Chris@1464 90 # Returns an Entries collection
Chris@1464 91 # or nil if the given path doesn't exist in the repository
Chris@1464 92 def entries(path=nil, identifier=nil, options={})
Chris@1464 93 path ||= ''
Chris@1464 94 entries = Entries.new
Chris@1464 95 identifier = -1 unless identifier && identifier.to_i > 0
Chris@1464 96 cmd_args = %w|ls -v --show-ids|
Chris@1464 97 cmd_args << "-r#{identifier.to_i}"
Chris@1464 98 cmd_args << bzr_target(path)
Chris@1464 99 scm_cmd(*cmd_args) do |io|
Chris@1464 100 prefix_utf8 = "#{url}/#{path}".gsub('\\', '/')
Chris@1464 101 logger.debug "PREFIX: #{prefix_utf8}"
Chris@1464 102 prefix = scm_iconv(@path_encoding, 'UTF-8', prefix_utf8)
Chris@1464 103 prefix.force_encoding('ASCII-8BIT') if prefix.respond_to?(:force_encoding)
Chris@1464 104 re = %r{^V\s+(#{Regexp.escape(prefix)})?(\/?)([^\/]+)(\/?)\s+(\S+)\r?$}
Chris@1464 105 io.each_line do |line|
Chris@1464 106 next unless line =~ re
Chris@1464 107 name_locale, slash, revision = $3.strip, $4, $5.strip
Chris@1464 108 name = scm_iconv('UTF-8', @path_encoding, name_locale)
Chris@1464 109 entries << Entry.new({:name => name,
Chris@1464 110 :path => ((path.empty? ? "" : "#{path}/") + name),
Chris@1464 111 :kind => (slash.blank? ? 'file' : 'dir'),
Chris@1464 112 :size => nil,
Chris@1464 113 :lastrev => Revision.new(:revision => revision)
Chris@1464 114 })
Chris@1464 115 end
Chris@1464 116 end
Chris@1464 117 if logger && logger.debug?
Chris@1464 118 logger.debug("Found #{entries.size} entries in the repository for #{target(path)}")
Chris@1464 119 end
Chris@1464 120 entries.sort_by_name
Chris@1464 121 rescue ScmCommandAborted
Chris@1464 122 return nil
Chris@1464 123 end
Chris@1464 124
Chris@1464 125 def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
Chris@1464 126 path ||= ''
Chris@1464 127 identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : 'last:1'
Chris@1464 128 identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
Chris@1464 129 revisions = Revisions.new
Chris@1464 130 cmd_args = %w|log -v --show-ids|
Chris@1464 131 cmd_args << "-r#{identifier_to}..#{identifier_from}"
Chris@1464 132 cmd_args << bzr_target(path)
Chris@1464 133 scm_cmd(*cmd_args) do |io|
Chris@1464 134 revision = nil
Chris@1464 135 parsing = nil
Chris@1464 136 io.each_line do |line|
Chris@1464 137 if line =~ /^----/
Chris@1464 138 revisions << revision if revision
Chris@1464 139 revision = Revision.new(:paths => [], :message => '')
Chris@1464 140 parsing = nil
Chris@1464 141 else
Chris@1464 142 next unless revision
Chris@1464 143 if line =~ /^revno: (\d+)($|\s\[merge\]$)/
Chris@1464 144 revision.identifier = $1.to_i
Chris@1464 145 elsif line =~ /^committer: (.+)$/
Chris@1464 146 revision.author = $1.strip
Chris@1464 147 elsif line =~ /^revision-id:(.+)$/
Chris@1464 148 revision.scmid = $1.strip
Chris@1464 149 elsif line =~ /^timestamp: (.+)$/
Chris@1464 150 revision.time = Time.parse($1).localtime
Chris@1464 151 elsif line =~ /^ -----/
Chris@1464 152 # partial revisions
Chris@1464 153 parsing = nil unless parsing == 'message'
Chris@1464 154 elsif line =~ /^(message|added|modified|removed|renamed):/
Chris@1464 155 parsing = $1
Chris@1464 156 elsif line =~ /^ (.*)$/
Chris@1464 157 if parsing == 'message'
Chris@1464 158 revision.message << "#{$1}\n"
Chris@1464 159 else
Chris@1464 160 if $1 =~ /^(.*)\s+(\S+)$/
Chris@1464 161 path_locale = $1.strip
Chris@1464 162 path = scm_iconv('UTF-8', @path_encoding, path_locale)
Chris@1464 163 revid = $2
Chris@1464 164 case parsing
Chris@1464 165 when 'added'
Chris@1464 166 revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
Chris@1464 167 when 'modified'
Chris@1464 168 revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
Chris@1464 169 when 'removed'
Chris@1464 170 revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
Chris@1464 171 when 'renamed'
Chris@1464 172 new_path = path.split('=>').last
Chris@1464 173 if new_path
Chris@1464 174 revision.paths << {:action => 'M', :path => "/#{new_path.strip}",
Chris@1464 175 :revision => revid}
Chris@1464 176 end
Chris@1464 177 end
Chris@1464 178 end
Chris@1464 179 end
Chris@1464 180 else
Chris@1464 181 parsing = nil
Chris@1464 182 end
Chris@1464 183 end
Chris@1464 184 end
Chris@1464 185 revisions << revision if revision
Chris@1464 186 end
Chris@1464 187 revisions
Chris@1464 188 rescue ScmCommandAborted
Chris@1464 189 return nil
Chris@1464 190 end
Chris@1464 191
Chris@1464 192 def diff(path, identifier_from, identifier_to=nil)
Chris@1464 193 path ||= ''
Chris@1464 194 if identifier_to
Chris@1464 195 identifier_to = identifier_to.to_i
Chris@1464 196 else
Chris@1464 197 identifier_to = identifier_from.to_i - 1
Chris@1464 198 end
Chris@1464 199 if identifier_from
Chris@1464 200 identifier_from = identifier_from.to_i
Chris@1464 201 end
Chris@1464 202 diff = []
Chris@1464 203 cmd_args = %w|diff|
Chris@1464 204 cmd_args << "-r#{identifier_to}..#{identifier_from}"
Chris@1464 205 cmd_args << bzr_target(path)
Chris@1464 206 scm_cmd_no_raise(*cmd_args) do |io|
Chris@1464 207 io.each_line do |line|
Chris@1464 208 diff << line
Chris@1464 209 end
Chris@1464 210 end
Chris@1464 211 diff
Chris@1464 212 end
Chris@1464 213
Chris@1464 214 def cat(path, identifier=nil)
Chris@1464 215 cat = nil
Chris@1464 216 cmd_args = %w|cat|
Chris@1464 217 cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0
Chris@1464 218 cmd_args << bzr_target(path)
Chris@1464 219 scm_cmd(*cmd_args) do |io|
Chris@1464 220 io.binmode
Chris@1464 221 cat = io.read
Chris@1464 222 end
Chris@1464 223 cat
Chris@1464 224 rescue ScmCommandAborted
Chris@1464 225 return nil
Chris@1464 226 end
Chris@1464 227
Chris@1464 228 def annotate(path, identifier=nil)
Chris@1464 229 blame = Annotate.new
Chris@1464 230 cmd_args = %w|annotate -q --all|
Chris@1464 231 cmd_args << "-r#{identifier.to_i}" if identifier && identifier.to_i > 0
Chris@1464 232 cmd_args << bzr_target(path)
Chris@1464 233 scm_cmd(*cmd_args) do |io|
Chris@1464 234 author = nil
Chris@1464 235 identifier = nil
Chris@1464 236 io.each_line do |line|
Chris@1464 237 next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
Chris@1464 238 rev = $1
Chris@1464 239 blame.add_line($3.rstrip,
Chris@1464 240 Revision.new(
Chris@1464 241 :identifier => rev,
Chris@1464 242 :revision => rev,
Chris@1464 243 :author => $2.strip
Chris@1464 244 ))
Chris@1464 245 end
Chris@1464 246 end
Chris@1464 247 blame
Chris@1464 248 rescue ScmCommandAborted
Chris@1464 249 return nil
Chris@1464 250 end
Chris@1464 251
Chris@1464 252 def self.branch_conf_path(path)
Chris@1464 253 bcp = nil
Chris@1464 254 m = path.match(%r{^(.*[/\\])\.bzr.*$})
Chris@1464 255 if m
Chris@1464 256 bcp = m[1]
Chris@1464 257 else
Chris@1464 258 bcp = path
Chris@1464 259 end
Chris@1464 260 bcp.gsub!(%r{[\/\\]$}, "")
Chris@1464 261 if bcp
Chris@1464 262 bcp = File.join(bcp, ".bzr", "branch", "branch.conf")
Chris@1464 263 end
Chris@1464 264 bcp
Chris@1464 265 end
Chris@1464 266
Chris@1464 267 def append_revisions_only
Chris@1464 268 return @aro if ! @aro.nil?
Chris@1464 269 @aro = false
Chris@1464 270 bcp = self.class.branch_conf_path(url)
Chris@1464 271 if bcp && File.exist?(bcp)
Chris@1464 272 begin
Chris@1464 273 f = File::open(bcp, "r")
Chris@1464 274 cnt = 0
Chris@1464 275 f.each_line do |line|
Chris@1464 276 l = line.chomp.to_s
Chris@1464 277 if l =~ /^\s*append_revisions_only\s*=\s*(\w+)\s*$/
Chris@1464 278 str_aro = $1
Chris@1464 279 if str_aro.upcase == "TRUE"
Chris@1464 280 @aro = true
Chris@1464 281 cnt += 1
Chris@1464 282 elsif str_aro.upcase == "FALSE"
Chris@1464 283 @aro = false
Chris@1464 284 cnt += 1
Chris@1464 285 end
Chris@1464 286 if cnt > 1
Chris@1464 287 @aro = false
Chris@1464 288 break
Chris@1464 289 end
Chris@1464 290 end
Chris@1464 291 end
Chris@1464 292 ensure
Chris@1464 293 f.close
Chris@1464 294 end
Chris@1464 295 end
Chris@1464 296 @aro
Chris@1464 297 end
Chris@1464 298
Chris@1464 299 def scm_cmd(*args, &block)
Chris@1464 300 full_args = []
Chris@1464 301 full_args += args
Chris@1464 302 full_args_locale = []
Chris@1464 303 full_args.map do |e|
Chris@1464 304 full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
Chris@1464 305 end
Chris@1464 306 ret = shellout(
Chris@1464 307 self.class.sq_bin + ' ' +
Chris@1464 308 full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
Chris@1464 309 &block
Chris@1464 310 )
Chris@1464 311 if $? && $?.exitstatus != 0
Chris@1464 312 raise ScmCommandAborted, "bzr exited with non-zero status: #{$?.exitstatus}"
Chris@1464 313 end
Chris@1464 314 ret
Chris@1464 315 end
Chris@1464 316 private :scm_cmd
Chris@1464 317
Chris@1464 318 def scm_cmd_no_raise(*args, &block)
Chris@1464 319 full_args = []
Chris@1464 320 full_args += args
Chris@1464 321 full_args_locale = []
Chris@1464 322 full_args.map do |e|
Chris@1464 323 full_args_locale << scm_iconv(@path_encoding, 'UTF-8', e)
Chris@1464 324 end
Chris@1464 325 ret = shellout(
Chris@1464 326 self.class.sq_bin + ' ' +
Chris@1464 327 full_args_locale.map { |e| shell_quote e.to_s }.join(' '),
Chris@1464 328 &block
Chris@1464 329 )
Chris@1464 330 ret
Chris@1464 331 end
Chris@1464 332 private :scm_cmd_no_raise
Chris@1464 333
Chris@1464 334 def bzr_target(path)
Chris@1464 335 target(path, false)
Chris@1464 336 end
Chris@1464 337 private :bzr_target
Chris@1464 338 end
Chris@1464 339 end
Chris@1464 340 end
Chris@1464 341 end