Rev 5461: (gz) Fix signature of RemoteBzrDir.create_workingtree (Neil in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Tue Oct 5 21:39:11 BST 2010


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5461 [merge]
revision-id: pqm at pqm.ubuntu.com-20101005203907-tc90rcruoountj6x
parent: pqm at pqm.ubuntu.com-20101005200135-m2ukhee6419tisfw
parent: mbp at sourcefrog.net-20100929035503-09oulhx1d61ya1hc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2010-10-05 21:39:07 +0100
message:
  (gz) Fix signature of RemoteBzrDir.create_workingtree (Neil
   Martinsen-Burrell) (Martin Pool)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20100829143338-2uachgod1c3liktl-1
=== modified file 'NEWS'
--- a/NEWS	2010-10-01 08:49:39 +0000
+++ b/NEWS	2010-10-05 20:39:07 +0000
@@ -324,6 +324,9 @@
   connections to pre-1.6 bzr+ssh servers to fail, and causing warnings on
   stderr in some other circumstances.  (Andrew Bennetts, #633745)
 
+* Fix signature of RemoteBzrDir.create_workingtree to match that of its
+  superclass.  (Neil Martinsen-Burrell, Martin Pool, #524627)
+
 * Fix spurious paramiko warning on hardy by ensuring that ``selftest``
   properly remove its warning filter. (Vincent Ladeuil, #625686)
 

=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2010-08-28 11:20:04 +0000
+++ b/bzrlib/remote.py	2010-09-26 02:27:37 +0000
@@ -271,7 +271,8 @@
         self._real_bzrdir.destroy_branch(name=name)
         self._next_open_branch_result = None
 
-    def create_workingtree(self, revision_id=None, from_branch=None):
+    def create_workingtree(self, revision_id=None, from_branch=None,
+        accelerator_tree=None, hardlink=False):
         raise errors.NotLocalUrl(self.transport.base)
 
     def find_branch_format(self, name=None):

=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2010-09-25 20:08:01 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2010-10-05 20:39:07 +0000
@@ -169,7 +169,14 @@
         TestSkipped.  Returns the newly created working tree.
         """
         try:
-            return a_bzrdir.create_workingtree()
+            # This passes in many named options to make sure they're
+            # understood by subclasses: see
+            # <https://bugs.launchpad.net/bzr/+bug/524627>.
+            return a_bzrdir.create_workingtree(
+                revision_id=None,
+                from_branch=None,
+                accelerator_tree=None,
+                hardlink=False)
         except errors.NotLocalUrl:
             raise TestSkipped("cannot make working tree with transport %r"
                               % a_bzrdir.transport)




More information about the bazaar-commits mailing list