/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/tests/blackbox/test_uncommit.py

Merge bzr.dev and fully converted uses of new parents api.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
131
131
        tree2.commit('unchanged', rev_id='b3')
132
132
        tree2.commit('unchanged', rev_id='b4')
133
133
 
134
 
        wt.branch.fetch(tree2.branch)
135
 
        wt.set_pending_merges(['b4'])
 
134
        self.merge(tree2.branch, wt)
136
135
        wt.commit('merge b4', rev_id='a3')
137
136
 
138
 
        self.assertEqual('a3', wt.last_revision())
139
 
        self.assertEqual([], wt.pending_merges())
 
137
        self.assertEqual(['a3'], wt.get_parent_ids())
140
138
 
141
139
        os.chdir('tree')
142
140
        out, err = self.run_bzr('uncommit', '--force')
143
141
 
144
 
        self.assertEqual('a2', wt.last_revision())
145
 
        self.assertEqual(['b4'], wt.pending_merges())
 
142
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
146
143
 
147
144
    def test_uncommit_multiple_merge(self):
148
145
        wt = self.create_simple_tree()
150
147
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
151
148
 
152
149
        tree2.commit('unchanged', rev_id='b3')
153
 
        wt.branch.fetch(tree2.branch)
154
 
        wt.set_pending_merges(['b3'])
 
150
 
 
151
        self.merge(tree2.branch, wt)
155
152
        wt.commit('merge b3', rev_id='a3')
156
153
 
157
154
        tree2.commit('unchanged', rev_id='b4')
158
 
        wt.branch.fetch(tree2.branch)
159
 
        wt.set_pending_merges(['b4'])
 
155
 
 
156
        self.merge(tree2.branch, wt)
160
157
        wt.commit('merge b4', rev_id='a4')
161
158
 
162
 
        self.assertEqual('a4', wt.last_revision())
163
 
        self.assertEqual([], wt.pending_merges())
 
159
        self.assertEqual(['a4'], wt.get_parent_ids())
164
160
 
165
161
        os.chdir('tree')
166
162
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
167
163
 
168
 
        self.assertEqual('a2', wt.last_revision())
169
 
        self.assertEqual(['b3', 'b4'], wt.pending_merges())
 
164
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
170
165
 
171
166
    def test_uncommit_octopus_merge(self):
172
167
        # Check that uncommit keeps the pending merges in the same order
177
172
 
178
173
        tree2.commit('unchanged', rev_id='b3')
179
174
        tree3.commit('unchanged', rev_id='c3')
180
 
        wt.branch.fetch(tree2.branch)
181
 
        wt.branch.fetch(tree3.branch)
182
 
        wt.set_pending_merges(['b3', 'c3'])
 
175
        
 
176
        self.merge(tree2.branch, wt)
 
177
        self.merge(tree3.branch, wt)
183
178
        wt.commit('merge b3, c3', rev_id='a3')
184
179
 
185
180
        tree2.commit('unchanged', rev_id='b4')
186
181
        tree3.commit('unchanged', rev_id='c4')
187
 
        wt.branch.fetch(tree2.branch)
188
 
        wt.branch.fetch(tree3.branch)
189
 
        wt.set_pending_merges(['c4', 'b4'])
 
182
 
 
183
        self.merge(tree3.branch, wt)
 
184
        self.merge(tree2.branch, wt)
190
185
        wt.commit('merge b4, c4', rev_id='a4')
191
186
 
192
 
        self.assertEqual('a4', wt.last_revision())
193
 
        self.assertEqual([], wt.pending_merges())
 
187
        self.assertEqual(['a4'], wt.get_parent_ids())
194
188
 
195
189
        os.chdir('tree')
196
190
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
197
191
 
198
 
        self.assertEqual('a2', wt.last_revision())
199
 
        self.assertEqual(['b3', 'c3', 'c4', 'b4'], wt.pending_merges())
 
192
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())