svn-import --all fails on Twisted SVN due to non-ascii branch_path

Bug #122115 reported by Andrew Bennetts
2
Affects Status Importance Assigned to Milestone
Bazaar Subversion Plugin
Fix Released
Low
Jelmer Vernooij

Bug Description

When running this command:

    bzr svn-import svn+ssh://svn.twistedmatrix.com/svn/Twisted/ twisted-import/ --all

It fails with:

Traceback (most recent call last):
  File "/home/andrew/code/bzr/bzrlib/commands.py", line 716, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/andrew/code/bzr/bzrlib/commands.py", line 677, in run_bzr
    ret = run(*run_argv)
  File "/home/andrew/code/bzr/bzrlib/commands.py", line 375, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/andrew/code/bzr/bzrlib/commands.py", line 687, in ignore_pipe
    result = func(*args, **kwargs)
  File "/home/andrew/.bazaar/plugins/svn_plugin/__init__.py", line 147, in run
    trees, all)
  File "/home/andrew/.bazaar/plugins/svn_plugin/convert.py", line 110, in convert_repository
    source_repos.copy_content_into(target_repos)
  File "/home/andrew/code/bzr/bzrlib/repository.py", line 355, in copy_content_into
    return InterRepository.get(self, destination).copy_content(revision_id)
  File "/home/andrew/.bazaar/plugins/svn_plugin/fetch.py", line 371, in copy_content
    (needed, parents) = self._find_all()
  File "/home/andrew/.bazaar/plugins/svn_plugin/fetch.py", line 335, in _find_all
    revnum, scheme)
  File "/home/andrew/.bazaar/plugins/svn_plugin/repository.py", line 350, in _mainline_revision_parent
    if (path, revnum) != it.next():
  File "/home/andrew/.bazaar/plugins/svn_plugin/repository.py", line 622, in follow_branch
    if p.startswith(branch_path+"/") or branch_path == "":
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 18: ordinal not in range(128)

Because p is u'branches/callQueue\u221e-1741', but branch_path is 'branches/callQueue\xe2\x88\x9e-1741'

This is with the dev version of the svn plugin, and bzr.dev.

The last thing in the log before this was "lookup branch revnum 17486, u'trunk'"

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Is this repository available somewhere publicly for non-committers?

Revision history for this message
Andrew Bennetts (spiv) wrote :

Yes, sorry: svn://svn.twistedmatrix.com/svn/Twisted

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Thanks, can confirm it now.

Changed in bzr-svn:
assignee: nobody → jelmer
importance: Undecided → Low
status: New → Confirmed
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Ok, this particular bit has been fixed. Instead, it's now giving an error checking out revision branches/wprocess:12299

Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Fixed in bzr. Thanks!

Changed in bzr-svn:
status: Confirmed → Fix Committed
Jelmer Vernooij (jelmer)
Changed in bzr-svn:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.