← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2007-06-21 05:35:27 UTC
  • mfrom: (2542 +trunk)
  • mto: (2520.5.2 bzr.mpbundle)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: aaron.bentley@utoronto.ca-20070621053527-rhs3b3u0ozpbr86v
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
342
342
    def _get_line_list(self, version_ids):
343
343
        return [t.splitlines(True) for t in self.get_texts(version_ids)]
344
344
 
345
 
    def get_ancestry(self, version_ids):
 
345
    def get_ancestry(self, version_ids, topo_sorted=True):
346
346
        """Return a list of all ancestors of given version(s). This
347
347
        will not include the null revision.
348
348
 
 
349
        This list will not be topologically sorted if topo_sorted=False is
 
350
        passed.
 
351
 
349
352
        Must raise RevisionNotPresent if any of the given versions are
350
353
        not present in file history."""
351
354
        if isinstance(version_ids, basestring):