~bzr-pqm/bzr/bzr.dev

# Copyright (C) 2007-2011 Canonical Ltd

#

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by

# the Free Software Foundation; either version 2 of the License, or

# (at your option) any later version.

#

# This program is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of

# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

# GNU General Public License for more details.

#

# You should have received a copy of the GNU General Public License

# along with this program; if not, write to the Free Software

# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

"""Knit-based pack repository formats."""

from bzrlib.lazy_import import lazy_import

lazy_import(globals(), """

from itertools import izip

import time

from bzrlib import (

    bzrdir,

    debug,

    errors,

    knit,

    osutils,

    pack,

    revision as _mod_revision,

    trace,

    tsort,

    ui,

    xml5,

    xml6,

    xml7,

    )

from bzrlib.knit import (

    _KnitGraphIndex,

    KnitPlainFactory,

    KnitVersionedFiles,

    )

""")

from bzrlib import (

    btree_index,

    )

from bzrlib.index import (

    CombinedGraphIndex,

    GraphIndex,

    GraphIndexPrefixAdapter,

    InMemoryGraphIndex,

    )

from bzrlib.repofmt.knitrepo import (

    KnitRepository,

    )

from bzrlib.repofmt.pack_repo import (

    _DirectPackAccess,

    NewPack,

    RepositoryFormatPack,

    ResumedPack,

    Packer,

    PackCommitBuilder,

    PackRepository,

    PackRootCommitBuilder,

    RepositoryPackCollection,

    )

from bzrlib.vf_repository import (

    StreamSource,

    )

class KnitPackRepository(PackRepository, KnitRepository):

    def __init__(self, _format, a_bzrdir, control_files, _commit_builder_class,

        _serializer):

        PackRepository.__init__(self, _format, a_bzrdir, control_files,

            _commit_builder_class, _serializer)

        if self._format.supports_chks:

            raise AssertionError("chk not supported")

        index_transport = self._transport.clone('indices')

        self._pack_collection = KnitRepositoryPackCollection(self,

            self._transport,

            index_transport,

            self._transport.clone('upload'),

            self._transport.clone('packs'),

            _format.index_builder_class,

            _format.index_class,

            use_chk_index=False,

            )

        self.inventories = KnitVersionedFiles(

            _KnitGraphIndex(self._pack_collection.inventory_index.combined_index,

                add_callback=self._pack_collection.inventory_index.add_callback,

                deltas=True, parents=True, is_locked=self.is_locked),

            data_access=self._pack_collection.inventory_index.data_access,

            max_delta_chain=200)

        self.revisions = KnitVersionedFiles(

            _KnitGraphIndex(self._pack_collection.revision_index.combined_index,

                add_callback=self._pack_collection.revision_index.add_callback,

                deltas=False, parents=True, is_locked=self.is_locked,

                track_external_parent_refs=True),

            data_access=self._pack_collection.revision_index.data_access,

            max_delta_chain=0)

        self.signatures = KnitVersionedFiles(

            _KnitGraphIndex(self._pack_collection.signature_index.combined_index,

                add_callback=self._pack_collection.signature_index.add_callback,

                deltas=False, parents=False, is_locked=self.is_locked),

            data_access=self._pack_collection.signature_index.data_access,

            max_delta_chain=0)

        self.texts = KnitVersionedFiles(

            _KnitGraphIndex(self._pack_collection.text_index.combined_index,

                add_callback=self._pack_collection.text_index.add_callback,

                deltas=True, parents=True, is_locked=self.is_locked),

            data_access=self._pack_collection.text_index.data_access,

            max_delta_chain=200)

        self.chk_bytes = None

        # True when the repository object is 'write locked' (as opposed to the

        # physical lock only taken out around changes to the pack-names list.)

        # Another way to represent this would be a decorator around the control

        # files object that presents logical locks as physical ones - if this

        # gets ugly consider that alternative design. RBC 20071011

        self._write_lock_count = 0

        self._transaction = None

        # for tests

        self._reconcile_does_inventory_gc = True

        self._reconcile_fixes_text_parents = True

        self._reconcile_backsup_inventory = False

    def _get_source(self, to_format):

        if to_format.network_name() == self._format.network_name():

            return KnitPackStreamSource(self, to_format)

        return PackRepository._get_source(self, to_format)

    def _reconcile_pack(self, collection, packs, extension, revs, pb):

        packer = KnitReconcilePacker(collection, packs, extension, revs)

        return packer.pack(pb)

class RepositoryFormatKnitPack1(RepositoryFormatPack):

    """A no-subtrees parameterized Pack repository.

    This format was introduced in 0.92.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackCommitBuilder

    @property

    def _serializer(self):

        return xml5.serializer_v5

    # What index classes to use

    index_builder_class = InMemoryGraphIndex

    index_class = GraphIndex

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir('pack-0.92')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar pack repository format 1 (needs bzr 0.92)\n"

    def get_format_description(self):

        """See RepositoryFormat.get_format_description()."""

        return "Packs containing knits without subtree support"

class RepositoryFormatKnitPack3(RepositoryFormatPack):

    """A subtrees parameterized Pack repository.

    This repository format uses the xml7 serializer to get:

     - support for recording full info about the tree root

     - support for recording tree-references

    This format was introduced in 0.92.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackRootCommitBuilder

    rich_root_data = True

    experimental = True

    supports_tree_reference = True

    @property

    def _serializer(self):

        return xml7.serializer_v7

    # What index classes to use

    index_builder_class = InMemoryGraphIndex

    index_class = GraphIndex

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir(

            'pack-0.92-subtree')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar pack repository format 1 with subtree support (needs bzr 0.92)\n"

    def get_format_description(self):

        """See RepositoryFormat.get_format_description()."""

        return "Packs containing knits with subtree support\n"

class RepositoryFormatKnitPack4(RepositoryFormatPack):

    """A rich-root, no subtrees parameterized Pack repository.

    This repository format uses the xml6 serializer to get:

     - support for recording full info about the tree root

    This format was introduced in 1.0.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackRootCommitBuilder

    rich_root_data = True

    supports_tree_reference = False

    @property

    def _serializer(self):

        return xml6.serializer_v6

    # What index classes to use

    index_builder_class = InMemoryGraphIndex

    index_class = GraphIndex

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir(

            'rich-root-pack')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return ("Bazaar pack repository format 1 with rich root"

                " (needs bzr 1.0)\n")

    def get_format_description(self):

        """See RepositoryFormat.get_format_description()."""

        return "Packs containing knits with rich root support\n"

class RepositoryFormatKnitPack5(RepositoryFormatPack):

    """Repository that supports external references to allow stacking.

    New in release 1.6.

    Supports external lookups, which results in non-truncated ghosts after

    reconcile compared to pack-0.92 formats.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackCommitBuilder

    supports_external_lookups = True

    # What index classes to use

    index_builder_class = InMemoryGraphIndex

    index_class = GraphIndex

    @property

    def _serializer(self):

        return xml5.serializer_v5

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir('1.6')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar RepositoryFormatKnitPack5 (bzr 1.6)\n"

    def get_format_description(self):

        """See RepositoryFormat.get_format_description()."""

        return "Packs 5 (adds stacking support, requires bzr 1.6)"

class RepositoryFormatKnitPack5RichRoot(RepositoryFormatPack):

    """A repository with rich roots and stacking.

    New in release 1.6.1.

    Supports stacking on other repositories, allowing data to be accessed

    without being stored locally.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackRootCommitBuilder

    rich_root_data = True

    supports_tree_reference = False # no subtrees

    supports_external_lookups = True

    # What index classes to use

    index_builder_class = InMemoryGraphIndex

    index_class = GraphIndex

    @property

    def _serializer(self):

        return xml6.serializer_v6

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir(

            '1.6.1-rich-root')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6.1)\n"

    def get_format_description(self):

        return "Packs 5 rich-root (adds stacking support, requires bzr 1.6.1)"

class RepositoryFormatKnitPack5RichRootBroken(RepositoryFormatPack):

    """A repository with rich roots and external references.

    New in release 1.6.

    Supports external lookups, which results in non-truncated ghosts after

    reconcile compared to pack-0.92 formats.

    This format was deprecated because the serializer it uses accidentally

    supported subtrees, when the format was not intended to. This meant that

    someone could accidentally fetch from an incorrect repository.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackRootCommitBuilder

    rich_root_data = True

    supports_tree_reference = False # no subtrees

    supports_external_lookups = True

    # What index classes to use

    index_builder_class = InMemoryGraphIndex

    index_class = GraphIndex

    @property

    def _serializer(self):

        return xml7.serializer_v7

    def _get_matching_bzrdir(self):

        matching = bzrdir.format_registry.make_bzrdir(

            '1.6.1-rich-root')

        matching.repository_format = self

        return matching

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar RepositoryFormatKnitPack5RichRoot (bzr 1.6)\n"

    def get_format_description(self):

        return ("Packs 5 rich-root (adds stacking support, requires bzr 1.6)"

                " (deprecated)")

    def is_deprecated(self):

        return True

class RepositoryFormatKnitPack6(RepositoryFormatPack):

    """A repository with stacking and btree indexes,

    without rich roots or subtrees.

    This is equivalent to pack-1.6 with B+Tree indices.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackCommitBuilder

    supports_external_lookups = True

    # What index classes to use

    index_builder_class = btree_index.BTreeBuilder

    index_class = btree_index.BTreeGraphIndex

    @property

    def _serializer(self):

        return xml5.serializer_v5

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir('1.9')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar RepositoryFormatKnitPack6 (bzr 1.9)\n"

    def get_format_description(self):

        """See RepositoryFormat.get_format_description()."""

        return "Packs 6 (uses btree indexes, requires bzr 1.9)"

class RepositoryFormatKnitPack6RichRoot(RepositoryFormatPack):

    """A repository with rich roots, no subtrees, stacking and btree indexes.

    1.6-rich-root with B+Tree indices.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackRootCommitBuilder

    rich_root_data = True

    supports_tree_reference = False # no subtrees

    supports_external_lookups = True

    # What index classes to use

    index_builder_class = btree_index.BTreeBuilder

    index_class = btree_index.BTreeGraphIndex

    @property

    def _serializer(self):

        return xml6.serializer_v6

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir(

            '1.9-rich-root')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return "Bazaar RepositoryFormatKnitPack6RichRoot (bzr 1.9)\n"

    def get_format_description(self):

        return "Packs 6 rich-root (uses btree indexes, requires bzr 1.9)"

class RepositoryFormatPackDevelopment2Subtree(RepositoryFormatPack):

    """A subtrees development repository.

    This format should be retained in 2.3, to provide an upgrade path from this

    to RepositoryFormat2aSubtree.  It can be removed in later releases.

    1.6.1-subtree[as it might have been] with B+Tree indices.

    """

    repository_class = KnitPackRepository

    _commit_builder_class = PackRootCommitBuilder

    rich_root_data = True

    experimental = True

    supports_tree_reference = True

    supports_external_lookups = True

    # What index classes to use

    index_builder_class = btree_index.BTreeBuilder

    index_class = btree_index.BTreeGraphIndex

    @property

    def _serializer(self):

        return xml7.serializer_v7

    def _get_matching_bzrdir(self):

        return bzrdir.format_registry.make_bzrdir(

            'development5-subtree')

    def _ignore_setting_bzrdir(self, format):

        pass

    _matchingbzrdir = property(_get_matching_bzrdir, _ignore_setting_bzrdir)

    def get_format_string(self):

        """See RepositoryFormat.get_format_string()."""

        return ("Bazaar development format 2 with subtree support "

            "(needs bzr.dev from before 1.8)\n")

    def get_format_description(self):

        """See RepositoryFormat.get_format_description()."""

        return ("Development repository format, currently the same as "

            "1.6.1-subtree with B+Tree indices.\n")

class KnitPackStreamSource(StreamSource):

    """A StreamSource used to transfer data between same-format KnitPack repos.

    This source assumes:

        1) Same serialization format for all objects

        2) Same root information

        3) XML format inventories

        4) Atomic inserts (so we can stream inventory texts before text

           content)

        5) No chk_bytes

    """

    def __init__(self, from_repository, to_format):

        super(KnitPackStreamSource, self).__init__(from_repository, to_format)

        self._text_keys = None

        self._text_fetch_order = 'unordered'

    def _get_filtered_inv_stream(self, revision_ids):

        from_repo = self.from_repository

        parent_ids = from_repo._find_parent_ids_of_revisions(revision_ids)

        parent_keys = [(p,) for p in parent_ids]

        find_text_keys = from_repo._serializer._find_text_key_references

        parent_text_keys = set(find_text_keys(

            from_repo._inventory_xml_lines_for_keys(parent_keys)))

        content_text_keys = set()

        knit = KnitVersionedFiles(None, None)

        factory = KnitPlainFactory()

        def find_text_keys_from_content(record):

            if record.storage_kind not in ('knit-delta-gz', 'knit-ft-gz'):

                raise ValueError("Unknown content storage kind for"

                    " inventory text: %s" % (record.storage_kind,))

            # It's a knit record, it has a _raw_record field (even if it was

            # reconstituted from a network stream).

            raw_data = record._raw_record

            # read the entire thing

            revision_id = record.key[-1]

            content, _ = knit._parse_record(revision_id, raw_data)

            if record.storage_kind == 'knit-delta-gz':

                line_iterator = factory.get_linedelta_content(content)

            elif record.storage_kind == 'knit-ft-gz':

                line_iterator = factory.get_fulltext_content(content)

            content_text_keys.update(find_text_keys(

                [(line, revision_id) for line in line_iterator]))

        revision_keys = [(r,) for r in revision_ids]

        def _filtered_inv_stream():

            source_vf = from_repo.inventories

            stream = source_vf.get_record_stream(revision_keys,

                                                 'unordered', False)

            for record in stream:

                if record.storage_kind == 'absent':

                    raise errors.NoSuchRevision(from_repo, record.key)

                find_text_keys_from_content(record)

                yield record

            self._text_keys = content_text_keys - parent_text_keys

        return ('inventories', _filtered_inv_stream())

    def _get_text_stream(self):

        # Note: We know we don't have to handle adding root keys, because both

        # the source and target are the identical network name.

        text_stream = self.from_repository.texts.get_record_stream(

                        self._text_keys, self._text_fetch_order, False)

        return ('texts', text_stream)

    def get_stream(self, search):

        revision_ids = search.get_keys()

        for stream_info in self._fetch_revision_texts(revision_ids):

            yield stream_info

        self._revision_keys = [(rev_id,) for rev_id in revision_ids]

        yield self._get_filtered_inv_stream(revision_ids)

        yield self._get_text_stream()

class KnitPacker(Packer):

    """Packer that works with knit packs."""

    def __init__(self, pack_collection, packs, suffix, revision_ids=None,

                 reload_func=None):

        super(KnitPacker, self).__init__(pack_collection, packs, suffix,

                                          revision_ids=revision_ids,

                                          reload_func=reload_func)

    def _pack_map_and_index_list(self, index_attribute):

        """Convert a list of packs to an index pack map and index list.

        :param index_attribute: The attribute that the desired index is found

            on.

        :return: A tuple (map, list) where map contains the dict from

            index:pack_tuple, and list contains the indices in the preferred

            access order.

        """

        indices = []

        pack_map = {}

        for pack_obj in self.packs:

            index = getattr(pack_obj, index_attribute)

            indices.append(index)

            pack_map[index] = pack_obj

        return pack_map, indices

    def _index_contents(self, indices, key_filter=None):

        """Get an iterable of the index contents from a pack_map.

        :param indices: The list of indices to query

        :param key_filter: An optional filter to limit the keys returned.

        """

        all_index = CombinedGraphIndex(indices)

        if key_filter is None:

            return all_index.iter_all_entries()

        else:

            return all_index.iter_entries(key_filter)

    def _copy_nodes(self, nodes, index_map, writer, write_index,

        output_lines=None):

        """Copy knit nodes between packs with no graph references.

        :param output_lines: Output full texts of copied items.

        """

        pb = ui.ui_factory.nested_progress_bar()

        try:

            return self._do_copy_nodes(nodes, index_map, writer,

                write_index, pb, output_lines=output_lines)

        finally:

            pb.finished()

    def _do_copy_nodes(self, nodes, index_map, writer, write_index, pb,

        output_lines=None):

        # for record verification

        knit = KnitVersionedFiles(None, None)

        # plan a readv on each source pack:

        # group by pack

        nodes = sorted(nodes)

        # how to map this into knit.py - or knit.py into this?

        # we don't want the typical knit logic, we want grouping by pack

        # at this point - perhaps a helper library for the following code

        # duplication points?

        request_groups = {}

        for index, key, value in nodes:

            if index not in request_groups:

                request_groups[index] = []

            request_groups[index].append((key, value))

        record_index = 0

        pb.update("Copied record", record_index, len(nodes))

        for index, items in request_groups.iteritems():

            pack_readv_requests = []

            for key, value in items:

                # ---- KnitGraphIndex.get_position

                bits = value[1:].split(' ')

                offset, length = int(bits[0]), int(bits[1])

                pack_readv_requests.append((offset, length, (key, value[0])))

            # linear scan up the pack

            pack_readv_requests.sort()

            # copy the data

            pack_obj = index_map[index]

            transport, path = pack_obj.access_tuple()

            try:

                reader = pack.make_readv_reader(transport, path,

                    [offset[0:2] for offset in pack_readv_requests])

            except errors.NoSuchFile:

                if self._reload_func is not None:

                    self._reload_func()

                raise

            for (names, read_func), (_1, _2, (key, eol_flag)) in \

                izip(reader.iter_records(), pack_readv_requests):

                raw_data = read_func(None)

                # check the header only

                if output_lines is not None:

                    output_lines(knit._parse_record(key[-1], raw_data)[0])

                else:

                    df, _ = knit._parse_record_header(key, raw_data)

                    df.close()

                pos, size = writer.add_bytes_record(raw_data, names)

                write_index.add_node(key, eol_flag + "%d %d" % (pos, size))

                pb.update("Copied record", record_index)

                record_index += 1

    def _copy_nodes_graph(self, index_map, writer, write_index,

        readv_group_iter, total_items, output_lines=False):

        """Copy knit nodes between packs.

        :param output_lines: Return lines present in the copied data as

            an iterator of line,version_id.

        """

        pb = ui.ui_factory.nested_progress_bar()

        try:

            for result in self._do_copy_nodes_graph(index_map, writer,

                write_index, output_lines, pb, readv_group_iter, total_items):

                yield result

        except Exception:

            # Python 2.4 does not permit try:finally: in a generator.

            pb.finished()

            raise

        else:

            pb.finished()

    def _do_copy_nodes_graph(self, index_map, writer, write_index,

        output_lines, pb, readv_group_iter, total_items):

        # for record verification

        knit = KnitVersionedFiles(None, None)

        # for line extraction when requested (inventories only)

        if output_lines:

            factory = KnitPlainFactory()

        record_index = 0

        pb.update("Copied record", record_index, total_items)

        for index, readv_vector, node_vector in readv_group_iter:

            # copy the data

            pack_obj = index_map[index]

            transport, path = pack_obj.access_tuple()

            try:

                reader = pack.make_readv_reader(transport, path, readv_vector)

            except errors.NoSuchFile:

                if self._reload_func is not None:

                    self._reload_func()

                raise

            for (names, read_func), (key, eol_flag, references) in \

                izip(reader.iter_records(), node_vector):

                raw_data = read_func(None)

                if output_lines:

                    # read the entire thing

                    content, _ = knit._parse_record(key[-1], raw_data)

                    if len(references[-1]) == 0:

                        line_iterator = factory.get_fulltext_content(content)

                    else:

                        line_iterator = factory.get_linedelta_content(content)

                    for line in line_iterator:

                        yield line, key

                else:

                    # check the header only

                    df, _ = knit._parse_record_header(key, raw_data)

                    df.close()

                pos, size = writer.add_bytes_record(raw_data, names)

                write_index.add_node(key, eol_flag + "%d %d" % (pos, size), references)

                pb.update("Copied record", record_index)

                record_index += 1

    def _process_inventory_lines(self, inv_lines):

        """Use up the inv_lines generator and setup a text key filter."""

        repo = self._pack_collection.repo

        fileid_revisions = repo._find_file_ids_from_xml_inventory_lines(

            inv_lines, self.revision_keys)

        text_filter = []

        for fileid, file_revids in fileid_revisions.iteritems():

            text_filter.extend([(fileid, file_revid) for file_revid in file_revids])

        self._text_filter = text_filter

    def _copy_inventory_texts(self):

        # select inventory keys

        inv_keys = self._revision_keys # currently the same keyspace, and note that

        # querying for keys here could introduce a bug where an inventory item

        # is missed, so do not change it to query separately without cross

        # checking like the text key check below.

        inventory_index_map, inventory_indices = self._pack_map_and_index_list(

            'inventory_index')

        inv_nodes = self._index_contents(inventory_indices, inv_keys)

        # copy inventory keys and adjust values

        # XXX: Should be a helper function to allow different inv representation

        # at this point.

        self.pb.update("Copying inventory texts", 2)

        total_items, readv_group_iter = self._least_readv_node_readv(inv_nodes)

        # Only grab the output lines if we will be processing them

        output_lines = bool(self.revision_ids)

        inv_lines = self._copy_nodes_graph(inventory_index_map,

            self.new_pack._writer, self.new_pack.inventory_index,

            readv_group_iter, total_items, output_lines=output_lines)

        if self.revision_ids:

            self._process_inventory_lines(inv_lines)

        else:

            # eat the iterator to cause it to execute.

            list(inv_lines)

            self._text_filter = None

        if 'pack' in debug.debug_flags:

            trace.mutter('%s: create_pack: inventories copied: %s%s %d items t+%6.3fs',

                time.ctime(), self._pack_collection._upload_transport.base,

                self.new_pack.random_name,

                self.new_pack.inventory_index.key_count(),

                time.time() - self.new_pack.start_time)

    def _update_pack_order(self, entries, index_to_pack_map):

        """Determine how we want our packs to be ordered.

        This changes the sort order of the self.packs list so that packs unused

        by 'entries' will be at the end of the list, so that future requests

        can avoid probing them.  Used packs will be at the front of the

        self.packs list, in the order of their first use in 'entries'.

        :param entries: A list of (index, ...) tuples

        :param index_to_pack_map: A mapping from index objects to pack objects.

        """

        packs = []

        seen_indexes = set()

        for entry in entries:

            index = entry[0]

            if index not in seen_indexes:

                packs.append(index_to_pack_map[index])

                seen_indexes.add(index)

        if len(packs) == len(self.packs):

            if 'pack' in debug.debug_flags:

                trace.mutter('Not changing pack list, all packs used.')

            return

        seen_packs = set(packs)

        for pack in self.packs:

            if pack not in seen_packs:

                packs.append(pack)

                seen_packs.add(pack)

        if 'pack' in debug.debug_flags:

            old_names = [p.access_tuple()[1] for p in self.packs]