← 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: Vincent Ladeuil
  • Date: 2008-01-03 08:49:38 UTC
  • mfrom: (3111.1.31 175524)
  • mto: This revision was merged to the branch mainline in revision 3158.
  • Revision ID: v.ladeuil+lp@free.fr-20080103084938-7kvurk5uvde2ui54
https://launchpad.net/bugs/175524
Fix bug #175524, http test servers are 1.1 compliant

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
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
71
        checkout_tree = wt.branch.create_checkout('checkout')
67
73
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
68
74
 
69
75
        os.chdir('checkout')
70
 
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
 
76
        out, err = self.run_bzr('uncommit --dry-run --force')
71
77
        self.assertContainsRe(out, 'Dry-run')
72
78
        self.assertNotContainsRe(out, 'initial commit')
73
79
        self.assertContainsRe(out, 'second commit')
74
80
 
75
81
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
76
82
 
77
 
        out, err = self.run_bzr('uncommit', '--force')
 
83
        out, err = self.run_bzr('uncommit --force')
78
84
        self.assertNotContainsRe(out, 'initial commit')
79
85
        self.assertContainsRe(out, 'second commit')
80
86
 
108
114
        wt = self.create_simple_tree()
109
115
 
110
116
        os.chdir('tree')
111
 
        out, err = self.run_bzr('uncommit', '-r1', '--force')
 
117
        out, err = self.run_bzr('uncommit -r1 --force')
112
118
 
113
119
        self.assertNotContainsRe(out, 'initial commit')
114
120
        self.assertContainsRe(out, 'second commit')
118
124
    def test_uncommit_neg_1(self):
119
125
        wt = self.create_simple_tree()
120
126
        os.chdir('tree')
121
 
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
 
127
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
122
128
        self.assertEqual('No revisions to uncommit.\n', out)
123
129
 
124
130
    def test_uncommit_merges(self):
135
141
        self.assertEqual(['a3'], wt.get_parent_ids())
136
142
 
137
143
        os.chdir('tree')
138
 
        out, err = self.run_bzr('uncommit', '--force')
 
144
        out, err = self.run_bzr('uncommit --force')
139
145
 
140
146
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
141
147
 
148
154
        wt.set_pending_merges(['b3'])
149
155
 
150
156
        os.chdir('tree')
151
 
        out, err = self.run_bzr('uncommit', '--force')
 
157
        out, err = self.run_bzr('uncommit --force')
152
158
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
153
159
 
154
160
    def test_uncommit_multiple_merge(self):
169
175
        self.assertEqual(['a4'], wt.get_parent_ids())
170
176
 
171
177
        os.chdir('tree')
172
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
178
        out, err = self.run_bzr('uncommit --force -r 2')
173
179
 
174
180
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
175
181
 
190
196
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
191
197
 
192
198
        os.chdir('tree')
193
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
199
        out, err = self.run_bzr('uncommit --force -r 2')
194
200
 
195
201
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
196
202
 
218
224
        self.assertEqual(['a4'], wt.get_parent_ids())
219
225
 
220
226
        os.chdir('tree')
221
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
227
        out, err = self.run_bzr('uncommit --force -r 2')
222
228
 
223
229
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())
 
230
 
 
231
    def test_uncommit_nonascii(self):
 
232
        tree = self.make_branch_and_tree('tree')
 
233
        tree.commit(u'\u1234 message')
 
234
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
 
235
        self.assertContainsRe(out, r'\? message')