/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:58:39 UTC
  • mto: This revision was merged to the branch mainline in revision 5847.
  • Revision ID: john@arbash-meinel.com-20110414145839-eq4h06513nc7u4lg
catch a couple more cases

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,
2849
2850
    # change_list = working_tree.iter_changes(target_tree,
2850
 
    change_list = target_tree.iter_changes(working_tree,
2851
2851
        specific_files=specific_files, pb=pb)
2852
2852
    if target_tree.get_root_id() is None:
2853
2853
        skip_root = True
2857
2857
        deferred_files = []
2858
2858
        for id_num, (file_id, path, changed_content, versioned, parent, name,
2859
2859
                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
2860
2866
            wt_path, target_path = path
2861
2867
            wt_versioned, target_versioned = versioned
2862
2868
            wt_parent, target_parent = parent
2892
2898
                            wt_name, parent_trans_id)
2893
2899
                        tt.adjust_path(backup_name, parent_trans_id, trans_id)
2894
2900
                        new_trans_id = tt.create_path(wt_name, parent_trans_id)
2895
 
                        if versioned == (True, True):
 
2901
                        if wt_versioned and target_versioned:
2896
2902
                            tt.unversion_file(trans_id)
2897
2903
                            tt.version_file(file_id, new_trans_id)
2898
2904
                        # New contents should have the same unix perms as old
2926
2932
                        tt.set_executability(target_executable, trans_id)
2927
2933
                elif target_kind is not None:
2928
2934
                    raise AssertionError(target_kind)
2929
 
            if versioned == (False, True):
 
2935
            if not wt_versioned and target_versioned:
2930
2936
                tt.version_file(file_id, trans_id)
2931
 
            if versioned == (True, False):
 
2937
            if wt_versioned and not target_versioned:
2932
2938
                tt.unversion_file(trans_id)
2933
2939
            if (target_name is not None and
2934
2940
                (wt_name != target_name or wt_parent != target_parent)):