/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/branch.py

  • Committer: Martin Pool
  • Date: 2005-08-17 08:32:56 UTC
  • Revision ID: mbp@sourcefrog.net-20050817083255-894936d5aebf7a95
- merge merge improvements from aaron

  revisions to merge are now specified by the -r parameter; the 
  /@ syntax is no longer needed

  abentley@panoramicfeedback.com-20050811205739-dc1988c004f9503e

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
316
316
            self.controlfile(f, 'w').write('')
317
317
        mutter('created control directory in ' + self.base)
318
318
 
319
 
        pack_xml(Inventory(gen_root_id()), self.controlfile('inventory','w'))
 
319
        # if we want per-tree root ids then this is the place to set
 
320
        # them; they're not needed for now and so ommitted for
 
321
        # simplicity.
 
322
        pack_xml(Inventory(), self.controlfile('inventory','w'))
320
323
 
321
324
 
322
325
    def _check_format(self):
594
597
            try:
595
598
                return self.revision_store[revision_id]
596
599
            except IndexError:
597
 
                raise bzrlib.errors.NoSuchRevision(revision_id)
 
600
                raise bzrlib.errors.NoSuchRevision(self, revision_id)
598
601
        finally:
599
602
            self.unlock()
600
603
 
657
660
        from bzrlib.inventory import Inventory
658
661
        from bzrlib.xml import unpack_xml
659
662
 
660
 
        return unpack_xml(Inventory, self.inventory_store[inventory_id])
 
663
        return unpack_xml(Inventory, self.get_inventory_xml(inventory_id))
 
664
 
 
665
 
 
666
    def get_inventory_xml(self, inventory_id):
 
667
        """Get inventory XML as a file object."""
 
668
        return self.inventory_store[inventory_id]
661
669
            
662
670
 
663
671
    def get_inventory_sha1(self, inventory_id):
664
672
        """Return the sha1 hash of the inventory entry
665
673
        """
666
 
        return sha_file(self.inventory_store[inventory_id])
 
674
        return sha_file(self.get_inventory_xml(inventory_id))
667
675
 
668
676
 
669
677
    def get_revision_inventory(self, revision_id):