Code review comment for lp:~lifeless/bzr/bug-398668

Revision history for this message
John A Meinel (jameinel) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...

> # The following format should be an alias for the rich root equivalent
> # of the default format
> format_registry.register_metadir('default-rich-root',
> - 'bzrlib.repofmt.pack_repo.RepositoryFormatKnitPack4',
> - help='Default format, rich root variant. (needed for bzr-svn and bzr-git).',
> - branch_format='bzrlib.branch.BzrBranchFormat6',
> - tree_format='bzrlib.workingtree.WorkingTreeFormat4',
> + 'bzrlib.repofmt.groupcompress_repo.RepositoryFormat2a',
> + branch_format='bzrlib.branch.BzrBranchFormat7',
> + tree_format='bzrlib.workingtree.WorkingTreeFormat6',
> alias=True,
> - )
> + help='Same as 2a.')
> +
> # The current format that is made on 'bzr init'.
> -format_registry.set_default('pack-0.92')
> +format_registry.set_default('2a')

^- I'm 75% sure that we want the default WT format to be
"WorkingTreeFormat5" and not 6. 5 includes support for filters, 6
brings in support for 'views'. And View support was considered
incomplete, and thus why it was split out into a different format.

...

v- Obviously changing the above to '5' will bump all of these as well.

> Format:
> control: Meta directory format 1
> - working tree: Working tree format 4
> + working tree: Working tree format 6
> branch: Branch format 4
> repository: Weave repository format 6
>
> @@ -453,7 +449,7 @@
>
...

> -__default_format = WorkingTreeFormat4()
> +__default_format = WorkingTreeFormat6()
> WorkingTreeFormat.register_format(__default_format)
> -WorkingTreeFormat.register_format(WorkingTreeFormat6())
> WorkingTreeFormat.register_format(WorkingTreeFormat5())
> +WorkingTreeFormat.register_format(WorkingTreeFormat4())
> WorkingTreeFormat.register_format(WorkingTreeFormat3())
> WorkingTreeFormat.set_default_format(__default_format)
> # formats which have no format string are not discoverable

^- This would also be effected.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqKrzsACgkQJdeBCYSNAAONjACgnQBU95OlegGgtPzeaPVesvxO
/p0AnR+zohxUXfeHnv3QfQ3Q4RT+tcAc
=3UXs
-----END PGP SIGNATURE-----

« Back to merge proposal