← 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: Canonical.com Patch Queue Manager
  • Date: 2008-04-07 07:52:50 UTC
  • mfrom: (3340.1.1 208418-1.4)
  • Revision ID: pqm@pqm.ubuntu.com-20080407075250-phs53xnslo8boaeo
Return the correct knit serialisation method in _StreamAccess.
        (Andrew Bennetts, Martin Pool, Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005, 2006 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
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
 
104
110
        b.pull(t_a.branch)
105
111
        uncommit.uncommit(b)
106
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
 
107
125
    def test_uncommit_revision(self):
108
126
        wt = self.create_simple_tree()
109
127
 
110
128
        os.chdir('tree')
111
 
        out, err = self.run_bzr('uncommit', '-r1', '--force')
 
129
        out, err = self.run_bzr('uncommit -r1 --force')
112
130
 
113
131
        self.assertNotContainsRe(out, 'initial commit')
114
132
        self.assertContainsRe(out, 'second commit')
118
136
    def test_uncommit_neg_1(self):
119
137
        wt = self.create_simple_tree()
120
138
        os.chdir('tree')
121
 
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
 
139
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
122
140
        self.assertEqual('No revisions to uncommit.\n', out)
123
141
 
124
142
    def test_uncommit_merges(self):
135
153
        self.assertEqual(['a3'], wt.get_parent_ids())
136
154
 
137
155
        os.chdir('tree')
138
 
        out, err = self.run_bzr('uncommit', '--force')
 
156
        out, err = self.run_bzr('uncommit --force')
139
157
 
140
158
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
141
159
 
148
166
        wt.set_pending_merges(['b3'])
149
167
 
150
168
        os.chdir('tree')
151
 
        out, err = self.run_bzr('uncommit', '--force')
 
169
        out, err = self.run_bzr('uncommit --force')
152
170
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
153
171
 
154
172
    def test_uncommit_multiple_merge(self):
169
187
        self.assertEqual(['a4'], wt.get_parent_ids())
170
188
 
171
189
        os.chdir('tree')
172
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
190
        out, err = self.run_bzr('uncommit --force -r 2')
173
191
 
174
192
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
175
193
 
190
208
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
191
209
 
192
210
        os.chdir('tree')
193
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
211
        out, err = self.run_bzr('uncommit --force -r 2')
194
212
 
195
213
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
196
214
 
218
236
        self.assertEqual(['a4'], wt.get_parent_ids())
219
237
 
220
238
        os.chdir('tree')
221
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
239
        out, err = self.run_bzr('uncommit --force -r 2')
222
240
 
223
241
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())
 
242
 
 
243
    def test_uncommit_nonascii(self):
 
244
        tree = self.make_branch_and_tree('tree')
 
245
        tree.commit(u'\u1234 message')
 
246
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
 
247
        self.assertContainsRe(out, r'\? message')