← 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

  • Committer: Alexander Belchenko
  • Date: 2006-10-14 08:51:07 UTC
  • mto: (2080.1.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 2081.
  • Revision ID: bialix@ukr.net-20061014085107-8dff865674eed30a
win32 installer: make short info page instead of full GPL license text

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):
33
32
        wt.add(['a', 'b', 'c'])
34
33
        wt.commit('initial commit', rev_id='a1')
35
34
 
36
 
        self.build_tree_contents([('tree/a', 'new contents of a\n')])
 
35
        open('tree/a', 'wb').write('new contents of a\n')
37
36
        wt.commit('second commit', rev_id='a2')
38
37
 
39
38
        return wt
43
42
        wt = self.create_simple_tree()
44
43
 
45
44
        os.chdir('tree')
46
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
45
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
47
46
        self.assertContainsRe(out, 'Dry-run')
48
47
        self.assertNotContainsRe(out, 'initial commit')
49
48
        self.assertContainsRe(out, 'second commit')
52
51
        self.assertEqual(['a2'], wt.get_parent_ids())
53
52
 
54
53
        # Uncommit, don't prompt
55
 
        out, err = self.run_bzr('uncommit --force')
 
54
        out, err = self.run_bzr('uncommit', '--force')
56
55
        self.assertNotContainsRe(out, 'initial commit')
57
56
        self.assertContainsRe(out, 'second commit')
58
57
 
61
60
        out, err = self.run_bzr('status')
62
61
        self.assertEquals(out, 'modified:\n  a\n')
63
62
 
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
63
    def test_uncommit_checkout(self):
71
64
        wt = self.create_simple_tree()
72
65
        checkout_tree = wt.branch.create_checkout('checkout')
74
67
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
75
68
 
76
69
        os.chdir('checkout')
77
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
70
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
78
71
        self.assertContainsRe(out, 'Dry-run')
79
72
        self.assertNotContainsRe(out, 'initial commit')
80
73
        self.assertContainsRe(out, 'second commit')
81
74
 
82
75
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
83
76
 
84
 
        out, err = self.run_bzr('uncommit --force')
 
77
        out, err = self.run_bzr('uncommit', '--force')
85
78
        self.assertNotContainsRe(out, 'initial commit')
86
79
        self.assertContainsRe(out, 'second commit')
87
80
 
104
97
        uncommit.uncommit(b)
105
98
        self.assertEqual(len(b.revision_history()), 2)
106
99
        self.assertEqual(len(t_a.branch.revision_history()), 2)
107
 
        # update A's tree to not have the uncommitted revision referenced.
 
100
        # update A's tree to not have the uncomitted revision referenced.
108
101
        t_a.update()
109
102
        t_a.commit('commit 3b')
110
103
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
111
104
        b.pull(t_a.branch)
112
105
        uncommit.uncommit(b)
113
106
 
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
107
    def test_uncommit_revision(self):
127
108
        wt = self.create_simple_tree()
128
109
 
129
110
        os.chdir('tree')
130
 
        out, err = self.run_bzr('uncommit -r1 --force')
 
111
        out, err = self.run_bzr('uncommit', '-r1', '--force')
131
112
 
132
113
        self.assertNotContainsRe(out, 'initial commit')
133
114
        self.assertContainsRe(out, 'second commit')
137
118
    def test_uncommit_neg_1(self):
138
119
        wt = self.create_simple_tree()
139
120
        os.chdir('tree')
140
 
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
 
121
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
141
122
        self.assertEqual('No revisions to uncommit.\n', out)
142
123
 
143
124
    def test_uncommit_merges(self):
154
135
        self.assertEqual(['a3'], wt.get_parent_ids())
155
136
 
156
137
        os.chdir('tree')
157
 
        out, err = self.run_bzr('uncommit --force')
 
138
        out, err = self.run_bzr('uncommit', '--force')
158
139
 
159
140
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
160
141
 
167
148
        wt.set_pending_merges(['b3'])
168
149
 
169
150
        os.chdir('tree')
170
 
        out, err = self.run_bzr('uncommit --force')
 
151
        out, err = self.run_bzr('uncommit', '--force')
171
152
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
172
153
 
173
154
    def test_uncommit_multiple_merge(self):
174
155
        wt = self.create_simple_tree()
175
156
 
176
157
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
158
 
177
159
        tree2.commit('unchanged', rev_id='b3')
178
160
 
179
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
180
 
        tree3.commit('unchanged', rev_id='c3')
181
 
 
182
161
        wt.merge_from_branch(tree2.branch)
183
162
        wt.commit('merge b3', rev_id='a3')
184
163
 
185
 
        wt.merge_from_branch(tree3.branch)
186
 
        wt.commit('merge c3', rev_id='a4')
 
164
        tree2.commit('unchanged', rev_id='b4')
 
165
 
 
166
        wt.merge_from_branch(tree2.branch)
 
167
        wt.commit('merge b4', rev_id='a4')
187
168
 
188
169
        self.assertEqual(['a4'], wt.get_parent_ids())
189
170
 
190
171
        os.chdir('tree')
191
 
        out, err = self.run_bzr('uncommit --force -r 2')
 
172
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
192
173
 
193
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
174
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
194
175
 
195
176
    def test_uncommit_merge_plus_pending(self):
196
177
        wt = self.create_simple_tree()
197
178
 
198
179
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
180
 
199
181
        tree2.commit('unchanged', rev_id='b3')
200
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
201
 
        tree3.commit('unchanged', rev_id='c3')
202
 
 
203
182
        wt.branch.fetch(tree2.branch)
204
183
        wt.set_pending_merges(['b3'])
205
184
        wt.commit('merge b3', rev_id='a3')
206
185
 
207
 
 
208
 
        wt.merge_from_branch(tree3.branch)
209
 
 
210
 
        self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
 
186
        tree2.commit('unchanged', rev_id='b4')
 
187
        wt.branch.fetch(tree2.branch)
 
188
        wt.set_pending_merges(['b4'])
 
189
 
 
190
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
211
191
 
212
192
        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
 
""")
 
193
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
194
 
 
195
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
231
196
 
232
197
    def test_uncommit_octopus_merge(self):
233
198
        # Check that uncommit keeps the pending merges in the same order
234
 
        # though it will also filter out ones in the ancestry
235
199
        wt = self.create_simple_tree()
236
200
 
237
201
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
239
203
 
240
204
        tree2.commit('unchanged', rev_id='b3')
241
205
        tree3.commit('unchanged', rev_id='c3')
242
 
 
 
206
        
243
207
        wt.merge_from_branch(tree2.branch)
244
 
        wt.merge_from_branch(tree3.branch, force=True)
 
208
        wt.merge_from_branch(tree3.branch)
245
209
        wt.commit('merge b3, c3', rev_id='a3')
246
210
 
247
211
        tree2.commit('unchanged', rev_id='b4')
248
212
        tree3.commit('unchanged', rev_id='c4')
249
213
 
250
214
        wt.merge_from_branch(tree3.branch)
251
 
        wt.merge_from_branch(tree2.branch, force=True)
 
215
        wt.merge_from_branch(tree2.branch)
252
216
        wt.commit('merge b4, c4', rev_id='a4')
253
217
 
254
218
        self.assertEqual(['a4'], wt.get_parent_ids())
255
219
 
256
220
        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')
 
221
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
222
 
 
223
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())