/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: John Arbash Meinel
  • Date: 2011-04-14 14:59:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5847.
  • Revision ID: john@arbash-meinel.com-20110414145910-yovxz9rephqynmmt
Now swap the ordering, tests still pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
2846
2846
    # than the target changes relative to the working tree. Because WT4 has an
2847
2847
    # optimizer to compare itself to a target, but no optimizer for the
2848
2848
    # reverse.
2849
 
    change_list = target_tree.iter_changes(working_tree,
2850
 
    # change_list = working_tree.iter_changes(target_tree,
 
2849
    change_list = working_tree.iter_changes(target_tree,
2851
2850
        specific_files=specific_files, pb=pb)
2852
2851
    if target_tree.get_root_id() is None:
2853
2852
        skip_root = True
2857
2856
        deferred_files = []
2858
2857
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2859
2858
                kind, executable) in enumerate(change_list):
2860
 
            # target_path, wt_path = path
2861
 
            # target_versioned, wt_versioned = versioned
2862
 
            # target_parent, wt_parent = parent
2863
 
            # target_name, wt_name = name
2864
 
            # target_kind, wt_kind = kind
2865
 
            # target_executable, wt_executable = executable
2866
 
            wt_path, target_path = path
2867
 
            wt_versioned, target_versioned = versioned
2868
 
            wt_parent, target_parent = parent
2869
 
            wt_name, target_name = name
2870
 
            wt_kind, target_kind = kind
2871
 
            wt_executable, target_executable = executable
 
2859
            target_path, wt_path = path
 
2860
            target_versioned, wt_versioned = versioned
 
2861
            target_parent, wt_parent = parent
 
2862
            target_name, wt_name = name
 
2863
            target_kind, wt_kind = kind
 
2864
            target_executable, wt_executable = executable
2872
2865
            if skip_root and wt_parent is None:
2873
2866
                continue
2874
2867
            trans_id = tt.trans_id_file_id(file_id)