Rev 445: Fix compatibility with bzr.dev. in sftp://people.samba.org/~/bzr/bzr-svn/0.3/

[Jelmer Vernooij]

At sftp://people.samba.org/~/bzr/bzr-svn/0.3/

------------------------------------------------------------
revno: 445
revision-id: jelmer at samba.org-20070415161300-w8q2nd1f32e4ik16
parent: jelmer at samba.org-20070408133954-7eltt6nsd6orgvnw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-04-15 18:13:00 +0200
message:
  Fix compatibility with bzr.dev.
modified:
  TODO                           todo-20060729211917-2kpobww0zyvvo0j2-1
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
  format.py                      format.py-20060406233823-b6fa009fe35dfde7
=== modified file 'TODO'
--- a/TODO	2007-04-03 12:51:01 +0000
+++ b/TODO	2007-04-15 16:13:00 +0000
@@ -1,3 +1,4 @@
+- rename 'main' to 0.4
 - simplify find_branches by using Transport.list_dir() ?
 - make scheme name part of revision id / support multiple branching schemes per repository
 - fix commits in heavyweight checkouts somehow

=== modified file 'checkout.py'
--- a/checkout.py	2007-04-03 12:51:01 +0000
+++ b/checkout.py	2007-04-15 16:13:00 +0000
@@ -636,19 +636,19 @@
         if not self.scheme.is_branch(self.branch_path):
             raise NotBranchError(path=self.transport.base)
 
-    def clone(self, path, revision_id=None, basis=None, force_new_repo=False):
+    def clone(self, path, revision_id=None, force_new_repo=False):
         raise NotImplementedError(self.clone)
 
     def open_workingtree(self, _unsupported=False):
         return SvnWorkingTree(self, self.local_path, self.open_branch())
 
-    def sprout(self, url, revision_id=None, basis=None, force_new_repo=False, 
+    def sprout(self, url, revision_id=None, force_new_repo=False, 
                recurse='down'):
         # FIXME: honor force_new_repo
         # FIXME: Use recurse
         result = BzrDirFormat.get_default_format().initialize(url)
         repo = self.find_repository()
-        repo.clone(result, revision_id, basis)
+        repo.clone(result, revision_id)
         branch = self.open_branch()
         branch.sprout(result, revision_id)
         result.create_workingtree()

=== modified file 'format.py'
--- a/format.py	2007-04-03 12:51:01 +0000
+++ b/format.py	2007-04-15 16:13:00 +0000
@@ -54,27 +54,27 @@
                 self.branch_path != ""):
             raise NotBranchError(path=self.root_transport.base)
 
-    def clone(self, url, revision_id=None, basis=None, force_new_repo=False):
+    def clone(self, url, revision_id=None, force_new_repo=False):
         """See BzrDir.clone().
 
         Not supported on Subversion connections.
         """
         raise NotImplementedError(SvnRemoteAccess.clone)
 
-    def sprout(self, url, revision_id=None, basis=None, force_new_repo=False,
+    def sprout(self, url, revision_id=None, force_new_repo=False,
             recurse='down'):
         """See BzrDir.sprout()."""
         # FIXME: Use recurse
         result = BzrDirFormat.get_default_format().initialize(url)
         repo = self.find_repository()
         if force_new_repo:
-            result_repo = repo.clone(result, revision_id, basis)
+            result_repo = repo.clone(result, revision_id)
         else:
             try:
                 result_repo = result.find_repository()
                 result_repo.fetch(repo, revision_id=revision_id)
             except NoRepositoryPresent:
-                result_repo = repo.clone(result, revision_id, basis)
+                result_repo = repo.clone(result, revision_id)
 
         branch = self.open_branch()
         result_branch = branch.sprout(result, revision_id)