← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Alexander Belchenko
  • Date: 2006-07-31 16:12:57 UTC
  • mto: (1711.2.111 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1906.
  • Revision ID: bialix@ukr.net-20060731161257-91a231523255332c
new official bzr.ico

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
75
75
import time
76
76
import warnings
77
77
 
78
 
from bzrlib import (
79
 
    progress,
80
 
    )
81
78
from bzrlib.trace import mutter
82
79
from bzrlib.errors import (WeaveError, WeaveFormatError, WeaveParentMismatch,
83
80
        RevisionAlreadyPresent,
268
265
 
269
266
    def has_version(self, version_id):
270
267
        """See VersionedFile.has_version."""
271
 
        return (version_id in self._name_map)
 
268
        return self._name_map.has_key(version_id)
272
269
 
273
270
    __contains__ = has_version
274
271
 
667
664
        """_walk has become visit, a supported api."""
668
665
        return self._walk_internal()
669
666
 
670
 
    def iter_lines_added_or_present_in_versions(self, version_ids=None,
671
 
                                                pb=None):
 
667
    def iter_lines_added_or_present_in_versions(self, version_ids=None):
672
668
        """See VersionedFile.iter_lines_added_or_present_in_versions()."""
673
669
        if version_ids is None:
674
670
            version_ids = self.versions()
1136
1132
        sio = StringIO()
1137
1133
        write_weave_v5(self, sio)
1138
1134
        sio.seek(0)
1139
 
        transport.put_file(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
 
1135
        transport.put(name + WeaveFile.WEAVE_SUFFIX, sio, self._filemode)
1140
1136
 
1141
1137
    def create_empty(self, name, transport, filemode=None):
1142
1138
        return WeaveFile(name, transport, filemode, create=True)
1147
1143
        sio = StringIO()
1148
1144
        write_weave_v5(self, sio)
1149
1145
        sio.seek(0)
1150
 
        self._transport.put_file(self._weave_name + WeaveFile.WEAVE_SUFFIX,
1151
 
                                 sio,
1152
 
                                 self._filemode)
 
1146
        self._transport.put(self._weave_name + WeaveFile.WEAVE_SUFFIX,
 
1147
                            sio,
 
1148
                            self._filemode)
1153
1149
 
1154
1150
    @staticmethod
1155
1151
    def get_suffixes():