/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 breezy/tests/test_transform.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-16 19:38:39 UTC
  • mfrom: (6852.3.1 is-versioned)
  • Revision ID: jelmer@jelmer.uk-20180216193839-a0efzmp1o64g86ln
Merge lp:~jelmer/brz/is-versioned.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
920
920
        self.assertEqual([NonDirectoryParent('Created directory', 'parent.new',
921
921
        'parent-id')], cooked_conflicts)
922
922
        tt.apply()
923
 
        self.assertEqual(None, self.wt.path2id('parent'))
 
923
        self.assertFalse(self.wt.is_versioned('parent'))
924
924
        self.assertEqual('parent-id', self.wt.path2id('parent.new'))
925
925
 
926
926
    def test_resolve_conflicts_wrong_new_parent_kind(self):
936
936
        self.assertEqual({('non-directory parent', 'Created directory',
937
937
                         'new-3')}, raw_conflicts)
938
938
        tt.apply()
939
 
        self.assertEqual(None, self.wt.path2id('parent'))
 
939
        self.assertFalse(self.wt.is_versioned('parent'))
940
940
        self.assertEqual('parent-id', self.wt.path2id('parent.new'))
941
941
 
942
942
    def test_resolve_conflicts_wrong_parent_kind_unversioned(self):
950
950
        tt.create_file('contents', parent_id)
951
951
        resolve_conflicts(tt)
952
952
        tt.apply()
953
 
        self.assertIs(None, self.wt.path2id('parent'))
954
 
        self.assertIs(None, self.wt.path2id('parent.new'))
 
953
        self.assertFalse(self.wt.is_versioned('parent'))
 
954
        self.assertFalse(self.wt.is_versioned('parent.new'))
955
955
 
956
956
    def test_resolve_conflicts_missing_parent(self):
957
957
        wt = self.make_branch_and_tree('.')
2896
2896
        preview.unversion_file(preview.trans_id_file_id('deleted-id'))
2897
2897
        preview_tree = preview.get_preview_tree()
2898
2898
        self.assertEqual('unchanged-id', preview_tree.path2id('unchanged'))
2899
 
        self.assertIs(None, preview_tree.path2id('deleted'))
 
2899
        self.assertFalse(preview_tree.is_versioned('deleted'))
2900
2900
 
2901
2901
    def test_path2id_created(self):
2902
2902
        tree = self.make_branch_and_tree('tree')
2921
2921
        preview.adjust_path('child', new_parent,
2922
2922
                            preview.trans_id_file_id('child-id'))
2923
2923
        preview_tree = preview.get_preview_tree()
2924
 
        self.assertIs(None, preview_tree.path2id('old_parent/child'))
 
2924
        self.assertFalse(preview_tree.is_versioned('old_parent/child'))
2925
2925
        self.assertEqual('child-id', preview_tree.path2id('new_parent/child'))
2926
2926
 
2927
2927
    def test_path2id_renamed_parent(self):
2934
2934
        preview.adjust_path('new_name', preview.root,
2935
2935
                            preview.trans_id_file_id('parent-id'))
2936
2936
        preview_tree = preview.get_preview_tree()
2937
 
        self.assertIs(None, preview_tree.path2id('old_name/child'))
 
2937
        self.assertFalse(preview_tree.is_versioned('old_name/child'))
2938
2938
        self.assertEqual('child-id', preview_tree.path2id('new_name/child'))
2939
2939
 
2940
2940
    def assertMatchingIterEntries(self, tt, specific_file_ids=None):