Option "guessed-layout" breaks with bzr 2.7 (not a valid python identifier)

[Jelmer Vernooij]

bzr-svn doesn't seem to work with bzr 2.7:

morgaine:~/src/bzr-svn/trunk% BZR_PLUGINS_AT=svn@`pwd` bzr push /tmp/bla/trunk
Option "guessed-layout" is not allowed.
bzr: ERROR: exceptions.TypeError: 'NoneType' object is not callable

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 930, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 1121, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 673, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.7/dist-packages/bzrlib/commands.py", line 697, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 136, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/cleanup.py", line 166, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/bzrlib/builtins.py", line 1340, in run
    _unused) = controldir.ControlDir.open_containing_tree_or_branch(directory)
  File "/usr/lib/python2.7/dist-packages/bzrlib/controldir.py", line 795, in open_containing_tree_or_branch
    possible_transports=possible_transports)
  File "/usr/lib/python2.7/dist-packages/bzrlib/controldir.py", line 734, in open_containing
    return klass.open_containing_from_transport(transport)
  File "/usr/lib/python2.7/dist-packages/bzrlib/controldir.py", line 755, in open_containing_from_transport
    result = klass.open_from_transport(a_transport)
  File "/usr/lib/python2.7/dist-packages/bzrlib/controldir.py", line 718, in open_from_transport
    find_format, transport, redirected)
  File "/usr/lib/python2.7/dist-packages/bzrlib/transport/__init__.py", line 1719, in do_catching_redirections
    return action(transport)
  File "/usr/lib/python2.7/dist-packages/bzrlib/controldir.py", line 706, in find_format
    probers=probers)
  File "/usr/lib/python2.7/dist-packages/bzrlib/controldir.py", line 1151, in find_format
    return prober.probe_transport(transport)
  File "/home/jelmer/src/bzr-svn/trunk/__init__.py", line 262, in probe_transport
    raise NotBranchError(path=transport.base)
TypeError: 'NoneType' object is not callable

bzr 2.7.0dev1 on python 2.7.10 (Linux-4.2.0-1-amd64-x86_64-with-debian-
    stretch-sid)
arguments: ['/usr/bin/bzr', 'push', '/tmp/bla/trunk']
plugins: bash_completion[2.7.0dev1], builddeb[2.8.6],
    changelog_merge[2.7.0dev1], etckeeper[unknown], grep[2.7.0dev1],
    launchpad[2.7.0dev1], netrc_credential_store[2.7.0dev1],
    news_merge[2.7.0dev1], po_merge[2.7.0dev1], weave_fmt[2.7.0dev1]
encoding: 'utf-8', fsenc: 'UTF-8', lang: 'en_GB.UTF-8'

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

[Vincent Ladeuil (vila)]

A fix has landed on lp:bzr that restore the ability to use an option name with hyphens.

[Vincent Ladeuil (vila)]

Please test to confirm using lp:bzr fixes this issue.

[Launchpad Janitor (janitor)]

[Expired for Bazaar Subversion Plugin because there has been no activity for 60 days.]