← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Ian Clatworthy
  • Date: 2008-06-08 20:34:15 UTC
  • mto: (3483.2.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3484.
  • Revision ID: ian.clatworthy@canonical.com-20080608203415-2n2otd5qie6vi97w
minor _build_tree cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1675
1675
        try:
1676
1676
            deferred_contents = []
1677
1677
            num = 0
 
1678
            total = len(tree.inventory)
1678
1679
            if delta_from_tree:
1679
1680
                precomputed_delta = []
1680
1681
            else:
1681
1682
                precomputed_delta = None
1682
1683
            for num, (tree_path, entry) in \
1683
1684
                enumerate(tree.inventory.iter_entries_by_dir()):
1684
 
                pb.update("Building tree", num - len(deferred_contents),
1685
 
                          len(tree.inventory))
 
1685
                pb.update("Building tree", num - len(deferred_contents), total)
1686
1686
                if entry.parent_id is None:
1687
1687
                    continue
1688
1688
                reparent = False
1705
1705
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
1706
1706
                        if kind == 'directory':
1707
1707
                            reparent = True
1708
 
                if entry.parent_id not in file_trans_id:
1709
 
                    raise AssertionError(
1710
 
                        'entry %s parent id %r is not in file_trans_id %r'
1711
 
                        % (entry, entry.parent_id, file_trans_id))
1712
1708
                parent_id = file_trans_id[entry.parent_id]
1713
1709
                if entry.kind == 'file':
1714
1710
                    # We *almost* replicate new_by_entry, so that we can defer
1715
1711
                    # getting the file text, and get them all at once.
1716
1712
                    trans_id = tt.create_path(entry.name, parent_id)
1717
1713
                    file_trans_id[file_id] = trans_id
1718
 
                    tt.version_file(entry.file_id, trans_id)
1719
 
                    executable = tree.is_executable(entry.file_id, tree_path)
 
1714
                    tt.version_file(file_id, trans_id)
 
1715
                    executable = tree.is_executable(file_id, tree_path)
1720
1716
                    if executable:
1721
1717
                        tt.set_executability(executable, trans_id)
1722
 
                    deferred_contents.append((entry.file_id, trans_id))
 
1718
                    deferred_contents.append((file_id, trans_id))
1723
1719
                else:
1724
1720
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1725
1721
                                                          tree)