← 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: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
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
 
 
69
63
    def test_uncommit_checkout(self):
70
64
        wt = self.create_simple_tree()
71
65
        checkout_tree = wt.branch.create_checkout('checkout')
73
67
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
74
68
 
75
69
        os.chdir('checkout')
76
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
70
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
77
71
        self.assertContainsRe(out, 'Dry-run')
78
72
        self.assertNotContainsRe(out, 'initial commit')
79
73
        self.assertContainsRe(out, 'second commit')
80
74
 
81
75
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
82
76
 
83
 
        out, err = self.run_bzr('uncommit --force')
 
77
        out, err = self.run_bzr('uncommit', '--force')
84
78
        self.assertNotContainsRe(out, 'initial commit')
85
79
        self.assertContainsRe(out, 'second commit')
86
80
 
110
104
        b.pull(t_a.branch)
111
105
        uncommit.uncommit(b)
112
106
 
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
 
 
125
107
    def test_uncommit_revision(self):
126
108
        wt = self.create_simple_tree()
127
109
 
128
110
        os.chdir('tree')
129
 
        out, err = self.run_bzr('uncommit -r1 --force')
 
111
        out, err = self.run_bzr('uncommit', '-r1', '--force')
130
112
 
131
113
        self.assertNotContainsRe(out, 'initial commit')
132
114
        self.assertContainsRe(out, 'second commit')
136
118
    def test_uncommit_neg_1(self):
137
119
        wt = self.create_simple_tree()
138
120
        os.chdir('tree')
139
 
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
 
121
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
140
122
        self.assertEqual('No revisions to uncommit.\n', out)
141
123
 
142
124
    def test_uncommit_merges(self):
153
135
        self.assertEqual(['a3'], wt.get_parent_ids())
154
136
 
155
137
        os.chdir('tree')
156
 
        out, err = self.run_bzr('uncommit --force')
 
138
        out, err = self.run_bzr('uncommit', '--force')
157
139
 
158
140
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
159
141
 
166
148
        wt.set_pending_merges(['b3'])
167
149
 
168
150
        os.chdir('tree')
169
 
        out, err = self.run_bzr('uncommit --force')
 
151
        out, err = self.run_bzr('uncommit', '--force')
170
152
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
171
153
 
172
154
    def test_uncommit_multiple_merge(self):
173
155
        wt = self.create_simple_tree()
174
156
 
175
157
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
158
 
176
159
        tree2.commit('unchanged', rev_id='b3')
177
160
 
178
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
179
 
        tree3.commit('unchanged', rev_id='c3')
180
 
 
181
161
        wt.merge_from_branch(tree2.branch)
182
162
        wt.commit('merge b3', rev_id='a3')
183
163
 
184
 
        wt.merge_from_branch(tree3.branch)
185
 
        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')
186
168
 
187
169
        self.assertEqual(['a4'], wt.get_parent_ids())
188
170
 
189
171
        os.chdir('tree')
190
 
        out, err = self.run_bzr('uncommit --force -r 2')
 
172
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
191
173
 
192
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
174
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
193
175
 
194
176
    def test_uncommit_merge_plus_pending(self):
195
177
        wt = self.create_simple_tree()
196
178
 
197
179
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
180
 
198
181
        tree2.commit('unchanged', rev_id='b3')
199
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
200
 
        tree3.commit('unchanged', rev_id='c3')
201
 
 
202
182
        wt.branch.fetch(tree2.branch)
203
183
        wt.set_pending_merges(['b3'])
204
184
        wt.commit('merge b3', rev_id='a3')
205
185
 
206
 
 
207
 
        wt.merge_from_branch(tree3.branch)
208
 
 
209
 
        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())
210
191
 
211
192
        os.chdir('tree')
212
 
        out, err = self.run_bzr('uncommit --force -r 2')
 
193
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
213
194
 
214
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
195
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
215
196
 
216
197
    def test_uncommit_octopus_merge(self):
217
198
        # Check that uncommit keeps the pending merges in the same order
218
 
        # though it will also filter out ones in the ancestry
219
199
        wt = self.create_simple_tree()
220
200
 
221
201
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
238
218
        self.assertEqual(['a4'], wt.get_parent_ids())
239
219
 
240
220
        os.chdir('tree')
241
 
        out, err = self.run_bzr('uncommit --force -r 2')
242
 
 
243
 
        self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
244
 
 
245
 
    def test_uncommit_nonascii(self):
246
 
        tree = self.make_branch_and_tree('tree')
247
 
        tree.commit(u'\u1234 message')
248
 
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
249
 
        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())