← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Crufty but existing _iter_changes implementation for WorkingTreeFormat4.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1340
1340
    target_tree.lock_read()
1341
1341
    tt = TreeTransform(working_tree, pb)
1342
1342
    try:
1343
 
        interesting_ids = find_interesting(working_tree, target_tree, filenames)
1344
1343
        pp = ProgressPhase("Revert phase", 3, pb)
1345
1344
        pp.next_phase()
1346
1345
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1347
1346
        try:
1348
1347
            _alter_files(working_tree, target_tree, tt, child_pb,
1349
 
                         interesting_ids, backups)
 
1348
                         filenames, backups)
1350
1349
        finally:
1351
1350
            child_pb.finished()
1352
1351
        pp.next_phase()
1371
1370
    return conflicts
1372
1371
 
1373
1372
 
1374
 
def _alter_files(working_tree, target_tree, tt, pb, interesting_ids,
 
1373
def _alter_files(working_tree, target_tree, tt, pb, specific_files,
1375
1374
                 backups):
1376
1375
    merge_modified = working_tree.merge_modified()
1377
1376
    change_list = target_tree._iter_changes(working_tree,
1378
 
        specific_file_ids=interesting_ids, pb=pb)
 
1377
        specific_files=specific_files, pb=pb)
1379
1378
    if target_tree.inventory.root is None:
1380
1379
        skip_root = True
1381
1380
    else: