← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005 by Canonical Ltd
2
2
#
3
3
# Authors:
4
4
#   Johan Rydberg <jrydberg@gnu.org>
26
26
 
27
27
import bzrlib.errors as errors
28
28
from bzrlib.inter import InterObject
 
29
from bzrlib.symbol_versioning import *
29
30
from bzrlib.textmerge import TextMerge
30
31
from bzrlib.transport.memory import MemoryTransport
31
32
from bzrlib.tsort import topo_sort
32
33
from bzrlib import ui
33
 
from bzrlib.symbol_versioning import (deprecated_function,
34
 
        deprecated_method,
35
 
        zero_eight,
36
 
        )
37
34
 
38
35
 
39
36
class VersionedFile(object):
255
252
        return ''.join(self.get_lines(version_id))
256
253
    get_string = get_text
257
254
 
258
 
    def get_texts(self, version_ids):
259
 
        """Return the texts of listed versions as a list of strings.
260
 
 
261
 
        Raises RevisionNotPresent if version is not present in
262
 
        file history.
263
 
        """
264
 
        return [''.join(self.get_lines(v)) for v in version_ids]
265
 
 
266
255
    def get_lines(self, version_id):
267
256
        """Return version contents as a sequence of lines.
268
257