← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to apply_changeset.py

  • Committer: John Arbash Meinel
  • Date: 2005-07-14 00:27:05 UTC
  • mto: (0.5.85) (1185.82.1 bzr-w-changeset)
  • mto: This revision was merged to the branch mainline in revision 1738.
  • Revision ID: john@arbash-meinel.com-20050714002705-c6fae822e6d8f876
Lots of changes, changing separators, updating tests, updated ChangesetTree to include text_ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
apply_changeset.py
16
16
    from cStringIO import StringIO
17
17
 
18
18
    # First, install all required texts
19
 
    for file_id, text_id in cset_info.text_ids.iteritems():
20
 
        if text_id not in branch.text_store:
21
 
            branch.text_store.add(cset_tree.get_file(file_id), text_id)
 
19
    for path, ie in cset_tree.inventory.iter_entries():
 
20
        if ie.text_id not in branch.text_store:
 
21
            branch.text_store.add(cset_tree.get_file(ie.file_id), ie.text_id)
22
22
 
23
23
    # Now install the final inventory
24
24
    if cset_info.target not in branch.inventory_store: