You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Marko Macek <Ma...@gmx.net> on 2002/10/24 18:54:26 UTC

[PATCH] cvs2svn.py (1/2): infrastructure/options

Hi!

ChangeLog:
   - added --trunk, --tags and --branches command line options for
     specifying relative repository paths
   - changed the default behavior to import into an existing repository
   - added a command line option --create for creating a new repository
   - added infrastructure for handling branches

Regards,
Mark

Re: [PATCH] cvs2svn.py (1/2): infrastructure/options

Posted by Marko Macek <Ma...@gmx.net>.
Marko Macek wrote:

> +  print '  --branches=PATH  path for branches (default: /tags)'
> +  print '  --tags=PATH      path for tags (default: /branches)'

Oops. This is bad (tnx sander). The attached patch fixes it.

Regards,
MArk

Re: [PATCH] cvs2svn.py (1/2): infrastructure/options

Posted by br...@xbc.nu.
Quoting Greg Stein <gs...@lyra.org>:

> On Thu, Oct 24, 2002 at 11:50:14PM +0200, Branko Cibej wrote:
> >...
> > >+def branch_path(ctx, branch_name = None):
> > >+  if branch_name == None:
> >
> > Minor nit: None is a unique object, so you can/should test with "is"
> 
> > rather than "==". This is not a showstopper, though.
> 
> Drop the test altogether (and reverse the blocks):
> 
>   if branch_name:
>     whatever...

Huh, of course...

> > +1 for applying options.dff and usagectx.diff (should be applied on top 
> > of the former, right?). Greg, any objections?
> 
> +1 ... looks great!

Committed in r3492. Thanks, Mark!

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

Re: [PATCH] cvs2svn.py (1/2): infrastructure/options

Posted by Greg Stein <gs...@lyra.org>.
On Thu, Oct 24, 2002 at 11:50:14PM +0200, Branko Cibej wrote:
>...
> >+def branch_path(ctx, branch_name = None):
> >+  if branch_name == None:
>
> Minor nit: None is a unique object, so you can/should test with "is" 
> rather than "==". This is not a showstopper, though.

Drop the test altogether (and reverse the blocks):

  if branch_name:
    whatever...

> +1 for applying options.dff and usagectx.diff (should be applied on top 
> of the former, right?). Greg, any objections?

+1 ... looks great!

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/

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

Re: [PATCH] cvs2svn.py (1/2): infrastructure/options

Posted by Branko Čibej <br...@xbc.nu>.
Marko Macek wrote:

> Hi!
>
> ChangeLog:
>   - added --trunk, --tags and --branches command line options for
>     specifying relative repository paths
>   - changed the default behavior to import into an existing repository
>   - added a command line option --create for creating a new repository
>   - added infrastructure for handling branches
>
> Regards,
> Mark
>
>------------------------------------------------------------------------
>
>--- ../../cvs2svn/cvs2svn/cvs2svn.py	2002-10-23 06:27:10.000000000 +0200
>+++ ./cvs2svn.py	2002-10-24 20:21:41.000000000 +0200
>@@ -140,6 +140,12 @@
>     self.revs.write('%08lx %s %s %s %s\n' % (timestamp, digest,
>                                              op, revision, self.fname))
> 
>+def branch_path(ctx, branch_name = None):
>+  if branch_name == None:
>
Minor nit: None is a unique object, so you can/should test with "is" 
rather than "==". This is not a showstopper, though.

+1 for applying options.dff and usagectx.diff (should be applied on top 
of the former, right?). Greg, any objections?


-- 
Brane Čibej   <br...@xbc.nu>   http://www.xbc.nu/brane/


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