← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset/read_changeset.py

  • Committer: Aaron Bentley
  • Date: 2006-05-19 16:47:39 UTC
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: abentley@panoramicfeedback.com-20060519164739-4d0e8f7d54197bea
Get symlink modification, renames and deletion under test

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset/read_changeset.py
576
576
 
577
577
            cset_tree.note_rename(old_path, new_path)
578
578
            file_id = cset_tree.path2id(new_path)
579
 
            if len(info) > 2:
580
 
                revision = get_rev_id(info[2], file_id, kind)
581
 
            else:
582
 
                revision = get_rev_id(None, file_id, kind)
 
579
            last_modified = extra_info(info[2:], file_id, new_path)
 
580
            revision = get_rev_id(last_modified, file_id, kind)
583
581
            if lines:
584
582
                cset_tree.note_patch(new_path, ''.join(lines))
585
583
 
928
926
                ie.symlink_target = self.get_symlink_target(file_id)
929
927
            ie.revision = revision_id
930
928
 
931
 
            if kind == 'directory':
 
929
            if kind in ('directory', 'symlink'):
932
930
                ie.text_size, ie.text_sha1 = None, None
933
931
            else:
934
932
                ie.text_size, ie.text_sha1 = self.get_size_and_sha1(file_id)
935
 
            if (ie.text_size is None) and (kind != 'directory'):
 
933
            if (ie.text_size is None) and (kind == 'file'):
936
934
                raise BzrError('Got a text_size of None for file_id %r' % file_id)
937
935
            inv.add(ie)
938
936