[PATCH] cvs2svn.py

[David Summers <da...@summersoft.fay.ar.us>]

Thanks to Scott Lamb I finally got the Subversion SWIG (cvs2svn) stuff to 
work.

I'm getting ready to generate an RPM for the subversion-cvs2svn package 
but I couldn't get cvs2svn to work until I made the following changes.

Didn't I see someone made some changes to take out the "_" prefix 
recently?  Did they forget to change cvs2svn.py?  (Any others?)

I can't access svn.collab.net right now to take a look at the log.

===============================================================================
* tools/cvs2svn/cvs2svn.py : Took out the "_" prefix from the _repos and 
     _delta variables to get rid of "NameError: global name '_repos' is 
    not defined" error.

Index: tools/cvs2svn/cvs2svn.py
===================================================================
--- tools/cvs2svn/cvs2svn.py	(revision 4126)
+++ tools/cvs2svn/cvs2svn.py	(working copy)
@@ -380,7 +380,7 @@
       ### we should watch out for file sizes here; we don't want to yank
       ### in HUGE files...
       if created_file:
-        _delta.svn_txdelta_send_string(pipe.read(), handler, baton, f_pool)
+        delta.svn_txdelta_send_string(pipe.read(), handler, baton, f_pool)
       else:
         # open an SVN stream onto the pipe
         stream2 = util.svn_stream_from_stdio(pipe, f_pool)
@@ -396,8 +396,8 @@
         else:
           stream1 = fs.file_contents(root, repos_path, f_pool)
 
-        txstream = _delta.svn_txdelta(stream1, stream2, f_pool)
-        _delta.svn_txdelta_send_txstream(txstream, handler, baton, f_pool)
+        txstream = delta.svn_txdelta(stream1, stream2, f_pool)
+        delta.svn_txdelta_send_txstream(txstream, handler, baton, f_pool)
 
         # shut down the previous-rev pipe, if we opened it
         infile2 = None
@@ -550,10 +550,10 @@
   # create the target repository
   if not ctx.dry_run:
     if ctx.create_repos:
-      t_repos = _repos.svn_repos_create(ctx.target, ctx.pool)
+      t_repos = repos.svn_repos_create(ctx.target, ctx.pool)
     else:
-      t_repos = _repos.svn_repos_open(ctx.target, ctx.pool)
-    t_fs = _repos.svn_repos_fs(t_repos)
+      t_repos = repos.svn_repos_open(ctx.target, ctx.pool)
+    t_fs = repos.svn_repos_fs(t_repos)
   else:
     t_fs = t_repos = None
 
===============================================================================
-- 
David Wayne Summers          "Linux: Because reboots are for hardware upgrades!"
david@summersoft.fay.ar.us   PGP Key: http://summersoft.fay.ar.us/~david/pgp.txt
PGP Key fingerprint =  C0 E0 4F 50 DD A9 B6 2B  60 A1 31 7E D2 28 6D A8 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] cvs2svn.py

[cm...@collab.net]

Karl Fogel <kf...@newton.ch.collab.net> writes:

> David Summers <da...@summersoft.fay.ar.us> writes:
> > Didn't I see someone made some changes to take out the "_" prefix 
> > recently?  Did they forget to change cvs2svn.py?  (Any others?)
> 
> That was me, might as well 'fess up.  Sorry!

I get some blame for that.  I told Karl to make that change, and
forgot to make sure he fixed the rest of the file to account for the
renamed imported modules.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: [PATCH] cvs2svn.py

[Karl Fogel <kf...@newton.ch.collab.net>]

David Summers <da...@summersoft.fay.ar.us> writes:
> Didn't I see someone made some changes to take out the "_" prefix 
> recently?  Did they forget to change cvs2svn.py?  (Any others?)

That was me, might as well 'fess up.  Sorry!

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org