[RFC][MERGE] bzrdir phase 3

[John A Meinel]

Robert Collins wrote:
> Okies, this is the end of the bzrdir get-things-roughly-right work.
> 
> I've consolidated the locks so that format 6 branches only ever lock
> things once - ditto format 4 and 5. That should fix the windows problems
> bzrdir introduced. 
> 
> upgrade has been taught to use the bzrdir format knowledge, so a new
> bzrdir format can just be plugged in. This can be made more useful, but
> not until we have some extra details like multiple repository formats
> within a metaformat, or a desire for multiple 'active' formats (i.e. a
> ForeignBranch implementation might want to replace the entire metadir
> instance). I will work on this some more as part of the VersionedFile
> work.
> 
> the upgrade ui reports more useful stuff with checkouts, and I've
> sketched out the ui as no-op ui tests for upgrading repositories and
> branches. They still are not coded, but I want to get the core code up
> for review before the diff grows anymore. Its at 1000 lines of
> alterations, but much of that is due to moving the conversion logic from
> upgrade.py into bzrdir.py. (The idea is that the converter is owned by
> the bzrdir it converts from).

I think I understand some of that. But it seems like you should have the
converter owned by the target format, not by the source. Just from a
conceptual 'new stuff would know about old stuff, but old stuff wouldn't
know about new stuff'.

At the same time, how do you handle the chained upgrades? (The old code
upgraded from 4->5, then 5->6). Maybe I'll find out when I actually
review the changes. :)

> 
> Oh, also a couple of cleanups like removing bzrlib.BZRDIR.
> 
> Hmm, I'm going to do one more change before merging this, but it should
> not affect the review - I'm going to add ui support for 'bzr upgrade
> --format=metadir' so that we bleeding edge junkies can upgrade from the
> console rather than needing to use the library.
> 
> That will be just passing in the desired format to upgrade, and from
> there to 'needs_format_upgrade'.
> 
> Rob

I'm not bothering to review this patch, since you have already submitted
the new one.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060216/bcce3b78/attachment.pgp