cvs2svn.py patch

Hi,

cvs2svn.py doesn't work if there are filenames with special
shell meaning like ,,('' etc.

--- .SVN-OTHER/subversion/tools/cvs2svn/cvs2svn.py Tue Apr 9 02:31:06 2002
+++ cvs2svn.py Sun Apr 14 11:23:33 2002
@@ -359,7 +360,7 @@
         f = os.path.join(dirname, 'Attic', fname)
         statcache.stat(f)
 
- pipe = os.popen('co -q -p%s %s' % (r, f), 'r', 102400)
+ pipe = os.popen('co -q -p%s \'%s\'' % (r, f), 'r', 102400)
 
       # if we just made the file, we can send it in one big hunk, rather
       # than streaming it in.
@@ -377,7 +378,7 @@
         # revision from co, or else the delta won't be correct because
         # the contents in the repo won't have changed yet.
         if repos_path == lastcommit[0]:
- infile2 = os.popen("co -q -p%s %s" % (lastcommit[1], f), "r", 102400)
+ infile2 = os.popen("co -q -p%s \'%s\'" % (lastcommit[1], f), "r", 102400)
           stream1 = util.svn_stream_from_stdio(infile2, f_pool)
         else:
           stream1 = fs.file_contents(root, repos_path, f_pool)

Unfortunately cvs2svn.py still doesn't work:
...
committing: Sat May 12 16:16:56 2001, over 0 seconds
    changing 1.1 : /quota-tools/doc/edquota(8).html
    making dir: /quota-tools
    making dir: /quota-tools/doc
    changing 1.1 : /quota-tools/doc/fstab(5).html
    changing 1.1 : /quota-tools/doc/Makefile.am
    changing 1.1 : /quota-tools/doc/quota(1).html
    changing 1.1 : /quota-tools/doc/quota4th.fig
    changing 1.1 : /quota-tools/doc/quotacheck(8).html
    changing 1.1 : /quota-tools/doc/quotactl(2).html
    changing 1.1 : /quota-tools/doc/quota.html
    changing 1.1 : /quota-tools/doc/quotaon(8).html
    changing 1.1 : /quota-tools/doc/quotas-1.eps
    changing 1.1 : /quota-tools/doc/quotas.ms
    changing 1.1 : /quota-tools/doc/quotas.preformated
    changing 1.1 : /quota-tools/doc/repquota(8).html
    changing 1.1 : /quota-tools/doc/rquotad(8).html
    changing 1.1 : /quota-tools/doc/set_limits_example.c
    changing 1.1 : /quota-tools/doc/setup_quota_group
    changing 1.1 : /quota-tools/doc/warnquota.conf
Traceback (most recent call last):
  File "./cvs2svn.py", line 650, in ?
    main()
  File "./cvs2svn.py", line 647, in main
    start_pass=start_pass, verbose=verbose, target=target)
  File "/usr/lib/python2.2/site-packages/svn/util.py", line 33, in run_app
  File "./cvs2svn.py", line 612, in convert
    _passes[i](ctx)
  File "./cvs2svn.py", line 569, in pass4
    c.commit(t_fs, ctx)
  File "./cvs2svn.py", line 424, in commit
    conflicts, new_rev = fs.commit_txn(txn)
TypeError: unpack non-sequence

(no branches)

-- 
Arkadiusz Mi¶kiewicz   IPv6 ready PLD Linux at http://www.pld.org.pl
misiek(at)pld.org.pl   AM2-6BONE, 1024/3DB19BBD, arekm(at)ircnet, PWr
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org