/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/per_workingtree/test_unversion.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_unversion.py
49
49
        revtree = tree.branch.repository.revision_tree(revid)
50
50
        tree.rename_one('del/sub', 'sub')
51
51
        self.assertThat(
52
 
                tree,
53
 
                HasPathRelations(revtree, [('', ''), ('del/', 'del/'), ('sub/', 'del/sub/'), ('sub/b', 'del/sub/b')]))
 
52
            tree,
 
53
            HasPathRelations(revtree, [('', ''), ('del/', 'del/'), ('sub/', 'del/sub/'), ('sub/b', 'del/sub/b')]))
54
54
        if tree.has_versioned_directories():
55
55
            tree.unversion(['del', 'sub/b'])
56
56
        else:
57
57
            tree.unversion(['sub/b'])
58
58
        self.assertThat(
59
 
                tree,
60
 
                HasPathRelations(revtree, [('', ''), ('sub/', 'del/sub/')]))
 
59
            tree,
 
60
            HasPathRelations(revtree, [('', ''), ('sub/', 'del/sub/')]))
61
61
 
62
62
    def test_unversion_several_files(self):
63
63
        """After unversioning several files, they should not be versioned."""
136
136
        tree.move(['dir/f3'], 'dir2')
137
137
 
138
138
        self.assertThat(
139
 
                tree, HasPathRelations(
140
 
                    revtree,
141
 
                    [('', ''), ('dir/', 'dir/'), ('dir2/', 'dir2/'),
142
 
                     ('dir/a', 'dir/f1'), ('dir/z', 'dir/f2'),
143
 
                     ('dir2/f3', 'dir/f3')]))
 
139
            tree, HasPathRelations(
 
140
                revtree,
 
141
                [('', ''), ('dir/', 'dir/'), ('dir2/', 'dir2/'),
 
142
                 ('dir/a', 'dir/f1'), ('dir/z', 'dir/f2'),
 
143
                 ('dir2/f3', 'dir/f3')]))
144
144
 
145
145
        tree.unversion({'dir'})
146
146
        self.assertThat(
147
 
                tree,
148
 
                HasPathRelations(
149
 
                    revtree,
150
 
                    [('', ''), ('dir2/', 'dir2/'), ('dir2/f3', 'dir/f3')]))
 
147
            tree,
 
148
            HasPathRelations(
 
149
                revtree,
 
150
                [('', ''), ('dir2/', 'dir2/'), ('dir2/f3', 'dir/f3')]))
151
151
 
152
152
    def test_unversion_after_conflicted_merge(self):
153
153
        # Test for bug #114615
164
164
        tree_b.commit('delete in B')
165
165
 
166
166
        self.assertThat(
167
 
                tree_b,
168
 
                HasPathRelations(
169
 
                    tree_a,
170
 
                    [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
 
167
            tree_b,
 
168
            HasPathRelations(
 
169
                tree_a,
 
170
                [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
171
171
 
172
172
        self.build_tree_contents([('A/a/n', b'new contents for n\n')])
173
173
        tree_a.commit('change n in A')
179
179
        self.assertEqual(4, num_conflicts)
180
180
 
181
181
        self.assertThat(
182
 
                tree_b,
183
 
                HasPathRelations(
184
 
                    tree_a,
185
 
                    [('', ''), ('a/', 'a/'), ('xyz/', None),
186
 
                     ('a/n.OTHER', 'a/n'), ('xyz/m', 'a/m')]))
 
182
            tree_b,
 
183
            HasPathRelations(
 
184
                tree_a,
 
185
                [('', ''), ('a/', 'a/'), ('xyz/', None),
 
186
                 ('a/n.OTHER', 'a/n'), ('xyz/m', 'a/m')]))
187
187
 
188
188
        tree_b.unversion(['a'])
189
189
        self.assertThat(
190
 
                tree_b,
191
 
                HasPathRelations(
192
 
                    tree_a,
193
 
                    [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))
 
190
            tree_b,
 
191
            HasPathRelations(
 
192
                tree_a,
 
193
                [('', ''), ('xyz/', None), ('xyz/m', 'a/m')]))