~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/fetch.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-04 16:06:36 UTC
  • mfrom: (5007 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100204160636-xqeuwz8bwt8bbts4
Merge bzr.dev 5007, resolve conflict, update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
254
254
        root_id_order.sort(key=operator.itemgetter(0))
255
255
        # Create a record stream containing the roots to create.
256
256
        if len(revs) > 100:
257
 
            graph = _get_rich_root_heads_graph(self.source_repo, revs)
 
257
            # XXX: not covered by tests, should have a flag to always run
 
258
            # this. -- mbp 20100129
 
259
            graph = _get_rich_root_heads_graph(self.source, revs)
258
260
        new_roots_stream = _new_root_data_stream(
259
261
            root_id_order, rev_id_to_root_id, parent_map, self.source, graph)
260
262
        return [('texts', new_roots_stream)]