/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: Aaron Bentley
  • Date: 2006-09-28 13:48:10 UTC
  • mfrom: (2049 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
48
48
        self.assertContainsRe(out, 'second commit')
49
49
 
50
50
        # Nothing has changed
51
 
        self.assertEqual('a2', wt.last_revision())
 
51
        self.assertEqual(['a2'], wt.get_parent_ids())
52
52
 
53
53
        # Uncommit, don't prompt
54
54
        out, err = self.run_bzr('uncommit', '--force')
56
56
        self.assertContainsRe(out, 'second commit')
57
57
 
58
58
        # This should look like we are back in revno 1
59
 
        self.assertEqual('a1', wt.last_revision())
 
59
        self.assertEqual(['a1'], wt.get_parent_ids())
60
60
        out, err = self.run_bzr('status')
61
61
        self.assertEquals(out, 'modified:\n  a\n')
62
62
 
63
63
    def test_uncommit_checkout(self):
64
64
        wt = self.create_simple_tree()
65
 
 
66
 
        checkout_tree = wt.bzrdir.sprout('checkout').open_workingtree()
67
 
        checkout_tree.branch.bind(wt.branch)
68
 
 
69
 
        self.assertEqual('a2', checkout_tree.last_revision())
 
65
        checkout_tree = wt.branch.create_checkout('checkout')
 
66
 
 
67
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
70
68
 
71
69
        os.chdir('checkout')
72
70
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
74
72
        self.assertNotContainsRe(out, 'initial commit')
75
73
        self.assertContainsRe(out, 'second commit')
76
74
 
77
 
        self.assertEqual('a2', checkout_tree.last_revision())
 
75
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
78
76
 
79
77
        out, err = self.run_bzr('uncommit', '--force')
80
78
        self.assertNotContainsRe(out, 'initial commit')
82
80
 
83
81
        # uncommit in a checkout should uncommit the parent branch
84
82
        # (but doesn't effect the other working tree)
85
 
        self.assertEquals('a1', checkout_tree.last_revision())
 
83
        self.assertEquals(['a1'], checkout_tree.get_parent_ids())
86
84
        self.assertEquals('a1', wt.branch.last_revision())
87
 
        self.assertEquals('a2', wt.last_revision())
 
85
        self.assertEquals(['a2'], wt.get_parent_ids())
88
86
 
89
87
    def test_uncommit_bound(self):
90
88
        os.mkdir('a')
91
89
        a = BzrDirMetaFormat1().initialize('a')
92
90
        a.create_repository()
93
91
        a.create_branch()
94
 
        t = a.create_workingtree()
95
 
        t.commit('commit 1')
96
 
        t.commit('commit 2')
97
 
        t.commit('commit 3')
98
 
        b = t.bzrdir.sprout('b').open_branch()
99
 
        b.bind(t.branch)
 
92
        t_a = a.create_workingtree()
 
93
        t_a.commit('commit 1')
 
94
        t_a.commit('commit 2')
 
95
        t_a.commit('commit 3')
 
96
        b = t_a.branch.create_checkout('b').branch
100
97
        uncommit.uncommit(b)
101
 
        t.set_last_revision(t.branch.last_revision())
102
98
        self.assertEqual(len(b.revision_history()), 2)
103
 
        self.assertEqual(len(t.branch.revision_history()), 2)
104
 
        t.commit('commit 3b')
 
99
        self.assertEqual(len(t_a.branch.revision_history()), 2)
 
100
        # update A's tree to not have the uncomitted revision referenced.
 
101
        t_a.update()
 
102
        t_a.commit('commit 3b')
105
103
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
106
 
        b.pull(t.branch)
 
104
        b.pull(t_a.branch)
107
105
        uncommit.uncommit(b)
108
106
 
109
107
    def test_uncommit_revision(self):
114
112
 
115
113
        self.assertNotContainsRe(out, 'initial commit')
116
114
        self.assertContainsRe(out, 'second commit')
117
 
        self.assertEqual('a1', wt.last_revision())
 
115
        self.assertEqual(['a1'], wt.get_parent_ids())
118
116
        self.assertEqual('a1', wt.branch.last_revision())
119
117
 
120
118
    def test_uncommit_neg_1(self):
131
129
        tree2.commit('unchanged', rev_id='b3')
132
130
        tree2.commit('unchanged', rev_id='b4')
133
131
 
134
 
        wt.branch.fetch(tree2.branch)
135
 
        wt.set_pending_merges(['b4'])
 
132
        wt.merge_from_branch(tree2.branch)
136
133
        wt.commit('merge b4', rev_id='a3')
137
134
 
138
 
        self.assertEqual('a3', wt.last_revision())
139
 
        self.assertEqual([], wt.pending_merges())
 
135
        self.assertEqual(['a3'], wt.get_parent_ids())
140
136
 
141
137
        os.chdir('tree')
142
138
        out, err = self.run_bzr('uncommit', '--force')
143
139
 
144
 
        self.assertEqual('a2', wt.last_revision())
145
 
        self.assertEqual(['b4'], wt.pending_merges())
 
140
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
146
141
 
147
142
    def test_uncommit_pending_merge(self):
148
143
        wt = self.create_simple_tree()
154
149
 
155
150
        os.chdir('tree')
156
151
        out, err = self.run_bzr('uncommit', '--force')
157
 
        self.assertEqual('a1', wt.last_revision())
158
 
        self.assertEqual(['b3'], wt.pending_merges())
 
152
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
159
153
 
160
154
    def test_uncommit_multiple_merge(self):
161
155
        wt = self.create_simple_tree()
163
157
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
164
158
 
165
159
        tree2.commit('unchanged', rev_id='b3')
166
 
        wt.branch.fetch(tree2.branch)
167
 
        wt.set_pending_merges(['b3'])
 
160
 
 
161
        wt.merge_from_branch(tree2.branch)
168
162
        wt.commit('merge b3', rev_id='a3')
169
163
 
170
164
        tree2.commit('unchanged', rev_id='b4')
171
 
        wt.branch.fetch(tree2.branch)
172
 
        wt.set_pending_merges(['b4'])
 
165
 
 
166
        wt.merge_from_branch(tree2.branch)
173
167
        wt.commit('merge b4', rev_id='a4')
174
168
 
175
 
        self.assertEqual('a4', wt.last_revision())
176
 
        self.assertEqual([], wt.pending_merges())
 
169
        self.assertEqual(['a4'], wt.get_parent_ids())
177
170
 
178
171
        os.chdir('tree')
179
172
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
180
173
 
181
 
        self.assertEqual('a2', wt.last_revision())
182
 
        self.assertEqual(['b3', 'b4'], wt.pending_merges())
 
174
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
183
175
 
184
176
    def test_uncommit_merge_plus_pending(self):
185
177
        wt = self.create_simple_tree()
195
187
        wt.branch.fetch(tree2.branch)
196
188
        wt.set_pending_merges(['b4'])
197
189
 
198
 
        self.assertEqual('a3', wt.last_revision())
199
 
        self.assertEqual(['b4'], wt.pending_merges())
 
190
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
200
191
 
201
192
        os.chdir('tree')
202
193
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
203
194
 
204
 
        self.assertEqual('a2', wt.last_revision())
205
 
        self.assertEqual(['b3', 'b4'], wt.pending_merges())
 
195
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
206
196
 
207
197
    def test_uncommit_octopus_merge(self):
208
198
        # Check that uncommit keeps the pending merges in the same order
213
203
 
214
204
        tree2.commit('unchanged', rev_id='b3')
215
205
        tree3.commit('unchanged', rev_id='c3')
216
 
        wt.branch.fetch(tree2.branch)
217
 
        wt.branch.fetch(tree3.branch)
218
 
        wt.set_pending_merges(['b3', 'c3'])
 
206
        
 
207
        wt.merge_from_branch(tree2.branch)
 
208
        wt.merge_from_branch(tree3.branch)
219
209
        wt.commit('merge b3, c3', rev_id='a3')
220
210
 
221
211
        tree2.commit('unchanged', rev_id='b4')
222
212
        tree3.commit('unchanged', rev_id='c4')
223
 
        wt.branch.fetch(tree2.branch)
224
 
        wt.branch.fetch(tree3.branch)
225
 
        wt.set_pending_merges(['c4', 'b4'])
 
213
 
 
214
        wt.merge_from_branch(tree3.branch)
 
215
        wt.merge_from_branch(tree2.branch)
226
216
        wt.commit('merge b4, c4', rev_id='a4')
227
217
 
228
 
        self.assertEqual('a4', wt.last_revision())
229
 
        self.assertEqual([], wt.pending_merges())
 
218
        self.assertEqual(['a4'], wt.get_parent_ids())
230
219
 
231
220
        os.chdir('tree')
232
221
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
233
222
 
234
 
        self.assertEqual('a2', wt.last_revision())
235
 
        self.assertEqual(['b3', 'c3', 'c4', 'b4'], wt.pending_merges())
 
223
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())