diff -Nru breezy-3.0.0~bzr6999/breezy/bzr/groupcompress_repo.py breezy-3.0.0~bzr7000/breezy/bzr/groupcompress_repo.py --- breezy-3.0.0~bzr6999/breezy/bzr/groupcompress_repo.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/bzr/groupcompress_repo.py 2018-06-29 20:32:07.000000000 +0000 @@ -50,7 +50,7 @@ Pack, NewPack, PackRepository, - PackRootCommitBuilder, + PackCommitBuilder, RepositoryPackCollection, RepositoryFormatPack, ResumedPack, @@ -1356,7 +1356,7 @@ repository_class = CHKInventoryRepository supports_external_lookups = True supports_chks = True - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True _serializer = chk_serializer.chk_bencode_serializer _commit_inv_deltas = True diff -Nru breezy-3.0.0~bzr6999/breezy/bzr/knitpack_repo.py breezy-3.0.0~bzr7000/breezy/bzr/knitpack_repo.py --- breezy-3.0.0~bzr6999/breezy/bzr/knitpack_repo.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/bzr/knitpack_repo.py 2018-06-29 20:32:07.000000000 +0000 @@ -66,7 +66,6 @@ Packer, PackCommitBuilder, PackRepository, - PackRootCommitBuilder, RepositoryPackCollection, ) from ..sixish import ( @@ -188,7 +187,7 @@ """ repository_class = KnitPackRepository - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True experimental = True supports_tree_reference = True @@ -228,7 +227,7 @@ """ repository_class = KnitPackRepository - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True supports_tree_reference = False @property @@ -306,7 +305,7 @@ """ repository_class = KnitPackRepository - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True supports_tree_reference = False # no subtrees supports_external_lookups = True @@ -350,7 +349,7 @@ """ repository_class = KnitPackRepository - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True supports_tree_reference = False # no subtrees @@ -430,7 +429,7 @@ """ repository_class = KnitPackRepository - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True supports_tree_reference = False # no subtrees supports_external_lookups = True @@ -470,7 +469,7 @@ """ repository_class = KnitPackRepository - _commit_builder_class = PackRootCommitBuilder + _commit_builder_class = PackCommitBuilder rich_root_data = True experimental = True supports_tree_reference = True diff -Nru breezy-3.0.0~bzr6999/breezy/bzr/knitrepo.py breezy-3.0.0~bzr7000/breezy/bzr/knitrepo.py --- breezy-3.0.0~bzr6999/breezy/bzr/knitrepo.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/bzr/knitrepo.py 2018-06-29 20:32:07.000000000 +0000 @@ -50,7 +50,6 @@ MetaDirVersionedFileRepository, MetaDirVersionedFileRepositoryFormat, VersionedFileCommitBuilder, - VersionedFileRootCommitBuilder, ) @@ -398,7 +397,7 @@ """ repository_class = KnitRepository - _commit_builder_class = VersionedFileRootCommitBuilder + _commit_builder_class = VersionedFileCommitBuilder rich_root_data = True experimental = True supports_tree_reference = True @@ -441,7 +440,7 @@ """ repository_class = KnitRepository - _commit_builder_class = VersionedFileRootCommitBuilder + _commit_builder_class = VersionedFileCommitBuilder rich_root_data = True supports_tree_reference = False @property diff -Nru breezy-3.0.0~bzr6999/breezy/bzr/pack_repo.py breezy-3.0.0~bzr7000/breezy/bzr/pack_repo.py --- breezy-3.0.0~bzr6999/breezy/bzr/pack_repo.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/bzr/pack_repo.py 2018-06-29 20:32:07.000000000 +0000 @@ -71,7 +71,6 @@ MetaDirVersionedFileRepository, MetaDirVersionedFileRepositoryFormat, VersionedFileCommitBuilder, - VersionedFileRootCommitBuilder, ) from ..trace import ( mutter, @@ -96,28 +95,6 @@ self._file_graph = graph.Graph( repository._pack_collection.text_index.combined_index) - def _heads(self, file_id, revision_ids): - keys = [(file_id, revision_id) for revision_id in revision_ids] - return {key[1] for key in self._file_graph.heads(keys)} - - -class PackRootCommitBuilder(VersionedFileRootCommitBuilder): - """A subclass of RootCommitBuilder to add texts with pack semantics. - - Specifically this uses one knit object rather than one knit object per - added text, reducing memory and object pressure. - """ - - def __init__(self, repository, parents, config, timestamp=None, - timezone=None, committer=None, revprops=None, - revision_id=None, lossy=False): - super(PackRootCommitBuilder, self).__init__(repository, parents, - config, timestamp=timestamp, timezone=timezone, - committer=committer, revprops=revprops, revision_id=revision_id, - lossy=lossy) - self._file_graph = graph.Graph( - repository._pack_collection.text_index.combined_index) - def _heads(self, file_id, revision_ids): keys = [(file_id, revision_id) for revision_id in revision_ids] return {key[1] for key in self._file_graph.heads(keys)} diff -Nru breezy-3.0.0~bzr6999/breezy/bzr/remote.py breezy-3.0.0~bzr7000/breezy/bzr/remote.py --- breezy-3.0.0~bzr6999/breezy/bzr/remote.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/bzr/remote.py 2018-06-29 20:32:07.000000000 +0000 @@ -1868,10 +1868,7 @@ raise errors.BzrError("Cannot commit directly to a stacked branch" " in pre-2a formats. See " "https://bugs.launchpad.net/bzr/+bug/375013 for details.") - if self._format.rich_root_data: - commit_builder_kls = vf_repository.VersionedFileRootCommitBuilder - else: - commit_builder_kls = vf_repository.VersionedFileCommitBuilder + commit_builder_kls = vf_repository.VersionedFileCommitBuilder result = commit_builder_kls(self, parents, config, timestamp, timezone, committer, revprops, revision_id, lossy) diff -Nru breezy-3.0.0~bzr6999/breezy/bzr/vf_repository.py breezy-3.0.0~bzr7000/breezy/bzr/vf_repository.py --- breezy-3.0.0~bzr6999/breezy/bzr/vf_repository.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/bzr/vf_repository.py 2018-06-29 20:32:07.000000000 +0000 @@ -111,9 +111,6 @@ """Commit builder implementation for versioned files based repositories. """ - # the default CommitBuilder does not manage trees whose root is versioned. - _versioned_root = False - def __init__(self, repository, parents, config_stack, timestamp=None, timezone=None, committer=None, revprops=None, revision_id=None, lossy=False): @@ -244,6 +241,8 @@ :param tree: The tree which is being committed. """ + if self.repository.supports_rich_root(): + return if len(self.parents) == 0: raise errors.RootMissing() entry = entry_factory['directory'](tree.path2id(''), '', @@ -561,23 +560,6 @@ nostore_sha=nostore_sha, random_id=self.random_revid)[0:2] -class VersionedFileRootCommitBuilder(VersionedFileCommitBuilder): - """This commitbuilder actually records the root id""" - - # the root entry gets versioned properly by this builder. - _versioned_root = True - - def _require_root_change(self, tree): - """Enforce an appropriate root object change. - - This is called once when record_iter_changes is called, if and only if - the root was not in the delta calculated by record_iter_changes. - - :param tree: The tree which is being committed. - """ - # versioned roots do not change unless the tree found a change. - - class VersionedFileRepository(Repository): """Repository holding history for one or more branches. diff -Nru breezy-3.0.0~bzr6999/breezy/tests/test_foreign.py breezy-3.0.0~bzr7000/breezy/tests/test_foreign.py --- breezy-3.0.0~bzr6999/breezy/tests/test_foreign.py 2018-06-27 00:03:12.000000000 +0000 +++ breezy-3.0.0~bzr7000/breezy/tests/test_foreign.py 2018-06-29 20:32:07.000000000 +0000 @@ -123,7 +123,7 @@ return (revno, revid) -class DummyForeignCommitBuilder(vf_repository.VersionedFileRootCommitBuilder): +class DummyForeignCommitBuilder(vf_repository.VersionedFileCommitBuilder): def _generate_revision_if_needed(self, revid): mapping = DummyForeignVcsMapping(DummyForeignVcs()) diff -Nru breezy-3.0.0~bzr6999/debian/bzr-builder.manifest breezy-3.0.0~bzr7000/debian/bzr-builder.manifest --- breezy-3.0.0~bzr6999/debian/bzr-builder.manifest 2018-06-27 00:08:22.000000000 +0000 +++ breezy-3.0.0~bzr7000/debian/bzr-builder.manifest 2018-06-29 20:39:05.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.4 deb-version 3.0.0~bzr6999-0~bzr4267 -lp:brz revid:breezy.the.bot@gmail.com-20180626001625-9ywfglmbtsw04dmd +# bzr-builder format 0.4 deb-version 3.0.0~bzr7000-0~bzr4267 +lp:brz revid:breezy.the.bot@gmail.com-20180629201703-zsf3up700api5huh merge packaging lp:~brz/brz/debian revid:jelmer@blodeuwedd-20180531002136-oy45ooo46fxemtfv diff -Nru breezy-3.0.0~bzr6999/debian/changelog breezy-3.0.0~bzr7000/debian/changelog --- breezy-3.0.0~bzr6999/debian/changelog 2018-06-27 00:08:22.000000000 +0000 +++ breezy-3.0.0~bzr7000/debian/changelog 2018-06-29 20:39:05.000000000 +0000 @@ -1,8 +1,8 @@ -breezy (3.0.0~bzr6999-0~bzr4267~ubuntu17.10.1) artful; urgency=low +breezy (3.0.0~bzr7000-0~bzr4267~ubuntu17.10.1) artful; urgency=low * Auto build. - -- Launchpad Package Builder Wed, 27 Jun 2018 00:08:22 +0000 + -- Launchpad Package Builder Fri, 29 Jun 2018 20:39:05 +0000 breezy (3.0.0~bzr6977-2) UNRELEASED; urgency=medium