[MERGE] Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
Matt Nordhoff
mnordhoff at mattnordhoff.com
Sun Feb 15 07:22:01 GMT 2009
Robert Collins wrote:
> This branch is needed to let a test of 'bzr push bzr+ssh://host/foo'
> work. Its needed because we were not actually using the smart server for
> new branches, and when we dove down into that we found rather more rot
> than expected. So this branch:
> - fixes RemoteBranch to fire hooks as other Branch implementations do
> - fixes branch_implementation tests to handle RemoteBranch
> - fixes branch_implementation tests to break if self.make_branch() does
> not give back the format under test.
>
> -Rob
A couple super-trivial comments (all of them about comments, in fact)...
> === modified file 'bzrlib/bzrdir.py'
> + repository_format = property(__return_repository_format,
> + BzrDirMetaFormat1._set_repository_format) #.im_func)
Was leaving the "#.im_func)" bit in intentional?
> === modified file 'bzrlib/remote.py'
> + # delegate to a real object at this point (remoteBzrDir delegate to the
> + # repository format which would lead to infinite recursion).
That should be "RemoteBzrDir", not "remoteBzrDir".
Actually, should the next word be "delegates" too?
> === modified file 'bzrlib/tests/branch_implementations/test_sprout.py'
> # Start with a format that is unlikely to be the target format
> + # We call the super class to allow overriding the format of creation)
Remove the ")"?
--
More information about the bazaar
mailing list