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

  • Committer: Aaron Bentley
  • Date: 2007-08-16 02:14:05 UTC
  • mto: This revision was merged to the branch mainline in revision 2735.
  • Revision ID: aaron.bentley@utoronto.ca-20070816021405-ecx25ccgkmq5st3y
Use Tree.extract_files_bytes in revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1575
1575
        skip_root = False
1576
1576
    basis_tree = None
1577
1577
    try:
 
1578
        deferred_files = []
1578
1579
        for id_num, (file_id, path, changed_content, versioned, parent, name,
1579
1580
                kind, executable) in enumerate(change_list):
1580
1581
            if skip_root and file_id[0] is not None and parent[0] is None:
1620
1621
                    tt.create_symlink(target_tree.get_symlink_target(file_id),
1621
1622
                                      trans_id)
1622
1623
                elif kind[1] == 'file':
1623
 
                    tt.create_file(target_tree.get_file_lines(file_id),
1624
 
                                   trans_id, mode_id)
 
1624
                    deferred_files.append((file_id, trans_id))
1625
1625
                    if basis_tree is None:
1626
1626
                        basis_tree = working_tree.basis_tree()
1627
1627
                        basis_tree.lock_read()
1648
1648
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1649
1649
            if executable[0] != executable[1] and kind[1] == "file":
1650
1650
                tt.set_executability(executable[1], trans_id)
 
1651
        target_tree.extract_files_bytes(tt.create_file, deferred_files)
1651
1652
    finally:
1652
1653
        if basis_tree is not None:
1653
1654
            basis_tree.unlock()