/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

add missing _must_be_locked and a better message

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1137
1137
    file_trans_id = {}
1138
1138
    top_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1139
1139
    pp = ProgressPhase("Build phase", 2, top_pb)
1140
 
#    if tree.inventory.root is not None:
1141
 
#        wt.set_root_id(tree.inventory.root.file_id)
 
1140
    if tree.inventory.root is not None:
 
1141
        wt.set_root_id(tree.inventory.root.file_id)
1142
1142
    tt = TreeTransform(wt)
1143
1143
    divert = set()
1144
1144
    try:
1174
1174
                        if kind == 'directory':
1175
1175
                            reparent = True
1176
1176
                if entry.parent_id not in file_trans_id:
1177
 
                    raise repr(entry.parent_id)
 
1177
                    raise AssertionError(
 
1178
                        'entry %s parent id %r is not in file_trans_id %r'
 
1179
                        % (entry, entry.parent_id, file_trans_id))
1178
1180
                parent_id = file_trans_id[entry.parent_id]
1179
1181
                file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
1180
1182
                                                      tree)