Rev 1615: Add --format option to svn-import. in file:///data/jelmer/bzr-svn/svn-import-format/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/svn-import-format/

------------------------------------------------------------
revno: 1615
revision-id: jelmer at samba.org-20080823102112-n7be15dt71k91257
parent: jelmer at samba.org-20080823101540-0od362oanzhzdved
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: svn-import-format
timestamp: Sat 2008-08-23 12:21:12 +0200
message:
  Add --format option to svn-import.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
=== modified file '__init__.py'
--- a/__init__.py	2008-08-22 16:13:03 +0000
+++ b/__init__.py	2008-08-23 10:21:12 +0000
@@ -31,11 +31,12 @@
 
 """
 import bzrlib
-from bzrlib import log
+from bzrlib import bzrdir, log
 from bzrlib.bzrdir import BzrDirFormat, format_registry
 from bzrlib.errors import BzrError
 from bzrlib.commands import Command, register_command, display_command, Option
 from bzrlib.help_topics import topic_registry
+from bzrlib.option import RegistryOption
 from bzrlib.revisionspec import SPEC_TYPES
 from bzrlib.trace import warning, mutter
 from bzrlib.transport import register_lazy_transport, register_transport_proto
@@ -224,13 +225,19 @@
                          help="Import revisions incrementally."),
                      Option('prefix', type=str, 
                          help='Only consider branches of which path starts '
-                              'with prefix.')
+                              'with prefix.'),
+                     RegistryOption('format',
+                            help='Specify a format for this repository. See'
+                                 ' "bzr help formats" for details.',
+                            registry=bzrdir.format_registry,
+                            converter=bzrdir.format_registry.make_bzrdir,
+                            value_switches=True, title='Repository format'),
                     ]
 
     @display_command
     def run(self, from_location, to_location=None, trees=False, 
             standalone=False, scheme=None, all=False, prefix=None, keep=False,
-            incremental=False):
+            incremental=False, format=None):
         from bzrlib.branch import Branch
         from bzrlib.bzrdir import BzrDir
         from bzrlib.errors import BzrCommandError, NoRepositoryPresent, NotBranchError
@@ -292,7 +299,8 @@
             convert_repository(from_repos, to_location, scheme, None, 
                                not standalone, trees, all, 
                                filter_branch=filter_branch,
-                               keep=keep, incremental=incremental)
+                               keep=keep, incremental=incremental, 
+                               format=format)
 
             if tmp_repos is not None:
                 from bzrlib import osutils