← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Aaron Bentley
  • Date: 2006-11-28 04:52:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2162.
  • Revision ID: aaron.bentley@utoronto.ca-20061128045203-qnki9vf702jnb0gr
Minor tweaks

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
        mode_id = None
1247
1248
        if changed_content:
1248
1249
            keep_content = False
1249
1250
            if kind[0] == 'file' and (backups or kind[1] is None):
1269
1270
                    if versioned == (True, True):
1270
1271
                        tt.unversion_file(trans_id)
1271
1272
                        tt.version_file(file_id, new_trans_id)
 
1273
                    mode_id = trans_id
1272
1274
                    trans_id = new_trans_id
1273
1275
            if kind[1] == 'directory':
1274
1276
                tt.create_directory(trans_id)
1278
1280
            elif kind[1] == 'file':
1279
1281
                tt.create_file(target_tree.get_file_lines(file_id),
1280
1282
                               trans_id)
 
1283
                if executable[0] != executable[1]:
 
1284
                    tt.set_executability(executable[1], trans_id)
1281
1285
            else:
1282
1286
                assert kind[1] is None
1283
1287
        if versioned == (False, True):
1284
1288
            tt.version_file(file_id, trans_id)
1285
1289
        if versioned == (True, False):
1286
1290
            tt.unversion_file(trans_id)
1287
 
        if executable[0] != executable[1] and executable[1] is not None:
1288
 
            tt.set_executability(executable[1], trans_id)
1289
1291
        if (name[1] is not None and 
1290
1292
            (name[0] != name[1] or parent[0] != parent[1])):
1291
1293
            tt.adjust_path(name[1], tt.trans_id_file_id(parent[1]), trans_id)