svn-layout failure: "does not support co-located branches"

[Brian de Alwis]

Versions: bzr 2.4b2 & bzr-svn 1.1.0dev.

I'm trying to set up a custom layout for bzr-svn. The setup is almost like "trunk" where branches are found under branches/, but the actual trunk is in trunk/product. Adding

    branches = branches/*;trunk/product

to my subversion.conf leads to an error when I try 'bzr svn-layout URL':

   $ bzr svn-layout URL
   bzr: ERROR: <bzrlib.plugins.svn.remote.SvnRemoteAccess object at 0x12f3bd0> does not support co-located branches.

I tried wiping out my ~/.bazaar/svn-cache to no avail.

It turns out that using one of the valid branch paths does work:

   $ bzr svn-layout URL/trunk/product
   Repository root: URL
   Layout: WildcardLayout(['branches/*', 'trunk/product'],[])
   Branch path: trunk/product
   Project: trunk/product
   No custom branch support
   Push merged revisions: False

Jelmer said on IRC: "Looks like it's just invalid handling of a particular exception at the moment"

The error log:

Thu 2011-06-16 15:27:19 -0400
0.072 bazaar version: 2.4b2
0.072 bzr arguments: [u'svn-layout', u'svn://<email address hidden>']
0.130 looking for plugins in /Users/bsd/.bazaar/plugins
0.254 looking for plugins in /usr/pkg/lib/python2.6/site-packages/bzrlib/plugins
0.255 Plugin name bash_completion already loaded
0.266 encoding stdout as sys.stdout encoding 'UTF-8'
0.587 bzr-svn: using Subversion 1.6.9 (), Subversion API 1.6.2 (), subvertpy 0.8.0
0.742 Transferred: 1kB (1.9kB/s r:0kB w:0kB u:1kB)
0.745 Traceback (most recent call last):
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/commands.py", line 936, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/commands.py", line 1136, in run_bzr
    ret = run(*run_argv)
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/commands.py", line 697, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/commands.py", line 719, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/cleanup.py", line 135, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/Users/bsd/.bazaar/plugins/svn/commands.py", line 217, in run
    branch, _ = Branch.open_containing(path)
  File "/usr/pkg/lib/python2.6/site-packages/bzrlib/branch.py", line 208, in open_containing
    return control.open_branch(), relpath
  File "/Users/bsd/.bazaar/plugins/svn/remote.py", line 368, in open_branch
    relpath = self._determine_relpath(name)
  File "/Users/bsd/.bazaar/plugins/svn/remote.py", line 345, in _determine_relpath
    raise errors.NoColocatedBranchSupport(self)
NoColocatedBranchSupport: <bzrlib.plugins.svn.remote.SvnRemoteAccess object at 0x12f3bd0> does not support co-located branches.

0.745 return code 3

[Brian de Alwis (slyguy)]

The same bug occurs if providing an invalid path:

   $ bzr branch URL/branches/valid/invalidpart
   bzr: ERROR: <bzrlib.plugins.svn.remote.SvnRemoteAccess object at 0x1313ad0> does not support co-located branches.