[PATCH] cvs2svn.py - return sensible path from make_path

Hello again !

Another patch to correct a problem in cvs2svn.

Bye,
François

PS: Patch also attached.

Log Message:
* tools/cvs2svn/cvs2svn.py
  (make_path):
    Correct a bug where the returned path name could contain double
    slashes or a combination of backslash and slashes. This was
    most evident on Win32 where the returned path name would contain
    'trunk/\path'.

Index: tools/cvs2svn/cvs2svn.py
===================================================================
--- tools/cvs2svn/cvs2svn.py (revision 7422)
+++ tools/cvs2svn/cvs2svn.py (working copy)
@@ -296,21 +296,21 @@

   if branch_name:
     if path:
- return ctx.branches_base + '/' + branch_name + '/' + path
+ tempname = ctx.branches_base + '/' + branch_name + '/' + path
     else:
- return ctx.branches_base + '/' + branch_name
+ tempname = ctx.branches_base + '/' + branch_name
   elif tag_name:
     if path:
- return ctx.tags_base + '/' + tag_name + '/' + path
+ tempname = ctx.tags_base + '/' + tag_name + '/' + path
     else:
- return ctx.tags_base + '/' + tag_name
+ tempname = ctx.tags_base + '/' + tag_name
   else:
     if path:
- return ctx.trunk_base + '/' + path
+ tempname = ctx.trunk_base + '/' + path
     else:
- return ctx.trunk_base
+ tempname = ctx.trunk_base
+ return string.replace(string.replace(tempname, '/\\', '\\'), '//',
'/')

-
 def relative_name(cvsroot, fname):
   l = len(cvsroot)
   if fname[:l] == cvsroot:

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