/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: 2006-11-28 04:04:21 UTC
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061128040421-3ofogqnfzecou99p
Optimize revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1244
1244
        if skip_root and file_id[0] is not None and parent[0] is None:
1245
1245
            continue
1246
1246
        trans_id = tt.trans_id_file_id(file_id)
1247
 
        by_parent = tt.by_parent()
1248
1247
        if changed_content:
1249
1248
            keep_content = False
1250
1249
            if kind[0] == 'file' and (backups or kind[1] is None):
1262
1261
                    tt.delete_contents(trans_id)
1263
1262
                elif kind[1] is not None:
1264
1263
                    parent_trans_id = tt.trans_id_file_id(parent[0])
 
1264
                    by_parent = tt.by_parent()
1265
1265
                    backup_name = _get_backup_name(name[0], by_parent,
1266
1266
                                                   parent_trans_id, tt)
1267
1267
                    tt.adjust_path(backup_name, parent_trans_id, trans_id)
1276
1276
                tt.create_symlink(target_tree.get_symlink_target(file_id),
1277
1277
                                  trans_id)
1278
1278
            elif kind[1] == 'file':
1279
 
                tt.create_file(target_tree.get_file(file_id).readlines(),
 
1279
                tt.create_file(target_tree.get_file_lines(file_id),
1280
1280
                               trans_id)
1281
1281
            else:
1282
1282
                assert kind[1] is None