fast-import-filter: cannot concatenate 'str' and 'NoneType' objects

Bug #477886 reported by Robert Millan
22
This bug affects 3 people
Affects Status Importance Assigned to Milestone
python-fastimport
Fix Released
Medium
Jelmer Vernooij
python-fastimport (Ubuntu)
Fix Released
Undecided
Jelmer Vernooij

Bug Description

$ rsync -avzHS rsync://svn.savannah.gnu.org/svn/grub/ /tmp/grub.repo/
[...]
$ bzr fast-export-from-svn /tmp/grub.repo/ /tmp/grub.fe
[...]
$ bzr fast-import-filter /tmp/grub.fe
bzr: ERROR: exceptions.TypeError: cannot concatenate 'str' and 'NoneType' objects

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1037, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/rmh/.bazaar/plugins/fastimport/__init__.py", line 500, in run
    verbose, user_map=user_map)
  File "/home/rmh/.bazaar/plugins/fastimport/__init__.py", line 111, in _run
    return proc.process(p.iter_commands)
  File "/home/rmh/.bazaar/plugins/fastimport/processor.py", line 95, in process
    self._process(command_iter)
  File "/home/rmh/.bazaar/plugins/fastimport/processor.py", line 117, in _process
    handler(self, cmd)
  File "/home/rmh/.bazaar/plugins/fastimport/processors/filter_processor.py", line 128, in commit_handler
    self.parents[":" + cmd.mark] = parents
TypeError: cannot concatenate 'str' and 'NoneType' objects

bzr 2.0.1 on python 2.5.4 (Linux-2.6.26-libre2-2-amd64-x86_64-with-debian-squeeze-sid)
arguments: ['/usr/bin/bzr', 'fast-import-filter', 'fe']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'ca_AD.UTF-8'
plugins:
  bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [2.0.1]
  cia /usr/lib/python2.5/site-packages/bzrlib/plugins/cia [1.0.0dev]
  cvsps_import /usr/lib/python2.5/site-packages/bzrlib/plugins/cvsps_import [unknown]
  fastimport /home/rmh/.bazaar/plugins/fastimport [0.9.0dev]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [2.0.1]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [2.0.1]
  rebase /usr/lib/python2.5/site-packages/bzrlib/plugins/rebase [0.5.4]
  svn /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [1.0.0]

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

Revision history for this message
Robert Millan (rmh-aybabtu) wrote :

I made it print the faulty "cmd" as per instructions from bialix on IRC. bialix said that "mark" should follow "commit", which seems to be the culprit here.

Also, if I import this into a bzr, and then fast-export from it, I get a new stream fast-import-filter can work with.

commit refs/heads/master
committer erich <erich@localhost> 843012952 +0000
data 17
Initial revision

M 644 :1 grub/shared_src/disk_inode.h
M 644 :2 grub/shared_src/char_io.c
M 644 :3 grub/shared_src/fsys_ext2fs.c
M 644 :4 grub/shared_src/imgact_aout.h
M 644 :5 grub/shared_src/fat.h
M 644 :6 grub/shared_src/asm.S
M 644 :7 grub/shared_src/cmdline.c
M 644 :8 grub/shared_src/pc_slice.h
M 644 :9 grub/shared_src/fsys_ffs.c
M 644 :10 grub/shared_src/boot.c
M 644 :11 grub/shared_src/dir.h
M 644 :12 grub/shared_src/disk_inode_ffs.h
M 644 :13 grub/shared_src/fsys_fat.c
M 644 :14 grub/shared_src/shared.h
M 644 :15 grub/shared_src/gunzip.c
M 644 :16 grub/shared_src/mb_header.h
M 644 :17 grub/shared_src/defs.h
M 644 :18 grub/shared_src/freebsd.h
M 644 :19 grub/shared_src/i386-elf.h
M 644 :20 grub/shared_src/fs.h
M 644 :21 grub/shared_src/common.c
M 644 :22 grub/shared_src/filesys.h
M 644 :23 grub/shared_src/disk_io.c
M 644 :24 grub/shared_src/mb_info.h
M 644 :25 grub/shared_src/stage1_5.c

Martin Pool (mbp)
affects: bzr → bzr-fastimport
Jelmer Vernooij (jelmer)
affects: bzr-fastimport → python-fastimport
Changed in python-fastimport:
assignee: nobody → Jelmer Vernooij (jelmer)
importance: Undecided → Medium
status: New → Fix Committed
Jelmer Vernooij (jelmer)
Changed in python-fastimport (Ubuntu):
status: New → Incomplete
status: Incomplete → Fix Committed
Jelmer Vernooij (jelmer)
Changed in python-fastimport (Ubuntu):
assignee: nobody → Jelmer Vernooij (jelmer)
Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package python-fastimport - 0.9.0~bzr298-1

---------------
python-fastimport (0.9.0~bzr298-1) unstable; urgency=low

  * New upstream snapshot.
   + Avoids tracking unset marks. LP: #477886
  * Require testtools 0.9.2 to run the test suite.
  * Drop versioned dependency on python-support. Closes: #603232
 -- Jelmer Vernooij <email address hidden> Fri, 07 Jan 2011 09:53:05 +0000

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

Duplicates of this bug

Other bug subscribers

Remote bug watches

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