/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
1
 
# Copyright (C) 2005, 2006, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
28
28
from bzrlib.lazy_import import lazy_import
29
29
lazy_import(globals(), """
30
30
from bzrlib import (
31
 
    graph as _mod_graph,
32
 
    static_tuple,
33
31
    tsort,
34
32
    versionedfile,
35
33
    )
37
35
import bzrlib
38
36
from bzrlib import (
39
37
    errors,
40
 
    symbol_versioning,
41
38
    ui,
42
39
    )
43
40
from bzrlib.revision import NULL_REVISION
52
49
    """
53
50
 
54
51
    def __init__(self, to_repository, from_repository, last_revision=None,
55
 
        pb=None, find_ghosts=True, fetch_spec=None):
 
52
        find_ghosts=True, fetch_spec=None):
56
53
        """Create a repo fetcher.
57
54
 
58
55
        :param last_revision: If set, try to limit to the data this revision
59
56
            references.
60
57
        :param find_ghosts: If True search the entire history for ghosts.
61
 
        :param pb: ProgressBar object to use; deprecated and ignored.
62
 
            This method will just create one on top of the stack.
63
58
        """
64
 
        if pb is not None:
65
 
            symbol_versioning.warn(
66
 
                symbol_versioning.deprecated_in((1, 14, 0))
67
 
                % "pb parameter to RepoFetcher.__init__")
68
 
            # and for simplicity it is in fact ignored
69
59
        # repository.fetch has the responsibility for short-circuiting
70
60
        # attempts to copy between a repository and itself.
71
61
        self.to_repository = to_repository
254
244
        root_id_order.sort(key=operator.itemgetter(0))
255
245
        # Create a record stream containing the roots to create.
256
246
        if len(revs) > 100:
257
 
            graph = _get_rich_root_heads_graph(self.source_repo, revs)
 
247
            # XXX: not covered by tests, should have a flag to always run
 
248
            # this. -- mbp 20100129
 
249
            graph = self.source_repo.get_known_graph_ancestry(revs)
258
250
        new_roots_stream = _new_root_data_stream(
259
251
            root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
260
252
        return [('texts', new_roots_stream)]
262
254
 
263
255
def _get_rich_root_heads_graph(source_repo, revision_ids):
264
256
    """Get a Graph object suitable for asking heads() for new rich roots."""
265
 
    st = static_tuple.StaticTuple
266
 
    revision_keys = [st(r_id).intern() for r_id in revision_ids]
267
 
    known_graph = source_repo.revisions.get_known_graph_ancestry(
268
 
                    revision_keys)
269
 
    return _mod_graph.GraphThunkIdsToKeys(known_graph)
 
257
    return 
270
258
 
271
259
 
272
260
def _new_root_data_stream(