1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
|
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Couple of blackbox tests for the rewrite plugin."""
import os
from ....branch import Branch
from ....tests.blackbox import ExternalBase
class TestRebaseSimple(ExternalBase):
def make_file(self, name, contents):
with open(name, 'w' + ('b' if isinstance(contents, bytes) else '')) as f:
f.write(contents)
def setUp(self):
super(TestRebaseSimple, self).setUp()
os.mkdir('main')
os.chdir('main')
self.run_bzr('init')
self.make_file('hello', b"hi world")
self.run_bzr('add')
self.run_bzr('commit -m bla')
self.run_bzr('branch . ../feature')
def test_no_upstream_branch(self):
self.run_bzr_error(['brz: ERROR: No upstream branch specified.\n'],
'rebase')
def test_notneeded(self):
os.chdir('../feature')
self.assertEquals(
'No revisions to rebase.\n',
self.run_bzr('rebase ../main')[0])
def test_custom_merge_type(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.assertEquals('', self.run_bzr('rebase --lca ../main')[0])
self.assertEquals('3\n', self.run_bzr('revno')[0])
def test_notneeded_feature_ahead(self):
os.chdir('../feature')
self.make_file('barbla', "bloe")
self.run_bzr('add')
self.run_bzr('commit -m bloe')
self.assertEquals(
'No revisions to rebase.\n',
self.run_bzr('rebase ../main')[0])
def test_notneeded_main_ahead(self):
self.make_file('barbla', "bloe")
self.run_bzr('add')
self.run_bzr('commit -m bloe')
os.chdir('../feature')
self.assertEquals(
"Base branch is descendant of current branch. Pulling instead.\n",
self.run_bzr('rebase ../main')[0])
self.assertEquals(Branch.open("../feature").last_revision_info(),
Branch.open("../main").last_revision_info())
def test_no_pending_merges(self):
self.run_bzr_error(['brz: ERROR: No pending merges present.\n'],
['rebase', '--pending-merges'])
def test_pending_merges(self):
os.chdir('..')
self.build_tree_contents([('main/hello', '42')])
self.run_bzr('add', working_dir='main')
self.run_bzr('commit -m that main')
self.build_tree_contents([('feature/hoi', 'my data')])
self.run_bzr('add', working_dir='feature')
self.run_bzr('commit -m this feature')
self.assertEqual(
('', ' M hello\nAll changes applied successfully.\n'),
self.run_bzr('merge ../main', working_dir='feature'))
out, err = self.run_bzr('rebase --pending-merges', working_dir='feature')
self.assertEqual('', out)
self.assertContainsRe(err, 'modified hello')
self.assertEqual(
('3\n', ''),
self.run_bzr('revno', working_dir='feature'))
def test_simple_success(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.assertEquals('', self.run_bzr('rebase ../main')[0])
self.assertEquals('3\n', self.run_bzr('revno')[0])
def test_range(self):
# commit mainline rev 2
self.make_file('hello', '42')
self.run_bzr('commit -m that')
# commit feature rev 2
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
# commit feature rev 3
self.make_file('hooi', "your data")
self.run_bzr('add')
self.run_bzr('commit -m that')
# commit feature rev 4
self.make_file('hoooi', "someone else's data")
self.run_bzr('add')
self.run_bzr('commit -m these')
# pick up just rev 2 and 3 and discard 4 from feature
self.assertEquals('', self.run_bzr('rebase -r2..3 ../main')[0])
# our rev 2 is now rev3 and 3 is now rev4:
self.assertEquals('4\n', self.run_bzr('revno')[0])
# content added from our old revisions 4 should be gone.
self.assertPathDoesNotExist('hoooi')
def test_range_open_end(self):
# commit mainline rev 2
self.make_file('hello', '42')
self.run_bzr('commit -m that')
# commit feature rev 2
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
# commit feature rev 3
self.make_file('hooi', "your data")
self.run_bzr('add')
self.run_bzr('commit -m that')
# commit feature rev 4
self.make_file('hoooi', "someone else's data")
self.run_bzr('add')
self.run_bzr('commit -m these')
# rebase only rev 4 onto main
self.assertEquals('', self.run_bzr('rebase -r4.. ../main')[0])
# should only get rev 3 (our old 2 and 3 are gone)
self.assertEquals('3\n', self.run_bzr('revno')[0])
self.assertPathDoesNotExist('hoi')
self.assertPathDoesNotExist('hooi')
branch = Branch.open(".")
self.assertEquals(
"these",
branch.repository.get_revision(branch.last_revision()).message)
self.assertPathExists('hoooi')
def test_conflicting(self):
# commit mainline rev 2
self.make_file('hello', '42')
self.run_bzr('commit -m that')
# commit feature rev 2 changing hello differently
os.chdir('../feature')
self.make_file('hello', "other data")
self.run_bzr('commit -m this')
self.run_bzr_error([
'Text conflict in hello\n1 conflicts encountered.\nbrz: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run \'brz rebase-continue\' or run \'brz rebase-abort\'.',
], ['rebase', '../main'])
def test_conflicting_abort(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hello', "other data")
self.run_bzr('commit -m this')
old_log = self.run_bzr('log')[0]
self.run_bzr_error(['Text conflict in hello\n1 conflicts encountered.\nbrz: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run \'brz rebase-continue\' or run \'brz rebase-abort\'.\n'], ['rebase', '../main'])
self.assertEquals('', self.run_bzr('rebase-abort')[0])
self.assertEquals(old_log, self.run_bzr('log')[0])
def test_conflicting_continue(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hello', "other data")
self.run_bzr('commit -m this')
self.run_bzr_error(['Text conflict in hello\n1 conflicts encountered.\nbrz: ERROR: A conflict occurred replaying a commit. Resolve the conflict and run \'brz rebase-continue\' or run \'brz rebase-abort\'.\n'], ['rebase', '../main'])
self.run_bzr('resolved hello')
self.assertEquals('', self.run_bzr('rebase-continue')[0])
self.assertEquals('3\n', self.run_bzr('revno')[0])
def test_continue_nothing(self):
self.run_bzr_error(['brz: ERROR: No rebase to continue'],
['rebase-continue'])
def test_abort_nothing(self):
self.run_bzr_error(['brz: ERROR: No rebase to abort'],
['rebase-abort'])
def test_todo_nothing(self):
self.run_bzr_error(['brz: ERROR: No rebase in progress'],
['rebase-todo'])
def test_onto(self):
self.make_file('hello', '42')
self.run_bzr('add')
self.run_bzr('commit -m that')
self.make_file('other', '43')
self.run_bzr('add')
self.run_bzr('commit -m that_other')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.assertEquals(
'', self.run_bzr('rebase --onto -2 ../main')[0])
self.assertEquals(
'3\n', self.run_bzr('revno')[0])
def test_unrelated(self):
os.chdir('..')
os.mkdir('unrelated')
os.chdir('unrelated')
self.run_bzr('init')
self.make_file('hello', "hi world")
self.run_bzr('add')
self.run_bzr('commit -m x')
self.run_bzr_error(['brz: ERROR: Branches have no common ancestor, and no merge base.*'],
['rebase', '../main'])
def test_verbose(self):
self.make_file('hello', '42')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hoi', "my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
out, err = self.run_bzr('rebase -v ../main')
self.assertContainsRe(err, '1 revisions will be rebased:')
self.assertEqual('', out)
self.assertEqual('3\n', self.run_bzr('revno')[0])
def test_useless_merge(self):
self.make_file('bar', '42')
self.run_bzr('add')
self.run_bzr('commit -m that')
os.chdir('../feature')
self.make_file('hello', "my data")
self.run_bzr('commit -m this')
self.run_bzr('merge')
self.run_bzr('commit -m merge')
self.run_bzr('rebase')
def strip_last_revid_part(self, revid):
"""Assume revid is a revid in the default form, and strip the part
which would be random.
"""
return revid[:revid.rindex(b'-')]
def test_always_rebase_merges(self):
trunk = self.make_branch_and_tree('trunk')
trunk.commit('base')
feature2 = trunk.controldir.sprout('feature2').open_workingtree()
revid2 = feature2.commit('change')
feature = trunk.controldir.sprout('feature').open_workingtree()
feature.commit('change')
feature.merge_from_branch(feature2.branch)
feature.commit('merge')
feature.commit('change2')
trunk.commit('additional upstream change')
self.run_bzr('rebase --always-rebase-merges ../trunk', working_dir='feature')
# second revision back should be a merge of feature2
repo = feature.branch.repository
repo.lock_read()
self.addCleanup(repo.unlock)
tip = feature.last_revision()
merge_id = repo.get_graph().get_parent_map([tip])[tip][0]
merge_parents = repo.get_graph().get_parent_map([merge_id])[merge_id]
self.assertEqual(self.strip_last_revid_part(revid2),
self.strip_last_revid_part(merge_parents[1]))
def test_rebase_merge(self):
trunk = self.make_branch_and_tree('trunk')
trunk.commit('base')
feature2 = trunk.controldir.sprout('feature2').open_workingtree()
revid2 = feature2.commit('change')
feature = trunk.controldir.sprout('feature').open_workingtree()
feature.commit('change')
feature.merge_from_branch(feature2.branch)
feature.commit('merge')
feature.commit('change2')
trunk.commit('additional upstream change')
self.run_bzr('rebase ../trunk', working_dir='feature')
# second revision back should be a merge of feature2
repo = feature.branch.repository
repo.lock_read()
self.addCleanup(repo.unlock)
tip = feature.last_revision()
merge_id = repo.get_graph().get_parent_map([tip])[tip][0]
merge_parents = repo.get_graph().get_parent_map([merge_id])[merge_id]
self.assertEqual(self.strip_last_revid_part(revid2),
self.strip_last_revid_part(merge_parents[1]))
def test_directory(self):
self.make_file('test_directory1', "testing non-current directories")
self.run_bzr('add')
self.run_bzr('commit -m blah')
os.chdir('../feature')
self.make_file('test_directory2', "testing non-current directories")
self.run_bzr('add')
self.run_bzr('commit -m blah')
os.chdir('..')
self.assertEquals('', self.run_bzr('rebase -d feature main')[0])
class ReplayTests(ExternalBase):
def test_replay(self):
os.mkdir('main')
os.chdir('main')
self.run_bzr('init')
open('bar', 'w').write('42')
self.run_bzr('add')
self.run_bzr('commit -m that')
os.mkdir('../feature')
os.chdir('../feature')
self.run_bzr('init')
branch = Branch.open('.')
open('hello', 'w').write("my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.assertEquals(1, branch.revno())
self.run_bzr('replay -r1 ../main')
self.assertEquals(2, branch.revno())
self.assertTrue(os.path.exists('bar'))
def test_replay_open_range(self):
os.mkdir('main')
os.chdir('main')
self.run_bzr('init')
open('bar', 'w').write('42')
self.run_bzr('add')
self.run_bzr('commit -m that')
open('bar', 'w').write('84')
self.run_bzr('commit -m blathat')
os.mkdir('../feature')
os.chdir('../feature')
self.run_bzr('init')
branch = Branch.open('.')
open('hello', 'w').write("my data")
self.run_bzr('add')
self.run_bzr('commit -m this')
self.assertEquals(1, branch.revno())
self.run_bzr('replay -r1.. ../main')
self.assertEquals(3, branch.revno())
self.assertTrue(os.path.exists('bar'))
|