meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-24 01:11:12 +00:00
Code Issues Releases Wiki Activity

Fix FrozenError in BazaarAdapter.branch_conf_path (#26561).

Browse Source 
Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@17994 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2019-03-20 15:02:35 +00:00
parent 09b63e39ed
commit 21769bb59e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/redmine/scm/adapters/bazaar_adapter.rb
View File

@ -248,18 +248,11 @@ module Redmine
end
def self.branch_conf_path(path)
bcp = nil
return unless path
m = path.match(%r{^(.*[/\\])\.bzr.*$})
if m
bcp = m[1]
else
bcp = path
end
bcp = m ? m[1] : path.dup
bcp.gsub!(%r{[\/\\]$}, "")
if bcp
bcp = File.join(bcp, ".bzr", "branch", "branch.conf")
end
bcp
File.join(bcp, ".bzr", "branch", "branch.conf")
end
def append_revisions_only