← 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-02-21 17:35:39 UTC
  • mto: (1558.1.4 Aaron's integration)
  • mto: This revision was merged to the branch mainline in revision 1565.
  • Revision ID: abentley@panoramicfeedback.com-20060221173539-9b29d7f9991d08c3
Show progress bars in revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
978
978
    def interesting(file_id):
979
979
        return interesting_ids is None or file_id in interesting_ids
980
980
 
981
 
    tt = TreeTransform(working_tree)
 
981
    tt = TreeTransform(working_tree, pb)
982
982
    try:
983
983
        trans_id = {}
984
984
        def get_trans_id(file_id):
1004
1004
            pb.update("New file check", id_num+1, len(sorted_interesting))
1005
1005
            if file_id not in target_tree:
1006
1006
                tt.unversion_file(tt.get_id_tree(file_id))
1007
 
        raw_conflicts = resolve_conflicts(tt)
 
1007
        raw_conflicts = resolve_conflicts(tt, pb)
1008
1008
        for line in conflicts_strings(cook_conflicts(raw_conflicts, tt)):
1009
1009
            warning(line)
1010
1010
        tt.apply()