← 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: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
25
25
 
26
26
 
27
27
class TestUncommit(TestCaseWithTransport):
 
28
 
28
29
    def create_simple_tree(self):
29
30
        wt = self.make_branch_and_tree('tree')
30
31
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
47
48
        self.assertContainsRe(out, 'second commit')
48
49
 
49
50
        # Nothing has changed
50
 
        self.assertEqual('a2', wt.last_revision())
 
51
        self.assertEqual(['a2'], wt.get_parent_ids())
51
52
 
52
53
        # Uncommit, don't prompt
53
54
        out, err = self.run_bzr('uncommit', '--force')
55
56
        self.assertContainsRe(out, 'second commit')
56
57
 
57
58
        # This should look like we are back in revno 1
58
 
        self.assertEqual('a1', wt.last_revision())
 
59
        self.assertEqual(['a1'], wt.get_parent_ids())
59
60
        out, err = self.run_bzr('status')
60
61
        self.assertEquals(out, 'modified:\n  a\n')
61
62
 
65
66
        checkout_tree = wt.bzrdir.sprout('checkout').open_workingtree()
66
67
        checkout_tree.branch.bind(wt.branch)
67
68
 
68
 
        self.assertEqual('a2', checkout_tree.last_revision())
 
69
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
69
70
 
70
71
        os.chdir('checkout')
71
72
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
73
74
        self.assertNotContainsRe(out, 'initial commit')
74
75
        self.assertContainsRe(out, 'second commit')
75
76
 
76
 
        self.assertEqual('a2', checkout_tree.last_revision())
 
77
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
77
78
 
78
79
        out, err = self.run_bzr('uncommit', '--force')
79
80
        self.assertNotContainsRe(out, 'initial commit')
81
82
 
82
83
        # uncommit in a checkout should uncommit the parent branch
83
84
        # (but doesn't effect the other working tree)
84
 
        self.assertEquals('a1', checkout_tree.last_revision())
 
85
        self.assertEquals(['a1'], checkout_tree.get_parent_ids())
85
86
        self.assertEquals('a1', wt.branch.last_revision())
86
 
        self.assertEquals('a2', wt.last_revision())
 
87
        self.assertEquals(['a2'], wt.get_parent_ids())
87
88
 
88
89
    def test_uncommit_bound(self):
89
90
        os.mkdir('a')
90
91
        a = BzrDirMetaFormat1().initialize('a')
91
92
        a.create_repository()
92
93
        a.create_branch()
93
 
        t = a.create_workingtree()
94
 
        t.commit('commit 1')
95
 
        t.commit('commit 2')
96
 
        t.commit('commit 3')
97
 
        b = t.bzrdir.sprout('b').open_branch()
98
 
        b.bind(t.branch)
 
94
        t_a = a.create_workingtree()
 
95
        t_a.commit('commit 1')
 
96
        t_a.commit('commit 2')
 
97
        t_a.commit('commit 3')
 
98
        b = t_a.bzrdir.sprout('b').open_branch()
 
99
        b.bind(t_a.branch)
99
100
        uncommit.uncommit(b)
100
 
        t.set_last_revision(t.branch.last_revision())
101
101
        self.assertEqual(len(b.revision_history()), 2)
102
 
        self.assertEqual(len(t.branch.revision_history()), 2)
103
 
        t.commit('commit 3b')
 
102
        self.assertEqual(len(t_a.branch.revision_history()), 2)
 
103
        # update A's tree to not have the uncomitted revision referenced.
 
104
        t_a.update()
 
105
        t_a.commit('commit 3b')
104
106
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
105
 
        b.pull(t.branch)
 
107
        b.pull(t_a.branch)
106
108
        uncommit.uncommit(b)
107
109
 
108
110
    def test_uncommit_revision(self):
113
115
 
114
116
        self.assertNotContainsRe(out, 'initial commit')
115
117
        self.assertContainsRe(out, 'second commit')
116
 
        self.assertEqual('a1', wt.last_revision())
 
118
        self.assertEqual(['a1'], wt.get_parent_ids())
117
119
        self.assertEqual('a1', wt.branch.last_revision())
118
120
 
119
121
    def test_uncommit_neg_1(self):
130
132
        tree2.commit('unchanged', rev_id='b3')
131
133
        tree2.commit('unchanged', rev_id='b4')
132
134
 
133
 
        wt.branch.fetch(tree2.branch)
134
 
        wt.set_pending_merges(['b4'])
 
135
        wt.merge_from_branch(tree2.branch)
135
136
        wt.commit('merge b4', rev_id='a3')
136
137
 
137
 
        self.assertEqual('a3', wt.last_revision())
138
 
        self.assertEqual([], wt.pending_merges())
139
 
 
140
 
        os.chdir('tree')
141
 
        out, err = self.run_bzr('uncommit', '--force')
142
 
 
143
 
        self.assertEqual('a2', wt.last_revision())
144
 
        self.assertEqual(['b4'], wt.pending_merges())
 
138
        self.assertEqual(['a3'], wt.get_parent_ids())
 
139
 
 
140
        os.chdir('tree')
 
141
        out, err = self.run_bzr('uncommit', '--force')
 
142
 
 
143
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
 
144
 
 
145
    def test_uncommit_pending_merge(self):
 
146
        wt = self.create_simple_tree()
 
147
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
148
        tree2.commit('unchanged', rev_id='b3')
 
149
 
 
150
        wt.branch.fetch(tree2.branch)
 
151
        wt.set_pending_merges(['b3'])
 
152
 
 
153
        os.chdir('tree')
 
154
        out, err = self.run_bzr('uncommit', '--force')
 
155
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
145
156
 
146
157
    def test_uncommit_multiple_merge(self):
147
158
        wt = self.create_simple_tree()
149
160
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
150
161
 
151
162
        tree2.commit('unchanged', rev_id='b3')
152
 
        wt.branch.fetch(tree2.branch)
153
 
        wt.set_pending_merges(['b3'])
 
163
 
 
164
        wt.merge_from_branch(tree2.branch)
154
165
        wt.commit('merge b3', rev_id='a3')
155
166
 
156
167
        tree2.commit('unchanged', rev_id='b4')
157
 
        wt.branch.fetch(tree2.branch)
158
 
        wt.set_pending_merges(['b4'])
 
168
 
 
169
        wt.merge_from_branch(tree2.branch)
159
170
        wt.commit('merge b4', rev_id='a4')
160
171
 
161
 
        self.assertEqual('a4', wt.last_revision())
162
 
        self.assertEqual([], wt.pending_merges())
163
 
 
164
 
        os.chdir('tree')
165
 
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
166
 
 
167
 
        self.assertEqual('a2', wt.last_revision())
168
 
        self.assertEqual(['b3', 'b4'], wt.pending_merges())
 
172
        self.assertEqual(['a4'], wt.get_parent_ids())
 
173
 
 
174
        os.chdir('tree')
 
175
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
176
 
 
177
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
 
178
 
 
179
    def test_uncommit_merge_plus_pending(self):
 
180
        wt = self.create_simple_tree()
 
181
 
 
182
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
183
 
 
184
        tree2.commit('unchanged', rev_id='b3')
 
185
        wt.branch.fetch(tree2.branch)
 
186
        wt.set_pending_merges(['b3'])
 
187
        wt.commit('merge b3', rev_id='a3')
 
188
 
 
189
        tree2.commit('unchanged', rev_id='b4')
 
190
        wt.branch.fetch(tree2.branch)
 
191
        wt.set_pending_merges(['b4'])
 
192
 
 
193
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
 
194
 
 
195
        os.chdir('tree')
 
196
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
197
 
 
198
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
169
199
 
170
200
    def test_uncommit_octopus_merge(self):
171
201
        # Check that uncommit keeps the pending merges in the same order
176
206
 
177
207
        tree2.commit('unchanged', rev_id='b3')
178
208
        tree3.commit('unchanged', rev_id='c3')
179
 
        wt.branch.fetch(tree2.branch)
180
 
        wt.branch.fetch(tree3.branch)
181
 
        wt.set_pending_merges(['b3', 'c3'])
 
209
        
 
210
        wt.merge_from_branch(tree2.branch)
 
211
        wt.merge_from_branch(tree3.branch)
182
212
        wt.commit('merge b3, c3', rev_id='a3')
183
213
 
184
214
        tree2.commit('unchanged', rev_id='b4')
185
215
        tree3.commit('unchanged', rev_id='c4')
186
 
        wt.branch.fetch(tree2.branch)
187
 
        wt.branch.fetch(tree3.branch)
188
 
        wt.set_pending_merges(['c4', 'b4'])
 
216
 
 
217
        wt.merge_from_branch(tree3.branch)
 
218
        wt.merge_from_branch(tree2.branch)
189
219
        wt.commit('merge b4, c4', rev_id='a4')
190
220
 
191
 
        self.assertEqual('a4', wt.last_revision())
192
 
        self.assertEqual([], wt.pending_merges())
 
221
        self.assertEqual(['a4'], wt.get_parent_ids())
193
222
 
194
223
        os.chdir('tree')
195
224
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
196
225
 
197
 
        self.assertEqual('a2', wt.last_revision())
198
 
        self.assertEqual(['b3', 'c3', 'c4', 'b4'], wt.pending_merges())
 
226
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())