> # 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/
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
...
> # The following format should be an alias for the rich root equivalent registry. register_ metadir( 'default- rich-root' , repofmt. pack_repo. RepositoryForma tKnitPack4' , format= 'bzrlib. branch. BzrBranchFormat 6', 'bzrlib. workingtree. WorkingTreeForm at4', repofmt. groupcompress_ repo.Repository Format2a' , format= 'bzrlib. branch. BzrBranchFormat 7', 'bzrlib. workingtree. WorkingTreeForm at6', registry. set_default( 'pack-0. 92') registry. set_default( '2a')
> # of the default format
> format_
> - 'bzrlib.
> - help='Default format, rich root variant. (needed for bzr-svn and bzr-git).',
> - branch_
> - tree_format=
> + 'bzrlib.
> + branch_
> + tree_format=
> alias=True,
> - )
> + help='Same as 2a.')
> +
> # The current format that is made on 'bzr init'.
> -format_
> +format_
^- I'm 75% sure that we want the default WT format to be mat5" and not 6. 5 includes support for filters, 6
"WorkingTreeFor
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 = WorkingTreeForm at4() at6() at.register_ format( __default_ format) mat.register_ format( WorkingTreeForm at6()) at.register_ format( WorkingTreeForm at5()) mat.register_ format( WorkingTreeForm at4()) at.register_ format( WorkingTreeForm at3()) at.set_ default_ format( __default_ format)
> +__default_format = WorkingTreeForm
> WorkingTreeForm
> -WorkingTreeFor
> WorkingTreeForm
> +WorkingTreeFor
> WorkingTreeForm
> WorkingTreeForm
> # formats which have no format string are not discoverable
^- This would also be effected.
John enigmail. mozdev. org/
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkq KrzsACgkQJdeBCY SNAAONjACgnQBU9 5OlegGgtPzeaPVe svxO zohxUXfeHnv3QfQ 3Q4RT+tcAc
/p0AnR+
=3UXs
-----END PGP SIGNATURE-----