[Pkg-bazaar-maint] Bug#459886: bzr-svn: Typo in repository.py

[Roland Mas]

Package: bzr-svn
Version: 0.4.6-1
Severity: normal

I was trying to do something a bit unorthodox: a bzr branch containing
some upstream code as well as a debian/ directory as taken from an
external repository (on Alioth).  So I checkout out the debian/ from
SVN into my branch, and tried bzr add debian/.  I ran into the
following error:

bzr: ERROR: exceptions.NameError: global name 'schee' is not defined

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 802, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 758, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 380, in run
    tree = WorkingTree.open_containing(file_list[0])[0]
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree.py", line 350, in open_containing
    return control.open_workingtree(), relpath
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/workingtree.py", line 739, in open_workingtree
    return SvnWorkingTree(self, self.local_path, self.open_branch())
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/workingtree.py", line 90, in __init__
    self.base_tree = SvnBasisTree(self)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/tree.py", line 227, in __init__
    workingtree.branch.scheme)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/repository.py", line 402, in get_fileid_map
    self.revision_fileid_renames, scheme)
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/fileids.py", line 151, in get_map
    revnum, scheme):
  File "/usr/lib/python2.4/site-packages/bzrlib/plugins/svn/repository.py", line 949, in follow_branch_history
    assert scheme.is_branch(bp) or schee.is_tag(bp)

  I believe there's a typo in the code, and "schee" should become
"scheme".

  Fixing that typo doesn't help me much (I eneded up moving the .svn
dir away, then doing the bzr add, then bringing the .svn dir back),
but I guess it can cause other bugs.

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

Kernel: Linux 2.6.23-1-686 (SMP w/1 CPU core)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-svn depends on:
ii  bzr                         1.0-1        easy to use distributed version co
ii  python                      2.4.4-6      An interactive high-level object-o
ii  python-central              0.5.15       register and build utility for Pyt
ii  python-pysqlite2            2.4.0-2      python interface to SQLite 3
ii  python-subversion           1.4.4dfsg1-1 Python bindings for Subversion

Versions of packages bzr-svn recommends:
ii  bzr-rebase                    0.3-1      Rebase plugin for Bazaar

-- no debconf information