Rev 447: merge offline revisions. in file:///home/jelmer/bzr-svn/0.3/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-svn/0.3/

------------------------------------------------------------
revno: 447
revision-id: jelmer at samba.org-20070429150201-luf9gqyyscj1ee10
parent: jelmer at samba.org-20070425142442-b8gw64dz2nxtw2z1
parent: jelmer at samba.org-20070426131316-hg3jf00jfksudw36
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.3
timestamp: Sun 2007-04-29 17:02:01 +0200
message:
  merge offline revisions.
modified:
  checkout.py                    workingtree.py-20060306120941-b083cb0fdd4a69de
  format.py                      format.py-20060406233823-b6fa009fe35dfde7
  tests/test_radir.py            test_radir.py-20061231173434-31utf9o4byu7wktm-1
    ------------------------------------------------------------
    revno: 446.1.1
    merged: jelmer at samba.org-20070426131316-hg3jf00jfksudw36
    parent: jelmer at samba.org-20070425142442-b8gw64dz2nxtw2z1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.3
    timestamp: Thu 2007-04-26 15:13:16 +0200
    message:
      Fix compatibility with latest bzr.dev.
=== modified file 'checkout.py'
--- a/checkout.py	2007-04-15 16:13:00 +0000
+++ b/checkout.py	2007-04-26 13:13:16 +0000
@@ -639,7 +639,7 @@
     def clone(self, path, revision_id=None, force_new_repo=False):
         raise NotImplementedError(self.clone)
 
-    def open_workingtree(self, _unsupported=False):
+    def open_workingtree(self, _unsupported=False, recommend_upgrade=False):
         return SvnWorkingTree(self, self.local_path, self.open_branch())
 
     def sprout(self, url, revision_id=None, force_new_repo=False, 

=== modified file 'format.py'
--- a/format.py	2007-04-25 14:24:42 +0000
+++ b/format.py	2007-04-26 13:13:16 +0000
@@ -102,7 +102,8 @@
             transport = SvnRaTransport(self.svn_root_url)
         return SvnRepository(self, transport)
 
-    def open_workingtree(self):
+    def open_workingtree(self, _unsupported=False,
+            recommend_upgrade=True):
         """See BzrDir.open_workingtree().
 
         Will always raise NotLocalUrl as this 

=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py	2007-04-25 14:24:42 +0000
+++ b/tests/test_radir.py	2007-04-26 13:13:16 +0000
@@ -34,6 +34,11 @@
         x = BzrDir.open(repos_url)
         self.assertRaises(NoWorkingTree, x.open_workingtree)
 
+    def test_open_workingtree_recommend_arg(self):
+        repos_url = self.make_client("d", "dc")
+        x = BzrDir.open(repos_url)
+        self.assertRaises(NoWorkingTree, lambda: x.open_workingtree(recommend_upgrade=True))
+
     def test_create_workingtree(self):
         repos_url = self.make_client("d", "dc")
         x = BzrDir.open(repos_url)