← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Refactored the revert phases

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
23
23
                           ExistingLimbo, ImmortalLimbo)
24
24
from bzrlib.inventory import InventoryEntry
25
25
from bzrlib.osutils import file_kind, supports_executable, pathjoin
26
 
from bzrlib.progress import DummyProgress
 
26
from bzrlib.progress import DummyProgress, ProgressPhase
27
27
from bzrlib.trace import mutter, warning
28
28
import bzrlib.ui 
29
29
 
1037
1037
            except KeyError:
1038
1038
                return tt.trans_id_tree_file_id(file_id)
1039
1039
 
1040
 
        pb.update("Revert phase", 0, 4)
 
1040
        pp = ProgressPhase("Revert phase", 4, pb)
 
1041
        pp.next_phase()
1041
1042
        sorted_interesting = [i for i in topology_sorted_ids(target_tree) if
1042
1043
                              interesting(i)]
1043
1044
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1059
1060
                                 trans_id_file_id, backup_this, trans_id)
1060
1061
        finally:
1061
1062
            child_pb.finished()
1062
 
        pb.update("Revert phase", 1, 4)
 
1063
        pp.next_phase()
1063
1064
        wt_interesting = [i for i in working_tree.inventory if interesting(i)]
1064
1065
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1065
1066
        try:
1074
1075
                        del merge_modified[file_id]
1075
1076
        finally:
1076
1077
            child_pb.finished()
1077
 
        pb.update("Revert phase", 2, 4)
 
1078
        pp.next_phase()
1078
1079
        child_pb = bzrlib.ui.ui_factory.nested_progress_bar()
1079
1080
        try:
1080
1081
            raw_conflicts = resolve_conflicts(tt, child_pb)
1082
1083
            child_pb.finished()
1083
1084
        for line in conflicts_strings(cook_conflicts(raw_conflicts, tt)):
1084
1085
            warning(line)
1085
 
        pb.update("Revert phase", 3, 3)
 
1086
        pp.next_phase()
1086
1087
        tt.apply()
1087
1088
        working_tree.set_merge_modified({})
1088
1089
    finally: