/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 05:37:08 UTC
  • mto: This revision was merged to the branch mainline in revision 2735.
  • Revision ID: aaron.bentley@utoronto.ca-20070816053708-3zot9t5j8rvgpho3
rename extract_files_bytest to iter_files_bytes, fix build_tree / progress

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1272
1272
            deferred_contents = []
1273
1273
            for num, (tree_path, entry) in \
1274
1274
                enumerate(tree.inventory.iter_entries_by_dir()):
1275
 
                pb.update("Building tree", num, len(tree.inventory))
 
1275
                pb.update("Building tree", num - len(deferred_contents),
 
1276
                          len(tree.inventory))
1276
1277
                if entry.parent_id is None:
1277
1278
                    continue
1278
1279
                reparent = False
1301
1302
                        'entry %s parent id %r is not in file_trans_id %r'
1302
1303
                        % (entry, entry.parent_id, file_trans_id))
1303
1304
                parent_id = file_trans_id[entry.parent_id]
1304
 
                if file_kind == 'file':
 
1305
                if entry.kind == 'file':
1305
1306
                    # We *almost* replicate new_by_entry, so that we can defer
1306
1307
                    # getting the file text, and get them all at once.
1307
1308
                    trans_id = tt.create_path(entry.name, parent_id)
1308
 
                    self.version_file(entry.file_id, trans_id)
 
1309
                    file_trans_id[file_id] = trans_id
 
1310
                    tt.version_file(entry.file_id, trans_id)
1309
1311
                    executable = tree.is_executable(entry.file_id, tree_path)
1310
1312
                    if executable is not None:
1311
 
                        tt.set_executability(executable)
 
1313
                        tt.set_executability(executable, trans_id)
1312
1314
                    deferred_contents.append((entry.file_id, trans_id))
1313
1315
                else:
1314
1316
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1317
1319
                    new_trans_id = file_trans_id[file_id]
1318
1320
                    old_parent = tt.trans_id_tree_path(tree_path)
1319
1321
                    _reparent_children(tt, old_parent, new_trans_id)
1320
 
            for trans_id, bytes in tree.iter_files_bytes(deferred_contents):
 
1322
            for num, (trans_id, bytes) in enumerate(
 
1323
                tree.iter_files_bytes(deferred_contents)):
1321
1324
                tt.create_file(bytes, trans_id)
 
1325
                pb.update('Adding file contents',
 
1326
                          (num + len(tree.inventory) - len(deferred_contents)),
 
1327
                          len(tree.inventory))
1322
1328
        finally:
1323
1329
            pb.finished()
1324
1330
        pp.next_phase()
1649
1655
                    name[1], tt.trans_id_file_id(parent[1]), trans_id)
1650
1656
            if executable[0] != executable[1] and kind[1] == "file":
1651
1657
                tt.set_executability(executable[1], trans_id)
1652
 
        for (trans_id, mode_id), bytes in target_tree.extract_files_bytes(
 
1658
        for (trans_id, mode_id), bytes in target_tree.iter_files_bytes(
1653
1659
            deferred_files):
1654
1660
            tt.create_file(bytes, trans_id, mode_id)
1655
1661
    finally: