← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-02 12:52:13 UTC
  • mto: (5008.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5009.
  • Revision ID: v.ladeuil+lp@free.fr-20100202125213-h08auwpb9zbtvjmb
Settle with --take-this and --take-other as action names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/fetch.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008, 2009 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
52
52
    """
53
53
 
54
54
    def __init__(self, to_repository, from_repository, last_revision=None,
55
 
        find_ghosts=True, fetch_spec=None):
 
55
        pb=None, find_ghosts=True, fetch_spec=None):
56
56
        """Create a repo fetcher.
57
57
 
58
58
        :param last_revision: If set, try to limit to the data this revision
59
59
            references.
60
60
        :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.
61
63
        """
 
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
62
69
        # repository.fetch has the responsibility for short-circuiting
63
70
        # attempts to copy between a repository and itself.
64
71
        self.to_repository = to_repository
247
254
        root_id_order.sort(key=operator.itemgetter(0))
248
255
        # Create a record stream containing the roots to create.
249
256
        if len(revs) > 100:
250
 
            # XXX: not covered by tests, should have a flag to always run
251
 
            # this. -- mbp 20100129
252
 
            graph = _get_rich_root_heads_graph(self.source, revs)
 
257
            graph = _get_rich_root_heads_graph(self.source_repo, revs)
253
258
        new_roots_stream = _new_root_data_stream(
254
259
            root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
255
260
        return [('texts', new_roots_stream)]