← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_uncommit.py

Remove usage of tree.pending_merges().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 by 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Test the uncommit command."""
18
18
 
22
22
from bzrlib.bzrdir import BzrDirMetaFormat1
23
23
from bzrlib.errors import BzrError, BoundBranchOutOfDate
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests.script import ScriptRunner
26
25
 
27
26
 
28
27
class TestUncommit(TestCaseWithTransport):
29
 
 
30
28
    def create_simple_tree(self):
31
29
        wt = self.make_branch_and_tree('tree')
32
30
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
33
31
        wt.add(['a', 'b', 'c'])
34
32
        wt.commit('initial commit', rev_id='a1')
35
33
 
36
 
        self.build_tree_contents([('tree/a', 'new contents of a\n')])
 
34
        open('tree/a', 'wb').write('new contents of a\n')
37
35
        wt.commit('second commit', rev_id='a2')
38
36
 
39
37
        return wt
43
41
        wt = self.create_simple_tree()
44
42
 
45
43
        os.chdir('tree')
46
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
44
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
47
45
        self.assertContainsRe(out, 'Dry-run')
48
46
        self.assertNotContainsRe(out, 'initial commit')
49
47
        self.assertContainsRe(out, 'second commit')
50
48
 
51
49
        # Nothing has changed
52
 
        self.assertEqual(['a2'], wt.get_parent_ids())
 
50
        self.assertEqual('a2', wt.last_revision())
53
51
 
54
52
        # Uncommit, don't prompt
55
 
        out, err = self.run_bzr('uncommit --force')
 
53
        out, err = self.run_bzr('uncommit', '--force')
56
54
        self.assertNotContainsRe(out, 'initial commit')
57
55
        self.assertContainsRe(out, 'second commit')
58
56
 
59
57
        # This should look like we are back in revno 1
60
 
        self.assertEqual(['a1'], wt.get_parent_ids())
 
58
        self.assertEqual('a1', wt.last_revision())
61
59
        out, err = self.run_bzr('status')
62
60
        self.assertEquals(out, 'modified:\n  a\n')
63
61
 
64
 
    def test_uncommit_no_history(self):
65
 
        wt = self.make_branch_and_tree('tree')
66
 
        out, err = self.run_bzr('uncommit --force', retcode=1)
67
 
        self.assertEqual('', err)
68
 
        self.assertEqual('No revisions to uncommit.\n', out)
69
 
 
70
62
    def test_uncommit_checkout(self):
71
63
        wt = self.create_simple_tree()
72
 
        checkout_tree = wt.branch.create_checkout('checkout')
73
 
 
74
 
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
 
64
 
 
65
        checkout_tree = wt.bzrdir.sprout('checkout').open_workingtree()
 
66
        checkout_tree.branch.bind(wt.branch)
 
67
 
 
68
        self.assertEqual('a2', checkout_tree.last_revision())
75
69
 
76
70
        os.chdir('checkout')
77
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
71
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
78
72
        self.assertContainsRe(out, 'Dry-run')
79
73
        self.assertNotContainsRe(out, 'initial commit')
80
74
        self.assertContainsRe(out, 'second commit')
81
75
 
82
 
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
 
76
        self.assertEqual('a2', checkout_tree.last_revision())
83
77
 
84
 
        out, err = self.run_bzr('uncommit --force')
 
78
        out, err = self.run_bzr('uncommit', '--force')
85
79
        self.assertNotContainsRe(out, 'initial commit')
86
80
        self.assertContainsRe(out, 'second commit')
87
81
 
88
82
        # uncommit in a checkout should uncommit the parent branch
89
83
        # (but doesn't effect the other working tree)
90
 
        self.assertEquals(['a1'], checkout_tree.get_parent_ids())
 
84
        self.assertEquals('a1', checkout_tree.last_revision())
91
85
        self.assertEquals('a1', wt.branch.last_revision())
92
 
        self.assertEquals(['a2'], wt.get_parent_ids())
 
86
        self.assertEquals('a2', wt.last_revision())
93
87
 
94
88
    def test_uncommit_bound(self):
95
89
        os.mkdir('a')
100
94
        t_a.commit('commit 1')
101
95
        t_a.commit('commit 2')
102
96
        t_a.commit('commit 3')
103
 
        b = t_a.branch.create_checkout('b').branch
 
97
        b = t_a.bzrdir.sprout('b').open_branch()
 
98
        b.bind(t_a.branch)
104
99
        uncommit.uncommit(b)
105
100
        self.assertEqual(len(b.revision_history()), 2)
106
101
        self.assertEqual(len(t_a.branch.revision_history()), 2)
107
 
        # update A's tree to not have the uncommitted revision referenced.
 
102
        # update A's tree to not have the uncomitted revision referenced.
108
103
        t_a.update()
109
104
        t_a.commit('commit 3b')
110
105
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
111
106
        b.pull(t_a.branch)
112
107
        uncommit.uncommit(b)
113
108
 
114
 
    def test_uncommit_bound_local(self):
115
 
        t_a = self.make_branch_and_tree('a')
116
 
        rev_id1 = t_a.commit('commit 1')
117
 
        rev_id2 = t_a.commit('commit 2')
118
 
        rev_id3 = t_a.commit('commit 3')
119
 
        b = t_a.branch.create_checkout('b').branch
120
 
 
121
 
        out, err = self.run_bzr(['uncommit', '--local', 'b', '--force'])
122
 
        self.assertEqual(rev_id3, t_a.last_revision())
123
 
        self.assertEqual((3, rev_id3), t_a.branch.last_revision_info())
124
 
        self.assertEqual((2, rev_id2), b.last_revision_info())
125
 
 
126
109
    def test_uncommit_revision(self):
127
110
        wt = self.create_simple_tree()
128
111
 
129
112
        os.chdir('tree')
130
 
        out, err = self.run_bzr('uncommit -r1 --force')
 
113
        out, err = self.run_bzr('uncommit', '-r1', '--force')
131
114
 
132
115
        self.assertNotContainsRe(out, 'initial commit')
133
116
        self.assertContainsRe(out, 'second commit')
134
 
        self.assertEqual(['a1'], wt.get_parent_ids())
 
117
        self.assertEqual('a1', wt.last_revision())
135
118
        self.assertEqual('a1', wt.branch.last_revision())
136
119
 
137
120
    def test_uncommit_neg_1(self):
138
121
        wt = self.create_simple_tree()
139
122
        os.chdir('tree')
140
 
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
 
123
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
141
124
        self.assertEqual('No revisions to uncommit.\n', out)
142
125
 
143
126
    def test_uncommit_merges(self):
148
131
        tree2.commit('unchanged', rev_id='b3')
149
132
        tree2.commit('unchanged', rev_id='b4')
150
133
 
151
 
        wt.merge_from_branch(tree2.branch)
 
134
        self.merge(tree2.branch, wt)
152
135
        wt.commit('merge b4', rev_id='a3')
153
136
 
154
137
        self.assertEqual(['a3'], wt.get_parent_ids())
155
138
 
156
139
        os.chdir('tree')
157
 
        out, err = self.run_bzr('uncommit --force')
 
140
        out, err = self.run_bzr('uncommit', '--force')
158
141
 
159
142
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
160
143
 
161
 
    def test_uncommit_pending_merge(self):
162
 
        wt = self.create_simple_tree()
163
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
164
 
        tree2.commit('unchanged', rev_id='b3')
165
 
 
166
 
        wt.branch.fetch(tree2.branch)
167
 
        wt.set_pending_merges(['b3'])
168
 
 
169
 
        os.chdir('tree')
170
 
        out, err = self.run_bzr('uncommit --force')
171
 
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
172
 
 
173
144
    def test_uncommit_multiple_merge(self):
174
145
        wt = self.create_simple_tree()
175
146
 
176
147
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
148
 
177
149
        tree2.commit('unchanged', rev_id='b3')
178
150
 
179
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
180
 
        tree3.commit('unchanged', rev_id='c3')
181
 
 
182
 
        wt.merge_from_branch(tree2.branch)
 
151
        self.merge(tree2.branch, wt)
183
152
        wt.commit('merge b3', rev_id='a3')
184
153
 
185
 
        wt.merge_from_branch(tree3.branch)
186
 
        wt.commit('merge c3', rev_id='a4')
 
154
        tree2.commit('unchanged', rev_id='b4')
 
155
 
 
156
        self.merge(tree2.branch, wt)
 
157
        wt.commit('merge b4', rev_id='a4')
187
158
 
188
159
        self.assertEqual(['a4'], wt.get_parent_ids())
189
160
 
190
161
        os.chdir('tree')
191
 
        out, err = self.run_bzr('uncommit --force -r 2')
192
 
 
193
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
194
 
 
195
 
    def test_uncommit_merge_plus_pending(self):
196
 
        wt = self.create_simple_tree()
197
 
 
198
 
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
199
 
        tree2.commit('unchanged', rev_id='b3')
200
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
201
 
        tree3.commit('unchanged', rev_id='c3')
202
 
 
203
 
        wt.branch.fetch(tree2.branch)
204
 
        wt.set_pending_merges(['b3'])
205
 
        wt.commit('merge b3', rev_id='a3')
206
 
 
207
 
 
208
 
        wt.merge_from_branch(tree3.branch)
209
 
 
210
 
        self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
211
 
 
212
 
        os.chdir('tree')
213
 
        out, err = self.run_bzr('uncommit --force -r 2')
214
 
 
215
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
216
 
 
217
 
    def test_uncommit_shows_log_with_revision_id(self):
218
 
        wt = self.create_simple_tree()
219
 
 
220
 
        script = ScriptRunner()
221
 
        script.run_script(self, """
222
 
$ cd tree
223
 
$ bzr uncommit --force 
224
 
    2 ...
225
 
      second commit
226
 
...
227
 
The above revision(s) will be removed.
228
 
You can restore the old tip by running:
229
 
  bzr pull . -r revid:a2
230
 
""")
 
162
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
163
 
 
164
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
231
165
 
232
166
    def test_uncommit_octopus_merge(self):
233
167
        # Check that uncommit keeps the pending merges in the same order
234
 
        # though it will also filter out ones in the ancestry
235
168
        wt = self.create_simple_tree()
236
169
 
237
170
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
239
172
 
240
173
        tree2.commit('unchanged', rev_id='b3')
241
174
        tree3.commit('unchanged', rev_id='c3')
242
 
 
243
 
        wt.merge_from_branch(tree2.branch)
244
 
        wt.merge_from_branch(tree3.branch, force=True)
 
175
        
 
176
        self.merge(tree2.branch, wt)
 
177
        self.merge(tree3.branch, wt)
245
178
        wt.commit('merge b3, c3', rev_id='a3')
246
179
 
247
180
        tree2.commit('unchanged', rev_id='b4')
248
181
        tree3.commit('unchanged', rev_id='c4')
249
182
 
250
 
        wt.merge_from_branch(tree3.branch)
251
 
        wt.merge_from_branch(tree2.branch, force=True)
 
183
        self.merge(tree3.branch, wt)
 
184
        self.merge(tree2.branch, wt)
252
185
        wt.commit('merge b4, c4', rev_id='a4')
253
186
 
254
187
        self.assertEqual(['a4'], wt.get_parent_ids())
255
188
 
256
189
        os.chdir('tree')
257
 
        out, err = self.run_bzr('uncommit --force -r 2')
258
 
 
259
 
        self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
260
 
 
261
 
    def test_uncommit_nonascii(self):
262
 
        tree = self.make_branch_and_tree('tree')
263
 
        tree.commit(u'\u1234 message')
264
 
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
265
 
        self.assertContainsRe(out, r'\? message')
 
190
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
191
 
 
192
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())