233
247
def test_simple_stepping(self):
234
248
tree = self.make_branch_and_tree('tree')
235
249
self.build_tree(['tree/a', 'tree/b/', 'tree/b/c'])
236
tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
250
tree.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
238
tree.commit('first', rev_id='first-rev-id')
252
tree.commit('first', rev_id=b'first-rev-id')
240
254
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
242
256
walker = _mod_tree.MultiWalker(tree, [basis_tree])
243
257
iterator = walker.iter_all()
244
258
self.assertWalkerNext(u'', root_id, True, [u''], iterator)
245
self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
246
self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
247
self.assertWalkerNext(u'b/c', 'c-id', True, [u'b/c'], iterator)
248
self.assertRaises(StopIteration, iterator.next)
259
self.assertWalkerNext(u'a', b'a-id', True, [u'a'], iterator)
260
self.assertWalkerNext(u'b', b'b-id', True, [u'b'], iterator)
261
self.assertWalkerNext(u'b/c', b'c-id', True, [u'b/c'], iterator)
262
self.assertRaises(StopIteration, next, iterator)
250
264
def test_master_has_extra(self):
251
265
tree = self.make_branch_and_tree('tree')
252
266
self.build_tree(['tree/a', 'tree/b/', 'tree/c', 'tree/d'])
253
tree.add(['a', 'b', 'd'], ['a-id', 'b-id', 'd-id'])
255
tree.commit('first', rev_id='first-rev-id')
257
tree.add(['c'], ['c-id'])
267
tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
269
tree.commit('first', rev_id=b'first-rev-id')
271
tree.add(['c'], [b'c-id'])
258
272
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
260
274
walker = _mod_tree.MultiWalker(tree, [basis_tree])
261
275
iterator = walker.iter_all()
262
276
self.assertWalkerNext(u'', root_id, True, [u''], iterator)
263
self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
264
self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
265
self.assertWalkerNext(u'c', 'c-id', True, [None], iterator)
266
self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
267
self.assertRaises(StopIteration, iterator.next)
277
self.assertWalkerNext(u'a', b'a-id', True, [u'a'], iterator)
278
self.assertWalkerNext(u'b', b'b-id', True, [u'b'], iterator)
279
self.assertWalkerNext(u'c', b'c-id', True, [None], iterator)
280
self.assertWalkerNext(u'd', b'd-id', True, [u'd'], iterator)
281
self.assertRaises(StopIteration, next, iterator)
269
283
def test_master_renamed_to_earlier(self):
270
284
"""The record is still present, it just shows up early."""
271
285
tree = self.make_branch_and_tree('tree')
272
286
self.build_tree(['tree/a', 'tree/c', 'tree/d'])
273
tree.add(['a', 'c', 'd'], ['a-id', 'c-id', 'd-id'])
274
tree.commit('first', rev_id='first-rev-id')
287
tree.add(['a', 'c', 'd'], [b'a-id', b'c-id', b'd-id'])
288
tree.commit('first', rev_id=b'first-rev-id')
275
289
tree.rename_one('d', 'b')
277
291
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
296
310
walker = _mod_tree.MultiWalker(tree, [basis_tree])
297
311
iterator = walker.iter_all()
298
312
self.assertWalkerNext(u'', root_id, True, [u''], iterator)
299
self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
300
self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
301
self.assertWalkerNext(u'e', 'b-id', True, [u'b'], iterator)
302
self.assertRaises(StopIteration, iterator.next)
313
self.assertWalkerNext(u'a', b'a-id', True, [u'a'], iterator)
314
self.assertWalkerNext(u'd', b'd-id', True, [u'd'], iterator)
315
self.assertWalkerNext(u'e', b'b-id', True, [u'b'], iterator)
316
self.assertRaises(StopIteration, next, iterator)
304
318
def test_other_extra_in_middle(self):
305
319
tree = self.make_branch_and_tree('tree')
306
320
self.build_tree(['tree/a', 'tree/b', 'tree/d'])
307
tree.add(['a', 'b', 'd'], ['a-id', 'b-id', 'd-id'])
308
tree.commit('first', rev_id='first-rev-id')
321
tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
322
tree.commit('first', rev_id=b'first-rev-id')
309
323
tree.remove(['b'])
311
325
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
312
326
walker = _mod_tree.MultiWalker(tree, [basis_tree])
313
327
iterator = walker.iter_all()
314
328
self.assertWalkerNext(u'', root_id, True, [u''], iterator)
315
self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
316
self.assertWalkerNext(u'd', 'd-id', True, [u'd'], iterator)
317
self.assertWalkerNext(u'b', 'b-id', False, [u'b'], iterator)
318
self.assertRaises(StopIteration, iterator.next)
329
self.assertWalkerNext(u'a', b'a-id', True, [u'a'], iterator)
330
self.assertWalkerNext(u'd', b'd-id', True, [u'd'], iterator)
331
self.assertWalkerNext(u'b', b'b-id', False, [u'b'], iterator)
332
self.assertRaises(StopIteration, next, iterator)
320
334
def test_other_extra_at_end(self):
321
335
tree = self.make_branch_and_tree('tree')
322
336
self.build_tree(['tree/a', 'tree/b', 'tree/d'])
323
tree.add(['a', 'b', 'd'], ['a-id', 'b-id', 'd-id'])
324
tree.commit('first', rev_id='first-rev-id')
337
tree.add(['a', 'b', 'd'], [b'a-id', b'b-id', b'd-id'])
338
tree.commit('first', rev_id=b'first-rev-id')
325
339
tree.remove(['d'])
327
341
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
328
342
walker = _mod_tree.MultiWalker(tree, [basis_tree])
329
343
iterator = walker.iter_all()
330
344
self.assertWalkerNext(u'', root_id, True, [u''], iterator)
331
self.assertWalkerNext(u'a', 'a-id', True, [u'a'], iterator)
332
self.assertWalkerNext(u'b', 'b-id', True, [u'b'], iterator)
333
self.assertWalkerNext(u'd', 'd-id', False, [u'd'], iterator)
334
self.assertRaises(StopIteration, iterator.next)
345
self.assertWalkerNext(u'a', b'a-id', True, [u'a'], iterator)
346
self.assertWalkerNext(u'b', b'b-id', True, [u'b'], iterator)
347
self.assertWalkerNext(u'd', b'd-id', False, [u'd'], iterator)
348
self.assertRaises(StopIteration, next, iterator)
336
350
def test_others_extra_at_end(self):
337
351
tree = self.make_branch_and_tree('tree')
338
352
self.build_tree(['tree/a', 'tree/b', 'tree/c', 'tree/d', 'tree/e'])
339
353
tree.add(['a', 'b', 'c', 'd', 'e'],
340
['a-id', 'b-id', 'c-id', 'd-id', 'e-id'])
341
tree.commit('first', rev_id='first-rev-id')
354
[b'a-id', b'b-id', b'c-id', b'd-id', b'e-id'])
355
tree.commit('first', rev_id=b'first-rev-id')
342
356
tree.remove(['e'])
343
tree.commit('second', rev_id='second-rev-id')
357
tree.commit('second', rev_id=b'second-rev-id')
344
358
tree.remove(['d'])
345
tree.commit('third', rev_id='third-rev-id')
359
tree.commit('third', rev_id=b'third-rev-id')
346
360
tree.remove(['c'])
348
362
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
349
first_tree = tree.branch.repository.revision_tree('first-rev-id')
350
second_tree = tree.branch.repository.revision_tree('second-rev-id')
363
first_tree = tree.branch.repository.revision_tree(b'first-rev-id')
364
second_tree = tree.branch.repository.revision_tree(b'second-rev-id')
351
365
walker = _mod_tree.MultiWalker(tree, [basis_tree, first_tree,
353
367
iterator = walker.iter_all()
354
368
self.assertWalkerNext(u'', root_id, True, [u'', u'', u''], iterator)
355
self.assertWalkerNext(u'a', 'a-id', True, [u'a', u'a', u'a'], iterator)
356
self.assertWalkerNext(u'b', 'b-id', True, [u'b', u'b', u'b'], iterator)
357
self.assertWalkerNext(u'c', 'c-id', False, [u'c', u'c', u'c'], iterator)
358
self.assertWalkerNext(u'd', 'd-id', False, [None, u'd', u'd'], iterator)
359
self.assertWalkerNext(u'e', 'e-id', False, [None, u'e', None], iterator)
360
self.assertRaises(StopIteration, iterator.next)
369
self.assertWalkerNext(u'a', b'a-id', True, [u'a', u'a', u'a'], iterator)
370
self.assertWalkerNext(u'b', b'b-id', True, [u'b', u'b', u'b'], iterator)
371
self.assertWalkerNext(u'c', b'c-id', False, [u'c', u'c', u'c'], iterator)
372
self.assertWalkerNext(u'd', b'd-id', False, [None, u'd', u'd'], iterator)
373
self.assertWalkerNext(u'e', b'e-id', False, [None, u'e', None], iterator)
374
self.assertRaises(StopIteration, next, iterator)
362
376
def test_different_file_id_in_others(self):
363
377
tree = self.make_branch_and_tree('tree')
364
378
self.build_tree(['tree/a', 'tree/b', 'tree/c/'])
365
tree.add(['a', 'b', 'c'], ['a-id', 'b-id', 'c-id'])
366
tree.commit('first', rev_id='first-rev-id')
379
tree.add(['a', 'b', 'c'], [b'a-id', b'b-id', b'c-id'])
380
tree.commit('first', rev_id=b'first-rev-id')
368
382
tree.rename_one('b', 'c/d')
369
383
self.build_tree(['tree/b'])
370
tree.add(['b'], ['b2-id'])
371
tree.commit('second', rev_id='second-rev-id')
384
tree.add(['b'], [b'b2-id'])
385
tree.commit('second', rev_id=b'second-rev-id')
373
387
tree.rename_one('a', 'c/e')
374
388
self.build_tree(['tree/a'])
375
tree.add(['a'], ['a2-id'])
389
tree.add(['a'], [b'a2-id'])
377
391
basis_tree, root_id = self.lock_and_get_basis_and_root_id(tree)
378
first_tree = tree.branch.repository.revision_tree('first-rev-id')
392
first_tree = tree.branch.repository.revision_tree(b'first-rev-id')
379
393
walker = _mod_tree.MultiWalker(tree, [basis_tree, first_tree])
381
395
iterator = walker.iter_all()
382
396
self.assertWalkerNext(u'', root_id, True, [u'', u''], iterator)
383
self.assertWalkerNext(u'a', 'a2-id', True, [None, None], iterator)
384
self.assertWalkerNext(u'b', 'b2-id', True, [u'b', None], iterator)
385
self.assertWalkerNext(u'c', 'c-id', True, [u'c', u'c'], iterator)
386
self.assertWalkerNext(u'c/d', 'b-id', True, [u'c/d', u'b'], iterator)
387
self.assertWalkerNext(u'c/e', 'a-id', True, [u'a', u'a'], iterator)
388
self.assertRaises(StopIteration, iterator.next)
397
self.assertWalkerNext(u'a', b'a2-id', True, [None, None], iterator)
398
self.assertWalkerNext(u'b', b'b2-id', True, [u'b', None], iterator)
399
self.assertWalkerNext(u'c', b'c-id', True, [u'c', u'c'], iterator)
400
self.assertWalkerNext(u'c/d', b'b-id', True, [u'c/d', u'b'], iterator)
401
self.assertWalkerNext(u'c/e', b'a-id', True, [u'a', u'a'], iterator)
402
self.assertRaises(StopIteration, next, iterator)
390
404
def assertCmpByDirblock(self, cmp_val, path1, path2):
391
405
self.assertEqual(cmp_val,