Rev 984: Use layout in favor of scheme. in file:///data/jelmer/bzr-svn/layout/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/layout/

------------------------------------------------------------
revno: 984
revision-id: jelmer at samba.org-20080502161547-dcoxx133dwnkamwe
parent: jelmer at samba.org-20080502141841-5fcg7smqsfykuelg
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: layout
timestamp: Fri 2008-05-02 18:15:47 +0200
message:
  Use layout in favor of scheme.
modified:
  convert.py                     svn2bzr.py-20051018015439-cb4563bff29e632d
=== modified file 'convert.py'
--- a/convert.py	2008-03-27 00:31:59 +0000
+++ b/convert.py	2008-05-02 16:15:47 +0000
@@ -114,17 +114,17 @@
     if scheme is not None:
         source_repos.set_branching_scheme(scheme)
 
+    layout = source_repos.get_layout()
+
     if create_shared_repo:
         try:
             target_repos = get_dir("").open_repository()
-            assert (source_repos.get_scheme().is_branch("") or 
-                    source_repos.get_scheme().is_tag("") or 
-                    target_repos.is_shared())
+            assert (layout.is_branch("") or layout.is_tag("") or target_repos.is_shared())
         except NoRepositoryPresent:
             target_repos = get_dir("").create_repository(shared=True)
         target_repos.set_make_working_trees(working_trees)
 
-    existing_branches = source_repos.find_branches(scheme=source_repos.get_scheme())
+    existing_branches = source_repos.find_branches(layout=layout)
     if filter_branch is not None:
         existing_branches = filter(filter_branch, existing_branches)