← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to read_changeset.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-16 17:38:55 UTC
  • mto: (1185.82.1 bzr-w-changeset) (0.5.98)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: john@arbash-meinel.com-20050716173855-a38d2990b32a4649
Fixed a bug in the rename code, added more tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
read_changeset.py
552
552
            else:
553
553
                new_path = info[1]
554
554
 
555
 
            file_id = tree.path2id(new_path)
 
555
            file_id = tree.path2id(old_path)
 
556
            print '%r %r %r' % (old_path, new_path, file_id)
556
557
            if len(info) > 2:
557
558
                text_id = get_text_id(info[2], file_id, kind)
558
559
            else:
559
560
                text_id = get_text_id(None, file_id, kind)
 
561
            print '%r %r %r %r %r' % (old_path, new_path, file_id, text_id, tree._text_ids[file_id])
560
562
            tree.note_rename(old_path, new_path)
561
563
            if lines:
562
564
                tree.note_patch(new_path, ''.join(lines))
876
878
                text_id = self.get_text_id(file_id)
877
879
 
878
880
            name = basename(path)
 
881
            print '%r %r %r %r' % (path, name, file_id, text_id)
879
882
            ie = InventoryEntry(file_id, name, kind, parent_id, text_id=text_id)
880
883
            if kind == 'directory':
881
884
                ie.text_size, ie.text_sha1 = None, None