← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-01-14 01:40:02 UTC
  • mfrom: (3177.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080114014002-pz5tya37urp1n3fk
Fix typos of Firefox and OpenOffice.org in docs (Matt Nordhoff)

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)
237
236
def combined_graph(revision_a, revision_b, revision_source):
238
237
    """Produce a combined ancestry graph.
239
238
    Return graph root, ancestors map, descendants map, set of common nodes"""
257
256
    return root, ancestors, descendants, common
258
257
 
259
258
 
260
 
@deprecated_function(symbol_versioning.one_three)
261
259
def common_ancestor(revision_a, revision_b, revision_source, 
262
260
                    pb=DummyProgress()):
263
261
    if None in (revision_a, revision_b):
322
320
 
323
321
class MultipleRevisionSources(object):
324
322
    """Proxy that looks in multiple branches for revisions."""
325
 
 
326
 
    @symbol_versioning.deprecated_method(symbol_versioning.one_three)
327
323
    def __init__(self, *args):
328
324
        object.__init__(self)
329
325
        assert len(args) != 0