← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
715
715
                ie.symlink_target = self.get_symlink_target(file_id)
716
716
            ie.revision = revision_id
717
717
 
718
 
            if kind == 'file':
 
718
            if kind in ('directory', 'symlink'):
 
719
                ie.text_size, ie.text_sha1 = None, None
 
720
            else:
719
721
                ie.text_size, ie.text_sha1 = self.get_size_and_sha1(file_id)
720
 
                if ie.text_size is None:
721
 
                    raise BzrError(
722
 
                        'Got a text_size of None for file_id %r' % file_id)
 
722
            if (ie.text_size is None) and (kind == 'file'):
 
723
                raise BzrError('Got a text_size of None for file_id %r' % file_id)
723
724
            inv.add(ie)
724
725
 
725
726
        sorted_entries = self.sorted_path_id()