Rev 484: Create shared repositories by default when using svn-import. in file:///home/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

------------------------------------------------------------
revno: 484
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2007-06-17 19:09:46 +0200
message:
  Create shared repositories by default when using svn-import.
modified:
  __init__.py
  convert.py
=== modified file '__init__.py'
--- a/__init__.py	2007-05-30 23:18:47 +0000
+++ b/__init__.py	2007-06-17 17:09:46 +0000
@@ -112,16 +112,16 @@
     """
     takes_args = ['from_location', 'to_location?']
     takes_options = [Option('trees', help='Create working trees'),
-                     Option('shared', help='Create shared repository'),
+                     Option('standalone', help='Create standalone branches'),
                      Option('all', 
                          help='Convert all revisions, even those not in '
-                              'current branch history (implies --shared)'),
+                              'current branch history (forbids --standalone)'),
                      Option('scheme', type=get_scheme,
                          help='Branching scheme (none, trunk, or trunk-INT)')]
 
     @display_command
     def run(self, from_location, to_location=None, trees=False, 
-            shared=False, scheme=None, all=False):
+            standalone=False, scheme=None, all=False):
         from convert import convert_repository
         from scheme import TrunkBranchingScheme
 
@@ -132,9 +132,9 @@
             to_location = os.path.basename(from_location.rstrip("/\\"))
 
         if all:
-            shared = True
-        convert_repository(from_location, to_location, scheme, shared, trees,
-                           all)
+            standalone = False
+        convert_repository(from_location, to_location, scheme, standalone, 
+                trees, all)
 
 
 register_command(cmd_svn_import)

=== modified file 'convert.py'
--- a/convert.py	2007-06-17 12:18:41 +0000
+++ b/convert.py	2007-06-17 17:09:46 +0000
@@ -70,6 +70,17 @@
 
 def convert_repository(url, output_url, scheme, create_shared_repo=True, 
                        working_trees=False, all=False):
+    """Convert a Subversion repository and its' branches to a 
+    Bazaar repository.
+
+    :param url: URL of the Subversion repository
+    :param output_url: URL to write Bazaar repository to.
+    :param scheme: Branching scheme (object) to use
+    :param create_shared_repo: Whether to create a shared Bazaar repository
+    :param working_trees: Whether to create working trees
+    :param all: Whether old revisions, even those not part of any existing 
+        branches, should be imported
+    """
     assert not all or create_shared_repo
 
     if os.path.isfile(url):