~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/graph.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-24 18:38:20 UTC
  • mfrom: (5685 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5687.
  • Revision ID: jelmer@samba.org-20110224183820-3nq2ka84ro042iu2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
        ancestry = self.ancestry
65
65
        return dict((k, ancestry[k]) for k in keys if k in ancestry)
66
66
 
67
 
@deprecated_function(deprecated_in((1, 16, 0)))
68
 
def _StackedParentsProvider(*args, **kwargs):
69
 
    return StackedParentsProvider(*args, **kwargs)
70
67
 
71
68
class StackedParentsProvider(object):
72
69
    """A parents provider which stacks (or unions) multiple providers.