← Back to branch summary

~ubuntu-branches/ubuntu/hardy/bzr/hardy-proposed

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Bazaar Package Importer
  • Author(s): Adeodato Simó
  • Date: 2008-03-21 17:56:59 UTC
  • mfrom: (1.1.38 upstream)
  • Revision ID: james.westby@ubuntu.com-20080321175659-2qzn8h5axi1oz2x2
Tags: 1.3-1
Final 1.3 release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
20
20
 
21
21
from bzrlib import (
22
22
    errors,
23
 
    symbol_versioning
 
23
    symbol_versioning,
24
24
    )
25
25
from bzrlib.deprecated_graph import (
26
26
    all_descendants,
233
233
    return root, ancestors, descendants
234
234
 
235
235
 
 
236
@deprecated_function(symbol_versioning.one_three)
236
237
def combined_graph(revision_a, revision_b, revision_source):
237
238
    """Produce a combined ancestry graph.
238
239
    Return graph root, ancestors map, descendants map, set of common nodes"""
256
257
    return root, ancestors, descendants, common
257
258
 
258
259
 
 
260
@deprecated_function(symbol_versioning.one_three)
259
261
def common_ancestor(revision_a, revision_b, revision_source, 
260
262
                    pb=DummyProgress()):
261
263
    if None in (revision_a, revision_b):
320
322
 
321
323
class MultipleRevisionSources(object):
322
324
    """Proxy that looks in multiple branches for revisions."""
 
325
 
 
326
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
323
327
    def __init__(self, *args):
324
328
        object.__init__(self)
325
329
        assert len(args) != 0