← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Ian Clatworthy
  • Date: 2007-12-17 01:45:32 UTC
  • mto: (3119.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3120.
  • Revision ID: ian.clatworthy@internode.on.net-20071217014532-dmbv2mm72nzq0ai6
follow-up tweaks to bzr.dev integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
50
50
    BzrCheckError,
51
51
    BzrError,
52
52
    )
53
 
from bzrlib.symbol_versioning import deprecated_method
 
53
from bzrlib.symbol_versioning import deprecated_method, zero_ninetyone
54
54
from bzrlib.trace import mutter
55
55
 
56
56
 
142
142
        """
143
143
        return False, False
144
144
 
145
 
    @deprecated_method(symbol_versioning.one_zero)
 
145
    @deprecated_method(symbol_versioning.zero_ninetythree)
146
146
    def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
147
147
             output_to, reverse=False):
148
148
        """Perform a diff from this to to_entry.
198
198
                    candidates[ie.revision] = ie
199
199
        return candidates
200
200
 
201
 
    @deprecated_method(symbol_versioning.zero_ninetyone)
 
201
    @deprecated_method(zero_ninetyone)
202
202
    def find_previous_heads(self, previous_inventories,
203
203
                            versioned_file_store,
204
204
                            transaction,
1422
1422
 
1423
1423
    :raises InvalidNormalization: When name is not normalized, and cannot be
1424
1424
        accessed on this platform by the normalized path.
1425
 
    :return: The NFC normalised version of name.
 
1425
    :return: The NFC/NFKC normalised version of name.
1426
1426
    """
1427
1427
    #------- This has been copied to bzrlib.dirstate.DirState.add, please
1428
1428
    # keep them synchronised.