Commit 15dc17a5 authored by maeda's avatar maeda

Fix FrozenError in BazaarAdapter.branch_conf_path (#26561).

Patch by Go MAEDA.


git-svn-id: https://svn.redmine.org/redmine/trunk@17994 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent baeafb01
...@@ -248,18 +248,11 @@ module Redmine ...@@ -248,18 +248,11 @@ module Redmine
end end
def self.branch_conf_path(path) def self.branch_conf_path(path)
bcp = nil return unless path
m = path.match(%r{^(.*[/\\])\.bzr.*$}) m = path.match(%r{^(.*[/\\])\.bzr.*$})
if m bcp = m ? m[1] : path.dup
bcp = m[1]
else
bcp = path
end
bcp.gsub!(%r{[\/\\]$}, "") bcp.gsub!(%r{[\/\\]$}, "")
if bcp File.join(bcp, ".bzr", "branch", "branch.conf")
bcp = File.join(bcp, ".bzr", "branch", "branch.conf")
end
bcp
end end
def append_revisions_only def append_revisions_only
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment