← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2009-08-05 02:30:59 UTC
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090805023059-wkw6m0c9fommcwth
Fix failing tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
592
592
                 'text_id', 'parent_id', 'children', 'executable',
593
593
                 'revision', 'symlink_target', 'reference_revision']
594
594
 
595
 
    def _check(self, checker, rev_id):
 
595
    def _check(self, checker, tree_revision_id):
596
596
        """See InventoryEntry._check"""
597
597
        if self.text_sha1 is not None or self.text_size is not None or self.text_id is not None:
598
598
            checker._report_items.append(
599
599
               'symlink {%s} has text in revision {%s}'
600
 
                    % (self.file_id, rev_id))
 
600
                    % (self.file_id, tree_revision_id))
601
601
        if self.symlink_target is None:
602
602
            checker._report_items.append(
603
603
                'symlink {%s} has no target in revision {%s}'
604
 
                    % (self.file_id, rev_id))
 
604
                    % (self.file_id, tree_revision_id))
605
605
        # Symlinks are stored as ''
606
606
        checker.add_pending_item(tree_revision_id,
607
607
            ('texts', self.file_id, self.revision), 'text',