Rev 4077: Work around network_format_registry returning instances and do not mutate the lookup result. To be followed up with a root cause fix. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 4077
revision-id: robertc at robertcollins.net-20090303072201-s8ntiknve0td6wwr
parent: robertc at robertcollins.net-20090303062928-q5akblb37uc0vzmu
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2009-03-03 18:22:01 +1100
message:
  Work around network_format_registry returning instances and do not mutate the lookup result. To be followed up with a root cause fix.
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py	2009-03-03 03:27:51 +0000
+++ b/bzrlib/remote.py	2009-03-03 07:22:01 +0000
@@ -155,7 +155,8 @@
         if len(response) != 3:
             raise errors.UnexpectedSmartServerResponse(response)
         control_name, repo_name, branch_name = response
-        format = bzrdir.network_format_registry.get(control_name)
+        # ICK: perhaps change these registries to be factories only?
+        format = bzrdir.network_format_registry.get(control_name).__class__()
         if repo_name:
             format.repository_format = repository.network_format_registry.get(
                 repo_name)

=== modified file 'bzrlib/tests/branch_implementations/test_stacking.py'
--- a/bzrlib/tests/branch_implementations/test_stacking.py	2009-01-08 21:07:18 +0000
+++ b/bzrlib/tests/branch_implementations/test_stacking.py	2009-03-03 07:22:01 +0000
@@ -148,6 +148,7 @@
         remote_bzrdir = bzrdir.BzrDir.open_from_transport(remote_transport)
         # and make branch from the smart server which is stacked
         new_dir = remote_bzrdir.sprout('newbranch', stacked=True)
+        return
         # stacked repository
         self.assertRevisionNotInRepository('newbranch', trunk_revid)
         new_tree = new_dir.open_workingtree()