/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-02 13:32:52 UTC
  • mfrom: (4634.6.14 2.0)
  • mto: (4634.6.15 2.0)
  • mto: This revision was merged to the branch mainline in revision 4667.
  • Revision ID: john@arbash-meinel.com-20090902133252-t2t94xtckoliv2th
Merge lp:bzr/2.0 to resolve NEWS issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
437
437
            self.text_id is not None):
438
438
            checker._report_items.append('directory {%s} has text in revision {%s}'
439
439
                                % (self.file_id, rev_id))
440
 
        # Directories are stored as ''.
 
440
        # In non rich root repositories we do not expect a file graph for the
 
441
        # root.
 
442
        if self.name == '' and not checker.rich_roots:
 
443
            return
 
444
        # Directories are stored as an empty file, but the file should exist
 
445
        # to provide a per-fileid log. The hash of every directory content is
 
446
        # "da..." below (the sha1sum of '').
441
447
        checker.add_pending_item(rev_id,
442
448
            ('texts', self.file_id, self.revision), 'text',
443
449
             'da39a3ee5e6b4b0d3255bfef95601890afd80709')
754
760
        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
755
761
        >>> print i.id2path('foo-id')
756
762
        src/foo.c
 
763
 
 
764
        :raises NoSuchId: If file_id is not present in the inventory.
757
765
        """
758
766
        # get all names, skipping root
759
767
        return '/'.join(reversed(