bug in convert
Christoph Egger
Christoph_Egger at gmx.de
Tue Jul 21 01:49:37 CDT 2009
Greg Ward wrote:
> On Sun, Jul 19, 2009 at 7:06 PM, Christoph Egger<Christoph_Egger at gmx.de> wrote:
>> I tried to convert netbsd anoncvs src tree into a mercurial repository.
>
> Very brave of you.
Tnx :-)
TNF is discussing to move away from cvs for a longer time. The nature of
TNF is to try things out first instead of making rush decisions.
The SCMs currently in question are svn, git and mercurial.
To allow a smooth migration, mercurial (and all other scm's) must permit
- to convert cvs to hg
- to import new cvs history into hg (after conversion)
- to export cvs tree from hg for the anonymous cvs server.
>> Conversion failed with:
>>
>> 794600 sys/arch/hpcmips/conf/GENERIC
>> 794700 sys/arch/hpcmips/conf/GENERIC
>> 794800 sys/arch/hpcmips/conf/INSTALL_TX3922
>> ** unknown exception encountered, details follow
>> ** report bug details to http://mercurial.selenic.com/bts/
>> ** or mercurial at selenic.com
>> ** Mercurial Distributed SCM (version 1.3)
>> ** Extensions loaded: convert, rebase
>> Traceback (most recent call last):
>> File "/sw/bin/hg", line 27, in <module>
>> mercurial.dispatch.run()
> [...]
>> File "/sw/lib/python2.5/site-packages/hgext/convert/cvsps.py", line
>> 299, in createlog
>> assert match, _('expected revision number')
>> AssertionError: expected revision number
>> cvs [rlog aborted]: received broken pipe signal
>
> Looks like an incompatibility between the output of your CVS version
> and what the parser expects. First, can you try this patch
> (completely untested!) to improve the error reporting:
>
> --- a/hgext/convert/cvsps.py
> +++ b/hgext/convert/cvsps.py
> @@ -296,7 +296,7 @@
> # we create the logentry here from values stored in states 0 to 4,
> # as this state is re-entered for subsequent revisions of a file.
> match = re_50.match(line)
> - assert match, _('expected revision number')
> + assert match, _('expected revision number (got %r)') % line
> e = logentry(rcs=scache(rcs), file=scache(filename),
> revision=tuple([int(x) for x in
> match.group(1).split('.')]),
> branches=[], parent=None,
>
> When/if you rerun the conversion, try adding --debug. That might make
> the crash more informative.
I retried and this is the result:
802600 sys/arch/hpcmips/conf/GENERIC
802700 sys/arch/hpcmips/conf/LCARD
run hg sink post-conversion action
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.3)
** Extensions loaded: convert, rebase
Traceback (most recent call last):
File "/sw/bin/hg", line 27, in <module>
mercurial.dispatch.run()
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line 16,
in run
sys.exit(dispatch(sys.argv[1:]))
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line 27,
in dispatch
return _runcatch(u, args)
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line 43,
in _runcatch
return _dispatch(ui, args)
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line
449, in _dispatch
return runcommand(lui, repo, cmd, fullargs, ui, options, d)
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line
317, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line
501, in _runcommand
return checkargs()
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line
454, in checkargs
return cmdfunc()
File "/sw/lib/python2.5/site-packages/mercurial/dispatch.py", line
448, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
File "/sw/lib/python2.5/site-packages/mercurial/util.py", line 370, in
check
return func(*args, **kwargs)
File "/sw/lib/python2.5/site-packages/hgext/convert/__init__.py", line
232, in convert
return convcmd.convert(ui, src, dest, revmapfile, **opts)
File "/sw/lib/python2.5/site-packages/hgext/convert/convcmd.py", line
395, in convert
c.convert(sortmode)
File "/sw/lib/python2.5/site-packages/hgext/convert/convcmd.py", line
311, in convert
heads = self.source.getheads()
File "/sw/lib/python2.5/site-packages/hgext/convert/cvs.py", line 292,
in getheads
self._parse()
File "/sw/lib/python2.5/site-packages/hgext/convert/cvs.py", line 81,
in _parse
db = cvsps.createlog(self.ui, cache=cache)
File "/sw/lib/python2.5/site-packages/hgext/convert/cvsps.py", line
299, in createlog
assert match, _('expected revision number (got %r)') % line
AssertionError: expected revision number (got '')
cvs [rlog aborted]: received broken pipe signal
> Next, can you tell us precisely which version of CVS you're using?
> "cvs --version" should be helpful.
$ cvs --version
Concurrent Versions System (CVS) 1.12.13 (client/server)
Copyright (C) 2005 Free Software Foundation, Inc.
Senior active maintainers include Larry Jones, Derek R. Price,
and Mark D. Baushke. Please see the AUTHORS and README files from the
CVS distribution kit for a complete list of contributors and copyrights.
CVS may be copied only under the terms of the GNU General Public
License,a copy of which can be found with the CVS distribution kit.
Specify the --help option for further information about CVS
$
> In particular, it's not this
> newfangled OpenCVS thing that those poor misguided[1] OpenBSD people
> are doing, is it?
No, I'm not on OpenBSD. I'm on NetBSD.
> Finally, can you show us the output of "cvs rlog" on a representative
> file? (Ideally the one that caused the crash, but I'm not sure if
> that info is available to you. Running with --debug might help.)
$ cvs rlog src/sys/arch/hpcmips/conf/LCARD
RCS file: /cvsroot/src/sys/arch/hpcmips/conf/LCARD,v
head: 1.11
branch:
locks: strict
access list:
symbolic names:
yamt-nfs-mp-base6: 1.11
yamt-nfs-mp-base5: 1.11
yamt-nfs-mp-base4: 1.11
jym-xensuspend-nbase: 1.11
yamt-nfs-mp-base3: 1.11
nick-hppapmap-base4: 1.11
nick-hppapmap-base3: 1.11
netbsd-5-0: 1.9.0.86
netbsd-5-0-RELEASE: 1.9
netbsd-5-0-RC4: 1.9
netbsd-5-0-RC3: 1.9
nick-hppapmap-base2: 1.11
netbsd-5-0-RC2: 1.9
jym-xensuspend: 1.11.0.2
jym-xensuspend-base: 1.11
netbsd-5-0-RC1: 1.9
haad-dm-base2: 1.9
haad-nbase2: 1.9
ad-audiomp2: 1.9.0.84
ad-audiomp2-base: 1.9
netbsd-5: 1.9.0.82
netbsd-5-base: 1.9
nick-hppapmap: 1.9.0.80
nick-hppapmap-base: 1.11
matt-mips64-base2: 1.9
haad-dm-base1: 1.9
wrstuden-revivesa-base-4: 1.9
netbsd-4-0-1-RELEASE: 1.9
wrstuden-revivesa-base-3: 1.9
wrstuden-revivesa-base-2: 1.9
wrstuden-fixsa-newbase: 1.9
nick-csl-alignment-base5: 1.9
haad-dm: 1.9.0.78
haad-dm-base: 1.9
wrstuden-revivesa-base-1: 1.9
simonb-wapbl-nbase: 1.9
yamt-pf42-base4: 1.9
simonb-wapbl: 1.9.0.76
simonb-wapbl-base: 1.9
yamt-pf42-base3: 1.9
hpcarm-cleanup-nbase: 1.9
yamt-pf42-baseX: 1.9
yamt-pf42-base2: 1.9
yamt-nfs-mp-base2: 1.9
wrstuden-revivesa: 1.9.0.74
wrstuden-revivesa-base: 1.9
yamt-nfs-mp: 1.9.0.72
yamt-nfs-mp-base: 1.9
yamt-pf42: 1.9.0.70
yamt-pf42-base: 1.9
ad-socklock-base1: 1.9
yamt-lazymbuf-base15: 1.9
yamt-lazymbuf-base14: 1.9
keiichi-mipv6-nbase: 1.9
mjf-devfs2: 1.9.0.68
mjf-devfs2-base: 1.9
nick-net80211-sync: 1.9.0.66
nick-net80211-sync-base: 1.9
keiichi-mipv6: 1.9.0.64
keiichi-mipv6-base: 1.9
bouyer-xeni386-merge1: 1.9
matt-armv6-prevmlocking: 1.9
wrstuden-fixsa-base-1: 1.9
vmlocking2-base3: 1.9
netbsd-4-0: 1.9.0.62
netbsd-4-0-RELEASE: 1.9
bouyer-xeni386-nbase: 1.9
yamt-kmem-base3: 1.9
cube-autoconf: 1.9.0.60
cube-autoconf-base: 1.9
yamt-kmem-base2: 1.9
bouyer-xeni386: 1.9.0.58
bouyer-xeni386-base: 1.9
yamt-kmem: 1.9.0.56
yamt-kmem-base: 1.9
vmlocking2-base2: 1.9
reinoud-bufcleanup-nbase: 1.9
vmlocking2: 1.9.0.54
vmlocking2-base1: 1.9
netbsd-4-0-RC5: 1.9
matt-nb4-arm: 1.9.0.52
matt-nb4-arm-base: 1.9
matt-armv6-nbase: 1.9
jmcneill-base: 1.9
netbsd-4-0-RC4: 1.9
mjf-devfs: 1.9.0.50
mjf-devfs-base: 1.9
bouyer-xenamd64-base2: 1.9
vmlocking-nbase: 1.9
yamt-x86pmap-base4: 1.9
bouyer-xenamd64: 1.9.0.48
bouyer-xenamd64-base: 1.9
netbsd-4-0-RC3: 1.9
yamt-x86pmap-base3: 1.9
yamt-x86pmap-base2: 1.9
netbsd-4-0-RC2: 1.9
yamt-x86pmap: 1.9.0.46
yamt-x86pmap-base: 1.9
netbsd-4-0-RC1: 1.9
matt-armv6: 1.9.0.44
matt-armv6-base: 1.9
jmcneill-pm: 1.9.0.42
jmcneill-pm-base: 1.9
hpcarm-cleanup: 1.9.0.40
hpcarm-cleanup-base: 1.9
nick-csl-alignment: 1.9.0.38
nick-csl-alignment-base: 1.9
matt-mips64: 1.9.0.36
matt-mips64-base: 1.9
netbsd-3-1-1-RELEASE: 1.5
netbsd-3-0-3-RELEASE: 1.5
yamt-idlelwp-base8: 1.9
wrstuden-fixsa: 1.9.0.34
wrstuden-fixsa-base: 1.9
ppcoea-renovation: 1.9.0.32
ppcoea-renovation-base: 1.9
thorpej-atomic: 1.9.0.30
thorpej-atomic-base: 1.9
reinoud-bufcleanup: 1.9.0.28
reinoud-bufcleanup-base: 1.9
mjf-ufs-trans: 1.9.0.26
mjf-ufs-trans-base: 1.9
vmlocking: 1.9.0.24
vmlocking-base: 1.9
ad-audiomp: 1.9.0.22
ad-audiomp-base: 1.9
yamt-idlelwp: 1.9.0.20
post-newlock2-merge: 1.9
newlock2-nbase: 1.9
yamt-splraiseipl-base5: 1.9
yamt-splraiseipl-base4: 1.9
yamt-splraiseipl-base3: 1.9
abandoned-netbsd-4-base: 1.9
abandoned-netbsd-4: 1.9.0.12
netbsd-3-1: 1.5.0.10
netbsd-3-1-RELEASE: 1.5
netbsd-3-0-2-RELEASE: 1.5
yamt-splraiseipl-base2: 1.9
netbsd-3-1-RC4: 1.5
yamt-splraiseipl: 1.9.0.16
yamt-splraiseipl-base: 1.9
netbsd-3-1-RC3: 1.5
yamt-pdpolicy-base9: 1.9
newlock2: 1.9.0.14
newlock2-base: 1.9
yamt-pdpolicy-base8: 1.9
netbsd-3-1-RC2: 1.5
netbsd-3-1-RC1: 1.5
yamt-pdpolicy-base7: 1.9
netbsd-4: 1.9.0.18
netbsd-4-base: 1.9
yamt-pdpolicy-base6: 1.9
chap-midi-nbase: 1.9
netbsd-3-0-1-RELEASE: 1.5
gdamore-uart: 1.9.0.10
gdamore-uart-base: 1.9
simonb-timcounters-final: 1.8.6.1
yamt-pdpolicy-base5: 1.9
chap-midi: 1.9.0.8
chap-midi-base: 1.9
yamt-pdpolicy-base4: 1.9
yamt-pdpolicy-base3: 1.9
peter-altq-base: 1.9
peter-altq: 1.9.0.6
yamt-pdpolicy-base2: 1.9
elad-kernelauth-base: 1.9
elad-kernelauth: 1.9.0.4
yamt-pdpolicy: 1.9.0.2
yamt-pdpolicy-base: 1.9
yamt-uio_vmspace-base5: 1.9
simonb-timecounters: 1.8.0.6
simonb-timecounters-base: 1.9
rpaulo-netinet-merge-pcb: 1.8.0.4
rpaulo-netinet-merge-pcb-base: 1.9
yamt-uio_vmspace: 1.8.0.2
netbsd-3-0: 1.5.0.8
netbsd-3-0-RELEASE: 1.5
netbsd-3-0-RC6: 1.5
yamt-readahead-base3: 1.7
netbsd-3-0-RC5: 1.5
netbsd-3-0-RC4: 1.5
netbsd-3-0-RC3: 1.5
yamt-readahead-base2: 1.7
netbsd-3-0-RC2: 1.5
yamt-readahead-pervnode: 1.7
yamt-readahead-perfile: 1.7
yamt-readahead: 1.7.0.6
yamt-readahead-base: 1.7
netbsd-3-0-RC1: 1.5
yamt-vop-base3: 1.7
netbsd-2-0-3-RELEASE: 1.2.2.1
netbsd-2-1: 1.2.2.1.0.4
yamt-vop-base2: 1.7
thorpej-vnode-attr: 1.7.0.4
thorpej-vnode-attr-base: 1.7
netbsd-2-1-RELEASE: 1.2.2.1
yamt-vop: 1.7.0.2
yamt-vop-base: 1.7
netbsd-2-1-RC6: 1.2.2.1
netbsd-2-1-RC5: 1.2.2.1
netbsd-2-1-RC4: 1.2.2.1
netbsd-2-1-RC3: 1.2.2.1
netbsd-2-1-RC2: 1.2.2.1
netbsd-2-1-RC1: 1.2.2.1
yamt-lazymbuf: 1.5.0.6
yamt-km-base4: 1.5
netbsd-2-0-2-RELEASE: 1.2.2.1
yamt-km-base3: 1.5
netbsd-3: 1.5.0.4
netbsd-3-base: 1.5
matt-timespec: 1.5.0.2
yamt-km-base2: 1.4
yamt-km: 1.4.0.6
yamt-km-base: 1.4
kent-audio2: 1.4.0.4
kent-audio2-base: 1.5
netbsd-2-0-1-RELEASE: 1.2.2.1
kent-audio1-beforemerge: 1.4
netbsd-2: 1.2.2.1.0.2
netbsd-2-base: 1.2.2.1
kent-audio1: 1.4.0.2
kent-audio1-base: 1.4
netbsd-2-0-RELEASE: 1.2.2.1
netbsd-2-0-RC5: 1.2.2.1
netbsd-2-0-RC4: 1.2.2.1
netbsd-2-0-RC3: 1.2.2.1
netbsd-2-0-RC2: 1.2.2.1
netbsd-2-0-RC1: 1.2.2.1
netbsd-2-0: 1.2.0.2
netbsd-2-0-base: 1.2
ktrace-lwp: 1.1.0.2
ktrace-lwp-base: 1.8
keyword substitution: kv
total revisions: 26; selected revisions: 26
description:
----------------------------
revision 1.11
date: 2009/02/06 18:50:27; author: jym; state: Exp; lines: +2 -1
Changes to MEMORY_RBFLAGS option:
- renamed to MEMORY_DISK_RBFLAGS to better fit the rest of the
MEMORY_DISK options(4)
- change default value to RB_AUTOBOOT instead of RB_SINGLE, and adapt
the config(5) files accordingly
- document this option inside options(4)
See also http://mail-index.netbsd.org/tech-kern/2008/12/25/msg003924.html
Reviewed by abs@ in private mail.
----------------------------
revision 1.10
date: 2009/02/06 18:34:19; author: jym; state: Exp; lines: +2 -2
Fix some whitespace and indentation. No functional change.
----------------------------
revision 1.9
date: 2006/02/04 02:59:19; author: rpaulo; state: Exp; lines: +2 -2
branches: 1.9.72; 1.9.80;
bpfilter doesn't accept count anymore.
----------------------------
revision 1.8
date: 2005/12/07 09:10:13; author: tsutsui; state: Exp; lines: +2 -2
branches: 1.8.2; 1.8.4; 1.8.6;
Adjust comments for options FFS_NO_SNAPSHOT.
XXX: This option should be mentioned in options(4).
----------------------------
revision 1.7
date: 2005/07/31 04:04:31; author: yamt; state: Exp; lines: +1 -3
revert "defflag VMSWAP" changes for now.
there seems to be far more people who don't want to edit
their kernel config files than i thought.
----------------------------
revision 1.6
date: 2005/07/30 06:35:35; author: yamt; state: Exp; lines: +3 -1
add "options VMSWAP" to non INSTALL kernels.
----------------------------
revision 1.5
date: 2005/02/18 21:05:52; author: dsl; state: Exp; lines: +2 -1
branches: 1.5.6;
Invert FFS_SNAPSHOT to FFS_NO_SNAPSHOT
----------------------------
revision 1.4
date: 2004/11/10 17:54:04; author: christos; state: Exp; lines: +2 -1
branches: 1.4.4; 1.4.6;
Add COMPAT_BSDPTY to the rest of the config files.
----------------------------
revision 1.3
date: 2004/07/15 03:53:46; author: atatat; state: Exp; lines: +2 -1
Add "options SYSCTL_INCLUDE_DESCR" to a lot of configs, but commented
out in most of them.
----------------------------
revision 1.2
date: 2003/12/29 12:51:48; author: igy; state: Exp; lines: +2 -2
branches: 1.2.2;
using compile option "-G 0" (default)
----------------------------
revision 1.1
date: 2003/05/01 07:01:58; author: igy; state: Exp;
branches: 1.1.2;
Support for Laser5's L-Card+ Embedded CPU Board
===============================================
This code enables NetBSD to support for NEC VR4181 CPU and some
devices on L-Card+ board.
NEC VR4181
----------
NEC VR4181 is a embedded CPU which has MIPS processor core and
integrated I/O devices within a package. The basic architecture of
VR4181 is similar to other VR41xx family CPU. Some integrated devices
are compatible to another VR41xx series CPU and some are not.
VR4181 has integrated devices listed bellow:
- Two of 16550 compatible UART
- Compact Flash controller
- ISA bus controller
- Audio CODEC
- A/D converters
- LCD driver
- Touch panel controller
- General purpose I/O
L-Card+ Embedded CPU Board
--------------------------
L-Card+ is name card sized CPU board for embedded system. It is soled
by Laser5 (http://www.laser5.co.jp/) with Linux installed.
L-Card+ has following devices:
- 16Mbyte flash memory (Intel 28F128)
- 16Mbyte SDRAM
- CS8900A Ethernet controller and RJ45 port
- RS232C line driver and external connector
- Compact Flash socket
- A pair of Mezzanine connector for extension board
- Some on-board LEDs
Current Feature of This Code
----------------------------
Following devices are supported:
- UART (used for console)
- wi on Compact Flash socket
- cs (CS8900A)
- Flash memory (Intel 28F128 and Fujitsu MBM29LV160)
- Audio Coder (limited support)
--
Naoto Shimazaki
----------------------------
revision 1.1.2.6
date: 2005/12/11 10:28:18; author: christos; state: Exp; lines: +2 -2
Sync with head.
----------------------------
revision 1.1.2.5
date: 2005/03/04 16:38:36; author: skrll; state: Exp; lines: +2 -1
Sync with HEAD.
Hi Perry!
----------------------------
revision 1.1.2.4
date: 2004/11/14 08:15:06; author: skrll; state: Exp; lines: +2 -1
Sync with HEAD.
----------------------------
revision 1.1.2.3
date: 2004/09/21 13:16:00; author: skrll; state: Exp; lines: +1 -1
Fix the sync with head I botched.
----------------------------
revision 1.1.2.2
date: 2004/09/18 14:34:51; author: skrll; state: Exp; lines: +0 -0
Sync with HEAD.
----------------------------
revision 1.1.2.1
date: 2004/08/03 10:35:05; author: skrll; state: Exp; lines: +3 -2
Sync with HEAD
----------------------------
revision 1.2.2.1
date: 2004/07/15 20:22:33; author: he; state: Exp; lines: +2 -1
Pull up revision 1.3 (requested by atatat in ticket #663):
Add "options SYSCTL_INCLUDE_DESCR" to a lot of configurations,
but commented out in most of them.
----------------------------
revision 1.4.6.1
date: 2005/03/19 08:33:01; author: yamt; state: Exp; lines: +2 -1
sync with head. xen and whitespace. xen part is not finished.
----------------------------
revision 1.4.4.1
date: 2005/04/29 11:28:11; author: kent; state: Exp; lines: +2 -1
sync with -current
----------------------------
revision 1.5.6.1
date: 2006/06/21 14:51:49; author: yamt; state: Exp; lines: +3 -3
sync with head.
----------------------------
revision 1.8.6.1
date: 2006/04/22 11:37:30; author: simonb; state: Exp; lines: +2 -2
Sync with head.
----------------------------
revision 1.8.4.1
date: 2006/09/09 02:39:38; author: rpaulo; state: Exp; lines: +2 -2
sync with head
----------------------------
revision 1.8.2.1
date: 2006/02/18 15:38:35; author: yamt; state: Exp; lines: +2 -2
sync with head.
----------------------------
revision 1.9.80.1
date: 2009/03/03 18:28:58; author: skrll; state: Exp; lines: +3 -2
Sync with HEAD.
----------------------------
revision 1.9.72.1
date: 2009/05/04 08:11:11; author: yamt; state: Exp; lines: +3 -2
sync with head.
=============================================================================
Christoph
More information about the Mercurial
mailing list