← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Andrew Bennetts
  • Date: 2007-08-30 08:11:54 UTC
  • mfrom: (2766 +trunk)
  • mto: (2535.3.55 repo-refactor)
  • mto: This revision was merged to the branch mainline in revision 2772.
  • Revision ID: andrew.bennetts@canonical.com-20070830081154-16hebp2xwr15x2hc
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
37
37
 
38
38
from bzrlib.inter import InterObject
39
39
from bzrlib.textmerge import TextMerge
40
 
from bzrlib.symbol_versioning import (deprecated_function,
41
 
        deprecated_method,
42
 
        zero_eight,
43
 
        )
44
40
 
45
41
 
46
42
class VersionedFile(object):
69
65
        """Copy this versioned file to name on transport."""
70
66
        raise NotImplementedError(self.copy_to)
71
67
 
72
 
    @deprecated_method(zero_eight)
73
 
    def names(self):
74
 
        """Return a list of all the versions in this versioned file.
75
 
 
76
 
        Please use versionedfile.versions() now.
77
 
        """
78
 
        return self.versions()
79
 
 
80
68
    def versions(self):
81
69
        """Return a unsorted list of versions."""
82
70
        raise NotImplementedError(self.versions)
440
428
        """
441
429
        raise NotImplementedError(self.get_graph_with_ghosts)
442
430
 
443
 
    @deprecated_method(zero_eight)
444
 
    def parent_names(self, version):
445
 
        """Return version names for parents of a version.
446
 
        
447
 
        See get_parents for the current api.
448
 
        """
449
 
        return self.get_parents(version)
450
 
 
451
431
    def get_parents(self, version_id):
452
432
        """Return version names for parents of a version.
453
433
 
548
528
        """
549
529
        self.finished = True
550
530
 
551
 
    @deprecated_method(zero_eight)
552
 
    def walk(self, version_ids=None):
553
 
        """Walk the versioned file as a weave-like structure, for
554
 
        versions relative to version_ids.  Yields sequence of (lineno,
555
 
        insert, deletes, text) for each relevant line.
556
 
 
557
 
        Must raise RevisionNotPresent if any of the specified versions
558
 
        are not present in the file history.
559
 
 
560
 
        :param version_ids: the version_ids to walk with respect to. If not
561
 
                            supplied the entire weave-like structure is walked.
562
 
 
563
 
        walk is deprecated in favour of iter_lines_added_or_present_in_versions
564
 
        """
565
 
        raise NotImplementedError(self.walk)
566
 
 
567
 
    @deprecated_method(zero_eight)
568
 
    def iter_names(self):
569
 
        """Walk the names list."""
570
 
        return iter(self.versions())
571
 
 
572
531
    def plan_merge(self, ver_a, ver_b):
573
532
        """Return pseudo-annotation indicating how the two versions merge.
574
533