You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Edward S. Marshall" <es...@logic.net> on 2002/12/06 17:12:53 UTC

[PATCH] make cvs2svn get node types from svn.util

Hi,

Quickie patch to resolve a to-do in cvs2svn. Have the appropriate amount
of fun. :-)

-- 
Edward S. Marshall <es...@logic.net>
http://esm.logic.net/

* tools/cvs2svn/cvs2svn.py (global, Commit.commit): Use the svn_node_*
  definitions exported by svn.util.

Index: tools/cvs2svn/cvs2svn.py
===================================================================
--- tools/cvs2svn/cvs2svn.py	(revision 4028)
+++ tools/cvs2svn/cvs2svn.py	(working copy)
@@ -16,12 +16,6 @@
 
 from svn import fs, util, _delta, _repos
 
-### these should go somewhere else. should have SWIG export them.
-svn_node_none = 0
-svn_node_file = 1
-svn_node_dir = 2
-svn_node_unknown = 3
-
 
 trunk_rev = re.compile('^[0-9]+\\.[0-9]+$')
 
@@ -359,11 +353,11 @@
         for i in range(1, len(parts) + 1):
           # reassemble the pieces, adding a leading slash
           parent_dir = '/' + string.join(parts[:i], '/')
-          if fs.check_path(root, parent_dir, f_pool) == svn_node_none:
+          if fs.check_path(root, parent_dir, f_pool) ==
util.svn_node_none:
             print '    making dir:', parent_dir
             fs.make_dir(root, parent_dir, f_pool)
 
-      if fs.check_path(root, repos_path, f_pool) == svn_node_none:
+      if fs.check_path(root, repos_path, f_pool) == util.svn_node_none:
         created_file = 1
         fs.make_file(root, repos_path, f_pool)
       else:



Re: [PATCH] make cvs2svn get node types from svn.util

Posted by "Edward S. Marshall" <es...@logic.net>.
On Fri, 2002-12-06 at 11:12, Edward S. Marshall wrote:
> Quickie patch to resolve a to-do in cvs2svn.

Of course, my client mangled the patch. Damnable automatic wrapping.
Let's try that again.

-- 
Edward S. Marshall <es...@logic.net>
http://esm.logic.net/

* tools/cvs2svn/cvs2svn.py (global, Commit.commit): Use the svn_node_*
  definitions exported by svn.util.

Index: tools/cvs2svn/cvs2svn.py
===================================================================
--- tools/cvs2svn/cvs2svn.py	(revision 4028)
+++ tools/cvs2svn/cvs2svn.py	(working copy)
@@ -16,12 +16,6 @@
 
 from svn import fs, util, _delta, _repos
 
-### these should go somewhere else. should have SWIG export them.
-svn_node_none = 0
-svn_node_file = 1
-svn_node_dir = 2
-svn_node_unknown = 3
-
 
 trunk_rev = re.compile('^[0-9]+\\.[0-9]+$')
 
@@ -359,11 +353,11 @@
         for i in range(1, len(parts) + 1):
           # reassemble the pieces, adding a leading slash
           parent_dir = '/' + string.join(parts[:i], '/')
-          if fs.check_path(root, parent_dir, f_pool) == svn_node_none:
+          if fs.check_path(root, parent_dir, f_pool) == util.svn_node_none:
             print '    making dir:', parent_dir
             fs.make_dir(root, parent_dir, f_pool)
 
-      if fs.check_path(root, repos_path, f_pool) == svn_node_none:
+      if fs.check_path(root, repos_path, f_pool) == util.svn_node_none:
         created_file = 1
         fs.make_file(root, repos_path, f_pool)
       else: