does not strip \r from commit messages
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
CVS to Bazaar importer |
Triaged
|
Medium
|
Unassigned |
Bug Description
I tried to import a cvs repository with the line:
bzr cvsps-import --cvsps-dump module.dump /home/rickyn/
I got the following error:
!!!!!!!
Read 1942 patchsets (string cache hits: 0, total: 4147)
Failed while processing: Patchset(68, HEAD, enough, 2004/06/18 21:12:35)
Processed 67 patches (67 new, 0 existing) on 3 branches (1 tags) in 23.7s (2.83 patch/s)
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/home/
importer.
File "/home/
self.
File "/home/
rev_id, action = cvs_to_
File "/home/
revision_id = self._extract_
File "/home/
revision_
File "/home/
new_revision_id = builder.
File "/usr/lib/
self.
File "/usr/lib/
raise ValueError('Invalid value for %s: %r' % (context, text))
ValueError: Invalid value for commit message: u'User defined JAD- and MANIFEST-attributes are now fully integrated (but not tested yet).\rUsing a lock-file for detecting failed runs of J2ME Polish.\n'
bzr 1.17 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'cvsps-import', '--cvsps-dump', 'module.dump', '/home/
encoding: 'ISO-8859-15', fsenc: 'ISO-8859-15', lang: 'en_US.ISO-8859-15'
plugins:
bzrtools /usr/lib/
cvsps_import /home/rickyn/
gtk /usr/lib/
launchpad /usr/lib/
netrc_
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred.
!!!!!!!
I am on Ubuntu 8.04 with the backport of bzr installed.
ii bzr 1.17-1~
ii bzr-gtk 0.95.0-
ii bzrtools 1.17.0-
ii cvsps 2.1-4
FIX:
The problem can be fixed by replacing the character '0x0d' with '0x0a'. The author of this log message is a mac user. I am happy to tell him that his mac is trouble :)
description: | updated |
Changed in bzr-cvsps-import: | |
status: | New → Confirmed |
summary: |
- ValueError: Invalid value for commit message + does not strip \r from commit messages |
Changed in bzr-cvsps-import: | |
importance: | Undecided → Medium |
status: | Confirmed → Triaged |
This patch converts all \r\n and \r sequences in the logs to \n, which should cure the invalid commit message errors.