[RFC] knitpacks-richroot
John Arbash Meinel
john at arbash-meinel.com
Tue Oct 30 16:02:33 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Jelmer Vernooij wrote:
> Am Dienstag, den 30.10.2007, 09:16 -0400 schrieb Aaron Bentley:
>> Jelmer Vernooij wrote:
>>> On Tue, Oct 30, 2007 at 08:06:18AM -0400, Aaron Bentley wrote:
>>> I would still like to propose a --knitpacks-richroot format or
>>> something, for use by bzr-svn, if subtrees are some time off. The
>>> watershed has to happen at some point in time anyway, may as well be now.
>> As a non-default format, I think this would be fine. AIUI, it's trivial
>> to introduce new knitpack formats when only the serializer is different.
>>
>> Putting it in soon would reduce the effect of the watershed as the
>> format becomes more common. I'm somewhat inclined to emit a warning at
>> init time about its incompatibility with older bzrs.
> Yeah, indeed; warning makes sense. I guess I'll have a look at adding
> such a format then. Any objections or suggestions for the name of such a
> format? Also, there's no need for a knit-variant of this format, is
> there?
>
> Cheers,
>
> Jelmer
>
There is already a "knitpack-subtrees". I would just warn that "upgrading" from
a rich-root + subtrees => just rich-root is a little strange. Just that the
permutations start getting a little weird, and the automatic fetching gets a
bit crazy.
Alternatively, it is pretty simple to just do:
=== modified file 'bzrlib/repofmt/knitrepo.py'
- --- bzrlib/repofmt/knitrepo.py 2007-10-17 09:39:41 +0000
+++ bzrlib/repofmt/knitrepo.py 2007-10-30 16:01:41 +0000
@@ -473,7 +473,7 @@
repository_class = KnitRepository
_commit_builder_class = RootCommitBuilder
rich_root_data = True
- - supports_tree_reference = True
+ supports_tree_reference = False
_serializer = xml7.serializer_v7
def _get_matching_bzrdir(self):
=== modified file 'bzrlib/repofmt/pack_repo.py'
- --- bzrlib/repofmt/pack_repo.py 2007-10-29 04:00:19 +0000
+++ bzrlib/repofmt/pack_repo.py 2007-10-30 16:01:54 +0000
@@ -1708,7 +1708,7 @@
repository_class = KnitPackRepository
_commit_builder_class = PackRootCommitBuilder
rich_root_data = True
- - supports_tree_reference = True
+ supports_tree_reference = False
_serializer = xml7.serializer_v7
def _get_matching_bzrdir(self):
And just claim that Knit3 and PackKnit3 don't actually support tree references.
John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHJ1WYJdeBCYSNAAMRAsVJAKCAg4xgnUIwPz10EharDtTZ5X1vSwCffvyr
CjSLi6HKIFFyNzVsmj/cS6Q=
=LJVf
-----END PGP SIGNATURE-----
More information about the bazaar
mailing list