← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Jelmer Vernooij
  • Date: 2006-06-10 00:21:11 UTC
  • mto: (1558.16.3 revert-missing)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: jelmer@samba.org-20060610002111-ff582d7ee2090037
Fix some types (found using aspell).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
27
27
# property.
28
28
 
29
29
# TODO: Nothing here so far assumes the lines are really \n newlines,
30
 
# rather than being split up in some other way.  We could accomodate
 
30
# rather than being split up in some other way.  We could accommodate
31
31
# binaries, perhaps by naively splitting on \n or perhaps using
32
32
# something like a rolling checksum.
33
33
 
231
231
 
232
232
    @deprecated_method(zero_eight)
233
233
    def lookup(self, name):
234
 
        """Backwards compatability thunk:
 
234
        """Backwards compatibility thunk:
235
235
 
236
236
        Return name, as name is valid in the api now, and spew deprecation
237
237
        warnings everywhere.
522
522
        if lines == basis_lines:
523
523
            return new_version            
524
524
 
525
 
        # add a sentinal, because we can also match against the final line
 
525
        # add a sentinel, because we can also match against the final line
526
526
        basis_lineno.append(len(self._weave))
527
527
 
528
528
        # XXX: which line of the weave should we really consider
1069
1069
 
1070
1070
    @deprecated_method(zero_eight)
1071
1071
    def reweave(self, other, pb=None, msg=None):
1072
 
        """reweave has been superceded by plain use of join."""
 
1072
        """reweave has been superseded by plain use of join."""
1073
1073
        return self.join(other, pb, msg)
1074
1074
 
1075
1075
    def _reweave(self, other, pb, msg):