/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

  • Committer: Carl Friedrich Bolz
  • Date: 2006-09-06 21:17:22 UTC
  • mfrom: (1977 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2026.
  • Revision ID: cfbolz@gmx.de-20060906211722-b04f9c3ad1f53ef1
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
25
25
 
26
26
 
27
27
class TestUncommit(TestCaseWithTransport):
 
28
 
28
29
    def create_simple_tree(self):
29
30
        wt = self.make_branch_and_tree('tree')
30
31
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
90
91
        a = BzrDirMetaFormat1().initialize('a')
91
92
        a.create_repository()
92
93
        a.create_branch()
93
 
        t = a.create_workingtree()
94
 
        t.commit('commit 1')
95
 
        t.commit('commit 2')
96
 
        t.commit('commit 3')
97
 
        b = t.bzrdir.sprout('b').open_branch()
98
 
        b.bind(t.branch)
 
94
        t_a = a.create_workingtree()
 
95
        t_a.commit('commit 1')
 
96
        t_a.commit('commit 2')
 
97
        t_a.commit('commit 3')
 
98
        b = t_a.bzrdir.sprout('b').open_branch()
 
99
        b.bind(t_a.branch)
99
100
        uncommit.uncommit(b)
100
 
        t.set_last_revision(t.branch.last_revision())
101
101
        self.assertEqual(len(b.revision_history()), 2)
102
 
        self.assertEqual(len(t.branch.revision_history()), 2)
103
 
        t.commit('commit 3b')
 
102
        self.assertEqual(len(t_a.branch.revision_history()), 2)
 
103
        # update A's tree to not have the uncomitted revision referenced.
 
104
        t_a.update()
 
105
        t_a.commit('commit 3b')
104
106
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
105
 
        b.pull(t.branch)
 
107
        b.pull(t_a.branch)
106
108
        uncommit.uncommit(b)
107
109
 
108
110
    def test_uncommit_revision(self):
130
132
        tree2.commit('unchanged', rev_id='b3')
131
133
        tree2.commit('unchanged', rev_id='b4')
132
134
 
133
 
        wt.branch.fetch(tree2.branch)
134
 
        wt.set_pending_merges(['b4'])
 
135
        self.merge(tree2.branch, wt)
135
136
        wt.commit('merge b4', rev_id='a3')
136
137
 
 
138
        self.assertEqual(['a3'], wt.get_parent_ids())
 
139
 
 
140
        os.chdir('tree')
 
141
        out, err = self.run_bzr('uncommit', '--force')
 
142
 
 
143
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
 
144
 
 
145
    def test_uncommit_pending_merge(self):
 
146
        wt = self.create_simple_tree()
 
147
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
148
        tree2.commit('unchanged', rev_id='b3')
 
149
 
 
150
        wt.branch.fetch(tree2.branch)
 
151
        wt.set_pending_merges(['b3'])
 
152
 
 
153
        os.chdir('tree')
 
154
        out, err = self.run_bzr('uncommit', '--force')
 
155
        self.assertEqual('a1', wt.last_revision())
 
156
        self.assertEqual(['b3'], wt.pending_merges())
 
157
 
 
158
    def test_uncommit_multiple_merge(self):
 
159
        wt = self.create_simple_tree()
 
160
 
 
161
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
162
 
 
163
        tree2.commit('unchanged', rev_id='b3')
 
164
 
 
165
        self.merge(tree2.branch, wt)
 
166
        wt.commit('merge b3', rev_id='a3')
 
167
 
 
168
        tree2.commit('unchanged', rev_id='b4')
 
169
 
 
170
        self.merge(tree2.branch, wt)
 
171
        wt.commit('merge b4', rev_id='a4')
 
172
 
 
173
        self.assertEqual(['a4'], wt.get_parent_ids())
 
174
 
 
175
        os.chdir('tree')
 
176
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
177
 
 
178
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
 
179
 
 
180
    def test_uncommit_merge_plus_pending(self):
 
181
        wt = self.create_simple_tree()
 
182
 
 
183
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
184
 
 
185
        tree2.commit('unchanged', rev_id='b3')
 
186
        wt.branch.fetch(tree2.branch)
 
187
        wt.set_pending_merges(['b3'])
 
188
        wt.commit('merge b3', rev_id='a3')
 
189
 
 
190
        tree2.commit('unchanged', rev_id='b4')
 
191
        wt.branch.fetch(tree2.branch)
 
192
        wt.set_pending_merges(['b4'])
 
193
 
137
194
        self.assertEqual('a3', wt.last_revision())
138
 
        self.assertEqual([], wt.pending_merges())
139
 
 
140
 
        os.chdir('tree')
141
 
        out, err = self.run_bzr('uncommit', '--force')
142
 
 
143
 
        self.assertEqual('a2', wt.last_revision())
144
195
        self.assertEqual(['b4'], wt.pending_merges())
145
196
 
146
 
    def test_uncommit_multiple_merge(self):
147
 
        wt = self.create_simple_tree()
148
 
 
149
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
150
 
 
151
 
        tree2.commit('unchanged', rev_id='b3')
152
 
        wt.branch.fetch(tree2.branch)
153
 
        wt.set_pending_merges(['b3'])
154
 
        wt.commit('merge b3', rev_id='a3')
155
 
 
156
 
        tree2.commit('unchanged', rev_id='b4')
157
 
        wt.branch.fetch(tree2.branch)
158
 
        wt.set_pending_merges(['b4'])
159
 
        wt.commit('merge b4', rev_id='a4')
160
 
 
161
 
        self.assertEqual('a4', wt.last_revision())
162
 
        self.assertEqual([], wt.pending_merges())
163
 
 
164
197
        os.chdir('tree')
165
198
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
166
199
 
176
209
 
177
210
        tree2.commit('unchanged', rev_id='b3')
178
211
        tree3.commit('unchanged', rev_id='c3')
179
 
        wt.branch.fetch(tree2.branch)
180
 
        wt.branch.fetch(tree3.branch)
181
 
        wt.set_pending_merges(['b3', 'c3'])
 
212
        
 
213
        self.merge(tree2.branch, wt)
 
214
        self.merge(tree3.branch, wt)
182
215
        wt.commit('merge b3, c3', rev_id='a3')
183
216
 
184
217
        tree2.commit('unchanged', rev_id='b4')
185
218
        tree3.commit('unchanged', rev_id='c4')
186
 
        wt.branch.fetch(tree2.branch)
187
 
        wt.branch.fetch(tree3.branch)
188
 
        wt.set_pending_merges(['c4', 'b4'])
 
219
 
 
220
        self.merge(tree3.branch, wt)
 
221
        self.merge(tree2.branch, wt)
189
222
        wt.commit('merge b4, c4', rev_id='a4')
190
223
 
191
 
        self.assertEqual('a4', wt.last_revision())
192
 
        self.assertEqual([], wt.pending_merges())
 
224
        self.assertEqual(['a4'], wt.get_parent_ids())
193
225
 
194
226
        os.chdir('tree')
195
227
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
196
228
 
197
 
        self.assertEqual('a2', wt.last_revision())
198
 
        self.assertEqual(['b3', 'c3', 'c4', 'b4'], wt.pending_merges())
 
229
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())