[1.13][merge] set default format to 1.9 and tweak remote branch stacking

Martin Pool mbp at canonical.com
Fri Mar 6 10:12:27 GMT 2009


This

 * sets the default repository format to 1.9, which is straightforward
but needs a few changes to blackbox tests that include the format
number

 * adds reprs for some objects

 * changes RemoteBranchFormat so that it declares it may support
stacking, unless the specified underlying format is known not to.  I'm
not sure that's totally right in the case of eg a remotebranch to
which we have not yet connected and so know nothing about the format,
but it's closer.

 * adds an assertLength test assertion to help with eg checks about
how many rpcs are made

Unfortunately this still has some test failures to do with stacking on
remotebranches and choosing the right format, but I'm going to share
it now.


^^^^[log from bzrlib.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_clone_ignores_policy_for_unsupported_formats]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/mbp/bzr/default-format/bzrlib/tests/test_bzrdir.py",
line 479, in test_clone_ignores_policy_for_unsupported_formats
    new_child = child_branch.bzrdir.clone_on_transport(new_child_transport)
  File "/home/mbp/bzr/default-format/bzrlib/bzrdir.py", line 233, in
clone_on_transport
    make_working_trees, local_repo.is_shared())
  File "/home/mbp/bzr/default-format/bzrlib/bzrdir.py", line 3138, in
acquire_repository
    possible_transports=[self._bzrdir.transport])
  File "/home/mbp/bzr/default-format/bzrlib/bzrdir.py", line 3095, in
_add_fallback
    repository.add_fallback_repository(stacked_repo)
  File "/home/mbp/bzr/default-format/bzrlib/repository.py", line 633,
in add_fallback_repository
    raise errors.UnstackableRepositoryFormat(self._format, self.base)
UnstackableRepositoryFormat: The repository
'file:///tmp/testbzr-0tcOEf.tmp/bzrlib.tests.test_bzrdir.TestRepositoryAcquisitionPolicy.test_clone_ignores_policy_for_unsupported_formats/work/.bzr/child2/.bzr/repository/'(<RepositoryFormatKnitPack1>)
is not a stackable format. You will need to upgrade the repository to
permit branch stacking.


-- 
Martin <http://launchpad.net/~mbp/>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20090306-default-format.diff
Type: text/x-patch
Size: 27586 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090306/1f6373a6/attachment-0001.bin 


More information about the bazaar mailing list