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
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
|
# Copyright (C) 2006-2007 by Jelmer Vernooij
#
# 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
"""Tests for the rebase code."""
from bzrlib.errors import UnknownFormatError, NoSuchFile
from bzrlib.revision import NULL_REVISION
from bzrlib.tests import TestCase, TestCaseWithTransport
from rebase import (marshall_rebase_plan, unmarshall_rebase_plan,
replay_snapshot, generate_simple_plan,
generate_transpose_plan, rebase_plan_exists,
rebase_todo, REBASE_PLAN_FILENAME,
REBASE_CURRENT_REVID_FILENAME, read_rebase_plan,
remove_rebase_plan, read_active_rebase_revid,
write_active_rebase_revid, write_rebase_plan, MapTree,
ReplaySnapshotError, ReplayParentsInconsistent)
class RebasePlanReadWriterTests(TestCase):
def test_simple_marshall_rebase_plan(self):
self.assertEqualDiff(
"""# Bazaar rebase plan 1
1 bla
oldrev newrev newparent1 newparent2
""", marshall_rebase_plan((1, "bla"),
{"oldrev": ("newrev", ["newparent1", "newparent2"])}))
def test_simple_unmarshall_rebase_plan(self):
self.assertEquals(((1, "bla"),
{"oldrev": ("newrev", ["newparent1", "newparent2"])}),
unmarshall_rebase_plan("""# Bazaar rebase plan 1
1 bla
oldrev newrev newparent1 newparent2
"""))
def test_unmarshall_rebase_plan_formatunknown(self):
self.assertRaises(UnknownFormatError,
unmarshall_rebase_plan, """# Bazaar rebase plan x
1 bla
oldrev newrev newparent1 newparent2
""")
class ConversionTests(TestCaseWithTransport):
def test_simple(self):
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', rev_id="bla")
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bloe")
wt.set_last_revision("bla")
b.set_revision_history(["bla"])
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bla2")
newrev = replay_snapshot(wt.branch.repository, "bla2", "bla4",
["bloe"], {"bla": "bloe"})
self.assertEqual("bla4", newrev)
self.assertTrue(wt.branch.repository.has_revision(newrev))
self.assertEqual(["bloe"],
wt.branch.repository.revision_parents(newrev))
self.assertEqual("bla2",
wt.branch.repository.get_revision(newrev).properties["rebase-of"])
class PlanCreatorTests(TestCaseWithTransport):
def test_simple_plan_creator(self):
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', rev_id="bla")
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bloe")
wt.set_last_revision("bla")
b.set_revision_history(["bla"])
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bla2")
self.assertEquals({'bla2': ('newbla2', ["bloe"])},
generate_simple_plan(b.repository, b.revision_history(), "bla2", "bloe",
lambda y: "new"+y.revision_id))
def test_simple_plan_creator_extra_history(self):
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', rev_id="bla")
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bloe")
wt.set_last_revision("bla")
b.set_revision_history(["bla"])
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bla2")
file('hello', 'w').write('universe')
wt.commit(message='change hello again', rev_id="bla3")
self.assertEquals({'bla2': ('newbla2', ["bloe"]), 'bla3': ('newbla3', ['newbla2'])},
generate_simple_plan(b.repository, b.revision_history(), "bla2", "bloe",
lambda y: "new"+y.revision_id))
def test_generate_transpose_plan(self):
wt = self.make_branch_and_tree('.')
b = wt.branch
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', rev_id="bla")
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bloe")
wt.set_last_revision("bla")
b.set_revision_history(["bla"])
file('hello', 'w').write('world')
wt.commit(message='change hello', rev_id="bla2")
file('hello', 'w').write('universe')
wt.commit(message='change hello again', rev_id="bla3")
wt.set_last_revision("bla")
b.set_revision_history(["bla"])
file('hello', 'w').write('somebar')
wt.commit(message='change hello yet again', rev_id="blie")
wt.set_last_revision(NULL_REVISION)
b.set_revision_history([])
wt.add('hello')
wt.commit(message='add hello', rev_id="lala")
self.assertEquals({
'blie': ('newblie', ['lala']), },
generate_transpose_plan(b.repository.get_revision_graph("blie"),
{"bla": "lala"}, b.repository.revision_parents, lambda y: "new"+y))
self.assertEquals({
'bla2': ('newbla2', ['lala']),
'bla3': ('newbla3', ['newbla2']),
'blie': ('newblie', ['lala']),
'bloe': ('newbloe', ['lala'])},
generate_transpose_plan(b.repository.get_revision_graph(),
{"bla": "lala"}, b.repository.revision_parents, lambda y: "new"+y))
def test_generate_transpose_plan_one(self):
self.assertEquals({"bla": ("newbla", ["lala"])},
generate_transpose_plan({"bla": ["bloe"], "bloe": []},
{"bloe": "lala"}, {}.get, lambda y: "new"+y))
class PlanFileTests(TestCaseWithTransport):
def test_rebase_plan_exists_false(self):
wt = self.make_branch_and_tree('.')
self.assertFalse(rebase_plan_exists(wt))
def test_rebase_plan_exists_empty(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_PLAN_FILENAME, "")
self.assertFalse(rebase_plan_exists(wt))
def test_rebase_plan_exists(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_PLAN_FILENAME, "foo")
self.assertTrue(rebase_plan_exists(wt))
def test_remove_rebase_plan(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_PLAN_FILENAME, "foo")
remove_rebase_plan(wt)
self.assertFalse(rebase_plan_exists(wt))
def test_remove_rebase_plan_twice(self):
wt = self.make_branch_and_tree('.')
remove_rebase_plan(wt)
self.assertFalse(rebase_plan_exists(wt))
def test_write_rebase_plan(self):
wt = self.make_branch_and_tree('.')
file('hello', 'w').write('hello world')
wt.add('hello')
wt.commit(message='add hello', rev_id="bla")
write_rebase_plan(wt,
{"oldrev": ("newrev", ["newparent1", "newparent2"])})
self.assertEqualDiff("""# Bazaar rebase plan 1
1 bla
oldrev newrev newparent1 newparent2
""", wt._control_files.get(REBASE_PLAN_FILENAME).read())
def test_read_rebase_plan_nonexistant(self):
wt = self.make_branch_and_tree('.')
self.assertRaises(NoSuchFile, read_rebase_plan, wt)
def test_read_rebase_plan_empty(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_PLAN_FILENAME, "")
self.assertRaises(NoSuchFile, read_rebase_plan, wt)
def test_read_rebase_plan(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_PLAN_FILENAME, """# Bazaar rebase plan 1
1 bla
oldrev newrev newparent1 newparent2
""")
self.assertEquals(((1, "bla"), {"oldrev": ("newrev", ["newparent1", "newparent2"])}),
read_rebase_plan(wt))
class CurrentRevidFileTests(TestCaseWithTransport):
def test_read_nonexistant(self):
wt = self.make_branch_and_tree('.')
self.assertIs(None, read_active_rebase_revid(wt))
def test_read_null(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_CURRENT_REVID_FILENAME, NULL_REVISION)
self.assertIs(None, read_active_rebase_revid(wt))
def test_read(self):
wt = self.make_branch_and_tree('.')
wt._control_files.put_utf8(REBASE_CURRENT_REVID_FILENAME, "bla")
self.assertEquals("bla", read_active_rebase_revid(wt))
def test_write(self):
wt = self.make_branch_and_tree('.')
write_active_rebase_revid(wt, "bloe")
self.assertEquals("bloe", read_active_rebase_revid(wt))
def test_write_null(self):
wt = self.make_branch_and_tree('.')
write_active_rebase_revid(wt, None)
self.assertIs(None, read_active_rebase_revid(wt))
class RebaseTodoTests(TestCase):
def test_done(self):
class Repository:
def has_revision(self, revid):
return revid == "bloe"
self.assertEquals([],
list(rebase_todo(Repository(), { "bla": ("bloe", [])})))
def test_notstarted(self):
class Repository:
def has_revision(self, revid):
return False
self.assertEquals(["bla"],
list(rebase_todo(Repository(), { "bla": ("bloe", [])})))
def test_halfway(self):
class Repository:
def has_revision(self, revid):
return revid == "bloe"
self.assertEquals(["ha"],
list(rebase_todo(Repository(), { "bla": ("bloe", []),
"ha": ("hee", [])})))
class ReplaySnapshotTests(TestCaseWithTransport):
def test_single_revision(self):
wt = self.make_branch_and_tree(".")
self.build_tree(['afile'])
wt.add(["afile"])
wt.commit("bla", rev_id="oldcommit")
replay_snapshot(wt.branch.repository, "oldcommit", "newcommit", [],
{})
oldrev = wt.branch.repository.get_revision("oldcommit")
newrev = wt.branch.repository.get_revision("newcommit")
self.assertEquals([], newrev.parent_ids)
self.assertEquals("newcommit", newrev.revision_id)
self.assertEquals(oldrev.committer, newrev.committer)
self.assertEquals(oldrev.timestamp, newrev.timestamp)
self.assertEquals(oldrev.timezone, newrev.timezone)
inv = wt.branch.repository.get_inventory("newcommit")
self.assertEquals("newcommit", inv[inv.path2id("afile")].revision)
def test_parents_different(self):
"""replay_snapshot() relies on the fact that the contents of
the old and new parents is equal (at least concerning tree shape). If
it turns out it isn't, an exception should be raised."""
wt = self.make_branch_and_tree(".")
wt.commit("bloe", rev_id="base")
self.build_tree(['afile', 'notherfile'])
wt.add(["afile"])
wt.commit("bla", rev_id="oldparent")
wt.add(["notherfile"])
wt.commit("bla", rev_id="oldcommit")
# this should raise an exception since oldcommit is being rewritten
# but 'afile' is present in the old parents but not in the new ones.
self.assertRaises(
ReplayParentsInconsistent, replay_snapshot,
wt.branch.repository, "oldcommit", "newcommit",
["base"], {"oldparent": "base"})
def test_two_revisions(self):
wt = self.make_branch_and_tree("old")
self.build_tree(['old/afile', 'old/notherfile'])
wt.add(["afile"], ["somefileid"])
wt.commit("bla", rev_id="oldparent")
wt.add(["notherfile"])
wt.commit("bla", rev_id="oldcommit")
oldrepos = wt.branch.repository
wt = self.make_branch_and_tree("new")
self.build_tree(['new/afile', 'new/notherfile'])
wt.add(["afile"], ["afileid"])
wt.commit("bla", rev_id="newparent")
wt.branch.repository.fetch(oldrepos)
replay_snapshot(wt.branch.repository, "oldcommit", "newcommit",
["newparent"], {"oldparent": "newparent"})
oldrev = wt.branch.repository.get_revision("oldcommit")
newrev = wt.branch.repository.get_revision("newcommit")
self.assertEquals(["newparent"], newrev.parent_ids)
self.assertEquals("newcommit", newrev.revision_id)
self.assertEquals(oldrev.committer, newrev.committer)
self.assertEquals(oldrev.timestamp, newrev.timestamp)
self.assertEquals(oldrev.timezone, newrev.timezone)
inv = wt.branch.repository.get_inventory("newcommit")
self.assertEquals("afileid", inv.path2id("afile"))
self.assertEquals("newcommit", inv[inv.path2id("notherfile")].revision)
def test_two_revisions_no_renames(self):
wt = self.make_branch_and_tree("old")
self.build_tree(['old/afile', 'old/notherfile'])
wt.add(["afile"], ["somefileid"])
wt.commit("bla", rev_id="oldparent")
wt.add(["notherfile"])
wt.commit("bla", rev_id="oldcommit")
oldrepos = wt.branch.repository
wt = self.make_branch_and_tree("new")
self.build_tree(['new/afile', 'new/notherfile'])
wt.add(["afile"], ["afileid"])
wt.commit("bla", rev_id="newparent")
wt.branch.repository.fetch(oldrepos)
self.assertRaises(ReplayParentsInconsistent,
replay_snapshot, wt.branch.repository,
"oldcommit", "newcommit",
["newparent"], revid_renames={})
def test_multi_revisions(self):
wt = self.make_branch_and_tree("old")
self.build_tree(['old/afile', 'old/sfile', 'old/notherfile'])
wt.add(['sfile'])
wt.add(["afile"], ["somefileid"])
wt.commit("bla", rev_id="oldgrandparent")
open("old/afile", "w").write("data")
wt.commit("bla", rev_id="oldparent")
wt.add(["notherfile"])
wt.commit("bla", rev_id="oldcommit")
oldrepos = wt.branch.repository
wt = self.make_branch_and_tree("new")
self.build_tree(['new/afile', 'new/sfile', 'new/notherfile'])
wt.add(['sfile'])
wt.add(["afile"], ["afileid"])
wt.commit("bla", rev_id="newgrandparent")
open("new/afile", "w").write("data")
wt.commit("bla", rev_id="newparent")
wt.branch.repository.fetch(oldrepos)
replay_snapshot(wt.branch.repository, "oldcommit", "newcommit",
["newparent"], {"oldgrandparent": "newgrandparent",
"oldparent": "newparent"})
oldrev = wt.branch.repository.get_revision("oldcommit")
newrev = wt.branch.repository.get_revision("newcommit")
self.assertEquals(["newparent"], newrev.parent_ids)
self.assertEquals("newcommit", newrev.revision_id)
self.assertEquals(oldrev.committer, newrev.committer)
self.assertEquals(oldrev.timestamp, newrev.timestamp)
self.assertEquals(oldrev.timezone, newrev.timezone)
inv = wt.branch.repository.get_inventory("newcommit")
self.assertEquals("afileid", inv.path2id("afile"))
self.assertEquals("newcommit", inv[inv.path2id("notherfile")].revision)
self.assertEquals("newgrandparent", inv[inv.path2id("sfile")].revision)
def test_maps_ids(self):
wt = self.make_branch_and_tree("old")
wt.commit("base", rev_id="base")
self.build_tree(['old/afile'])
wt.add(["afile"], ids=["originalid"])
wt.commit("bla", rev_id="oldparent")
file("old/afile", "w").write("bloe")
wt.commit("bla", rev_id="oldcommit")
oldrepos = wt.branch.repository
wt = self.make_branch_and_tree("new")
self.build_tree(['new/afile'])
wt.add(["afile"], ids=["newid"])
wt.commit("bla", rev_id="newparent")
wt.branch.repository.fetch(oldrepos)
replay_snapshot(wt.branch.repository, "oldcommit", "newcommit",
["newparent"], {"oldparent": "newparent"})
oldrev = wt.branch.repository.get_revision("oldcommit")
newrev = wt.branch.repository.get_revision("newcommit")
self.assertEquals(["newparent"], newrev.parent_ids)
self.assertEquals("newcommit", newrev.revision_id)
self.assertEquals(oldrev.committer, newrev.committer)
self.assertEquals(oldrev.timestamp, newrev.timestamp)
self.assertEquals(oldrev.timezone, newrev.timezone)
inv = wt.branch.repository.get_inventory("newcommit")
self.assertEquals("newid", inv.path2id("afile"))
self.assertEquals("newcommit", inv[inv.path2id("afile")].revision)
class TestReplaySnapshotError(TestCase):
def test_create(self):
ReplaySnapshotError("message")
class TestReplayParentsInconsistent(TestCase):
def test_create(self):
ReplayParentsInconsistent("afileid", "arevid")
|