[Pkg-bazaar-maint] Bug#573988: guessed-layout property in subversion.conf breaks bzr-svn

[Jan Schumacher]

Package: bzr-svn
Version: 1.0.2-2
Severity: normal


Dear bzr-svn maintainers,

when using bzr-svn with a particular repository, the first operation
works normally. Afterwards the property

  guessed-layout = trunk6

has been appended automatically to 

  ~/.bazaar/subversion.conf.
  
The next and all following operations fail with the error message
(ellipses in brackets [...]):

$ bzr missing svn+ssh://[...]
Branches are up to date.                                                                                                                                     
$ bzr missing svn+ssh://[...]
bzr: ERROR: exceptions.KeyError: u'trunk6'                                                                                                        

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 853, in exception_to_return_code
    return the_callable(*args, **kwargs)                                                           
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1055, in run_bzr                
    ret = run(*run_argv)                                                                           
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 661, in run_argv_aliases        
    return self.run_direct(**all_cmd_args)                                                         
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 665, in run_direct              
    return self._operation.run_simple(*args, **kwargs)                                             
  File "/usr/lib/python2.5/site-packages/bzrlib/cleanup.py", line 122, in run_simple               
    self.cleanups, self.func, *args, **kwargs)                                                     
  File "/usr/lib/python2.5/site-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups        
    result = func(*args, **kwargs)                                                                 
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1070, in ignore_pipe            
    result = func(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 4306, in run
    remote_branch = Branch.open(other_branch)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 170, in open
    return control.open_branch(_unsupported)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/remote.py", line 229, in open_branch
    branch = SvnBranch(repos, self.branch_path)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/branch.py", line 175, in __init__
    self.layout = self.repository.get_layout()
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/repository.py", line 657, in get_layout
    return self.get_layout_source()[0]
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/repository.py", line 679, in get_layout_source
    self._find_guessed_layout()
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/svn/repository.py", line 688, in _find_guessed_layout
    config_guessed_layout = layout.layout_registry.get(layoutname)()
  File "/usr/lib/python2.5/site-packages/bzrlib/registry.py", line 173, in get
    return self._dict[self._get_key_or_default(key)].get_obj()
KeyError: u'trunk6'

bzr 2.1.0 on python 2.5.5 (Linux-2.6.32-3-686-bigmem-i686-with-debian-squeeze-sid)
arguments: ['/usr/bin/bzr', 'missing', 'svn+ssh://[...]']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'de_DE.UTF-8'
plugins:
  bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [2.1.0]
  cvsps_import         /usr/lib/python2.5/site-packages/bzrlib/plugins/cvsps_import [unknown]
  dbus                 /usr/lib/python2.5/site-packages/bzrlib/plugins/dbus [0.1.0dev]
  gtk                  /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.98.0.final.1]
  launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [2.1.0]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [2.1.0]
  news_merge           /usr/lib/python2.5/site-packages/bzrlib/plugins/news_merge [2.1.0]
  rebase               /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.5.5]
  svn                  /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [1.0.2]

*** 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.

Removing "guessed-layout" from subversion.conf restarts the cycle,
allowing for one working command and errors on all following.

Cheers
Jan

-- System Information:
Debian Release: squeeze/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (101, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.32-3-686-bigmem (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-svn depends on:
ii  bzr                          2.1.0-1     easy to use distributed version co
ii  python                       2.5.4-9     An interactive high-level object-o
ii  python-central               0.6.14+nmu2 register and build utility for Pyt
ii  python-subvertpy             0.7.2-2     Alternative Python bindings for Su

Versions of packages bzr-svn recommends:
ii  python-tdb                    1.2.1-2    Python bindings for TDB
ii  python-xdg                    0.19-1     Python library to access freedeskt

Versions of packages bzr-svn suggests:
ii  bzr-rebase                    0.5.5-1    Rebase plugin for Bazaar

-- no debconf information