/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

First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005, 2006 by Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
32
32
        wt.add(['a', 'b', 'c'])
33
33
        wt.commit('initial commit', rev_id='a1')
34
34
 
35
 
        open('tree/a', 'wb').write('new contents of a\n')
 
35
        self.build_tree_contents([('tree/a', 'new contents of a\n')])
36
36
        wt.commit('second commit', rev_id='a2')
37
37
 
38
38
        return wt
42
42
        wt = self.create_simple_tree()
43
43
 
44
44
        os.chdir('tree')
45
 
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
 
45
        out, err = self.run_bzr('uncommit --dry-run --force')
46
46
        self.assertContainsRe(out, 'Dry-run')
47
47
        self.assertNotContainsRe(out, 'initial commit')
48
48
        self.assertContainsRe(out, 'second commit')
51
51
        self.assertEqual(['a2'], wt.get_parent_ids())
52
52
 
53
53
        # Uncommit, don't prompt
54
 
        out, err = self.run_bzr('uncommit', '--force')
 
54
        out, err = self.run_bzr('uncommit --force')
55
55
        self.assertNotContainsRe(out, 'initial commit')
56
56
        self.assertContainsRe(out, 'second commit')
57
57
 
60
60
        out, err = self.run_bzr('status')
61
61
        self.assertEquals(out, 'modified:\n  a\n')
62
62
 
 
63
    def test_uncommit_no_history(self):
 
64
        wt = self.make_branch_and_tree('tree')
 
65
        out, err = self.run_bzr('uncommit --force', retcode=1)
 
66
        self.assertEqual('', err)
 
67
        self.assertEqual('No revisions to uncommit.\n', out)
 
68
 
63
69
    def test_uncommit_checkout(self):
64
70
        wt = self.create_simple_tree()
65
 
 
66
 
        checkout_tree = wt.bzrdir.sprout('checkout').open_workingtree()
67
 
        checkout_tree.branch.bind(wt.branch)
 
71
        checkout_tree = wt.branch.create_checkout('checkout')
68
72
 
69
73
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
70
74
 
71
75
        os.chdir('checkout')
72
 
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
 
76
        out, err = self.run_bzr('uncommit --dry-run --force')
73
77
        self.assertContainsRe(out, 'Dry-run')
74
78
        self.assertNotContainsRe(out, 'initial commit')
75
79
        self.assertContainsRe(out, 'second commit')
76
80
 
77
81
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
78
82
 
79
 
        out, err = self.run_bzr('uncommit', '--force')
 
83
        out, err = self.run_bzr('uncommit --force')
80
84
        self.assertNotContainsRe(out, 'initial commit')
81
85
        self.assertContainsRe(out, 'second commit')
82
86
 
95
99
        t_a.commit('commit 1')
96
100
        t_a.commit('commit 2')
97
101
        t_a.commit('commit 3')
98
 
        b = t_a.bzrdir.sprout('b').open_branch()
99
 
        b.bind(t_a.branch)
 
102
        b = t_a.branch.create_checkout('b').branch
100
103
        uncommit.uncommit(b)
101
104
        self.assertEqual(len(b.revision_history()), 2)
102
105
        self.assertEqual(len(t_a.branch.revision_history()), 2)
107
110
        b.pull(t_a.branch)
108
111
        uncommit.uncommit(b)
109
112
 
 
113
    def test_uncommit_bound_local(self):
 
114
        t_a = self.make_branch_and_tree('a')
 
115
        rev_id1 = t_a.commit('commit 1')
 
116
        rev_id2 = t_a.commit('commit 2')
 
117
        rev_id3 = t_a.commit('commit 3')
 
118
        b = t_a.branch.create_checkout('b').branch
 
119
 
 
120
        out, err = self.run_bzr(['uncommit', '--local', 'b', '--force'])
 
121
        self.assertEqual(rev_id3, t_a.last_revision())
 
122
        self.assertEqual((3, rev_id3), t_a.branch.last_revision_info())
 
123
        self.assertEqual((2, rev_id2), b.last_revision_info())
 
124
 
110
125
    def test_uncommit_revision(self):
111
126
        wt = self.create_simple_tree()
112
127
 
113
128
        os.chdir('tree')
114
 
        out, err = self.run_bzr('uncommit', '-r1', '--force')
 
129
        out, err = self.run_bzr('uncommit -r1 --force')
115
130
 
116
131
        self.assertNotContainsRe(out, 'initial commit')
117
132
        self.assertContainsRe(out, 'second commit')
121
136
    def test_uncommit_neg_1(self):
122
137
        wt = self.create_simple_tree()
123
138
        os.chdir('tree')
124
 
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
 
139
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
125
140
        self.assertEqual('No revisions to uncommit.\n', out)
126
141
 
127
142
    def test_uncommit_merges(self):
138
153
        self.assertEqual(['a3'], wt.get_parent_ids())
139
154
 
140
155
        os.chdir('tree')
141
 
        out, err = self.run_bzr('uncommit', '--force')
 
156
        out, err = self.run_bzr('uncommit --force')
142
157
 
143
158
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
144
159
 
151
166
        wt.set_pending_merges(['b3'])
152
167
 
153
168
        os.chdir('tree')
154
 
        out, err = self.run_bzr('uncommit', '--force')
 
169
        out, err = self.run_bzr('uncommit --force')
155
170
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
156
171
 
157
172
    def test_uncommit_multiple_merge(self):
158
173
        wt = self.create_simple_tree()
159
174
 
160
175
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
161
 
 
162
176
        tree2.commit('unchanged', rev_id='b3')
163
177
 
 
178
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
179
        tree3.commit('unchanged', rev_id='c3')
 
180
 
164
181
        wt.merge_from_branch(tree2.branch)
165
182
        wt.commit('merge b3', rev_id='a3')
166
183
 
167
 
        tree2.commit('unchanged', rev_id='b4')
168
 
 
169
 
        wt.merge_from_branch(tree2.branch)
170
 
        wt.commit('merge b4', rev_id='a4')
 
184
        wt.merge_from_branch(tree3.branch)
 
185
        wt.commit('merge c3', rev_id='a4')
171
186
 
172
187
        self.assertEqual(['a4'], wt.get_parent_ids())
173
188
 
174
189
        os.chdir('tree')
175
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
190
        out, err = self.run_bzr('uncommit --force -r 2')
176
191
 
177
 
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
 
192
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
178
193
 
179
194
    def test_uncommit_merge_plus_pending(self):
180
195
        wt = self.create_simple_tree()
181
196
 
182
197
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
183
 
 
184
198
        tree2.commit('unchanged', rev_id='b3')
 
199
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
200
        tree3.commit('unchanged', rev_id='c3')
 
201
 
185
202
        wt.branch.fetch(tree2.branch)
186
203
        wt.set_pending_merges(['b3'])
187
204
        wt.commit('merge b3', rev_id='a3')
188
205
 
189
 
        tree2.commit('unchanged', rev_id='b4')
190
 
        wt.branch.fetch(tree2.branch)
191
 
        wt.set_pending_merges(['b4'])
192
 
 
193
 
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
 
206
 
 
207
        wt.merge_from_branch(tree3.branch)
 
208
 
 
209
        self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
194
210
 
195
211
        os.chdir('tree')
196
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
197
 
 
198
 
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
 
212
        out, err = self.run_bzr('uncommit --force -r 2')
 
213
 
 
214
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
215
 
 
216
    def test_uncommit_shows_log_with_revision_id(self):
 
217
        wt = self.create_simple_tree()
 
218
 
 
219
        out, err = self.run_bzr('uncommit --force', working_dir='tree')
 
220
        self.assertContainsRe(out, r'second commit')
 
221
        self.assertContainsRe(err, r'You can restore the old tip by running')
 
222
        self.assertContainsRe(err, r'bzr pull . -r revid:a2')
199
223
 
200
224
    def test_uncommit_octopus_merge(self):
201
225
        # Check that uncommit keeps the pending merges in the same order
 
226
        # though it will also filter out ones in the ancestry
202
227
        wt = self.create_simple_tree()
203
228
 
204
229
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
206
231
 
207
232
        tree2.commit('unchanged', rev_id='b3')
208
233
        tree3.commit('unchanged', rev_id='c3')
209
 
        
 
234
 
210
235
        wt.merge_from_branch(tree2.branch)
211
236
        wt.merge_from_branch(tree3.branch)
212
237
        wt.commit('merge b3, c3', rev_id='a3')
221
246
        self.assertEqual(['a4'], wt.get_parent_ids())
222
247
 
223
248
        os.chdir('tree')
224
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
225
 
 
226
 
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())
 
249
        out, err = self.run_bzr('uncommit --force -r 2')
 
250
 
 
251
        self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
 
252
 
 
253
    def test_uncommit_nonascii(self):
 
254
        tree = self.make_branch_and_tree('tree')
 
255
        tree.commit(u'\u1234 message')
 
256
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
 
257
        self.assertContainsRe(out, r'\? message')