/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2019-05-29 03:22:34 UTC
  • mfrom: (7303 work)
  • mto: This revision was merged to the branch mainline in revision 7306.
  • Revision ID: jelmer@jelmer.uk-20190529032234-mt3fuws8gq03tapi
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_shelf.py
70
70
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
71
71
        self.addCleanup(creator.finalize)
72
72
        self.assertEqual([('rename', b'foo-id', 'foo', 'bar')],
73
 
                          list(creator.iter_shelvable()))
 
73
                         list(creator.iter_shelvable()))
74
74
        return creator
75
75
 
76
76
    def check_shelve_rename(self, creator):
138
138
        self.addCleanup(tree.unlock)
139
139
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
140
140
        self.addCleanup(creator.finalize)
141
 
        self.expectFailure('shelf doesn\'t support shelving root changes yet',
 
141
        self.expectFailure(
 
142
            'shelf doesn\'t support shelving root changes yet',
142
143
            self.assertEqual, [
143
144
                ('delete file', b'first-root-id', 'directory', ''),
144
145
                ('add file', b'second-root-id', 'directory', ''),
148
149
        self.assertEqual([('delete file', b'first-root-id', 'directory', ''),
149
150
                          ('add file', b'second-root-id', 'directory', ''),
150
151
                          ('rename', b'foo-id', u'foo', u'foo'),
151
 
                         ], list(creator.iter_shelvable()))
 
152
                          ], list(creator.iter_shelvable()))
152
153
 
153
154
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
154
155
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
201
202
        self.addCleanup(creator.finalize)
202
203
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
203
204
                          ('add file', b'foo-id', 'file', 'foo')],
204
 
                          sorted(list(creator.iter_shelvable())))
 
205
                         sorted(list(creator.iter_shelvable())))
205
206
        return creator, tree
206
207
 
207
208
    def check_shelve_creation(self, creator, tree):
208
 
        self.assertRaises(StopIteration,
209
 
                          next, tree.iter_entries_by_dir(specific_files=['foo']))
 
209
        self.assertRaises(
 
210
            StopIteration, next,
 
211
            tree.iter_entries_by_dir(specific_files=['foo']))
210
212
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
211
213
        self.assertEqual(b'foo-id',
212
214
                         creator.shelf_transform.final_file_id(s_trans_id))
215
217
        self.assertShelvedFileEqual('a\n', creator, b'foo-id')
216
218
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id(b'bar-id')
217
219
        self.assertEqual('directory',
218
 
            creator.shelf_transform.final_kind(s_bar_trans_id))
 
220
                         creator.shelf_transform.final_kind(s_bar_trans_id))
219
221
 
220
222
    def test_shelve_creation(self):
221
223
        creator, tree = self.prepare_shelve_creation()
236
238
        tree.lock_write()
237
239
        self.addCleanup(tree.unlock)
238
240
        tree.commit('Empty tree')
239
 
        self.build_tree_contents([('foo', b'a\n'), ('bar/',), ('bar/ignored', b'ign\n')])
 
241
        self.build_tree_contents(
 
242
            [('foo', b'a\n'), ('bar/',), ('bar/ignored', b'ign\n')])
240
243
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
241
244
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
242
245
        self.addCleanup(creator.finalize)
243
246
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
244
247
                          ('add file', b'foo-id', 'file', 'foo')],
245
 
                          sorted(list(creator.iter_shelvable())))
 
248
                         sorted(list(creator.iter_shelvable())))
246
249
        ignores._set_user_ignores([])
247
 
        in_patterns = ['ignored',]
 
250
        in_patterns = ['ignored', ]
248
251
        ignores.add_unique_user_ignores(in_patterns)
249
252
 
250
253
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
252
255
            creator.transform()
253
256
            self.check_shelve_creation(creator, tree)
254
257
        except MalformedTransform:
255
 
            raise KnownFailure('shelving directory with ignored file: see bug #611739')
 
258
            raise KnownFailure(
 
259
                'shelving directory with ignored file: see bug #611739')
256
260
 
257
261
    def _test_shelve_symlink_creation(self, link_name, link_target,
258
262
                                      shelve_change=False):
268
272
        self.assertEqual([('add file', b'foo-id', 'symlink', link_name)],
269
273
                         list(creator.iter_shelvable()))
270
274
        if shelve_change:
271
 
            creator.shelve_change(('add file', b'foo-id', 'symlink', link_name))
 
275
            creator.shelve_change(
 
276
                ('add file', b'foo-id', 'symlink', link_name))
272
277
        else:
273
278
            creator.shelve_creation(b'foo-id')
274
279
        creator.transform()
278
283
        self.assertEqual(link_target, osutils.readlink(limbo_name))
279
284
        ptree = creator.shelf_transform.get_preview_tree()
280
285
        self.assertEqual(
281
 
                link_target,
282
 
                ptree.get_symlink_target(ptree.id2path(b'foo-id'), b'foo-id'))
 
286
            link_target,
 
287
            ptree.get_symlink_target(ptree.id2path(b'foo-id')))
283
288
 
284
289
    def test_shelve_symlink_creation(self):
285
290
        self._test_shelve_symlink_creation('foo', 'bar')
320
325
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
321
326
        self.assertEqual(new_target, osutils.readlink(limbo_name))
322
327
        ptree = creator.shelf_transform.get_preview_tree()
323
 
        self.assertEqual(new_target, ptree.get_symlink_target(ptree.id2path(b'foo-id')))
 
328
        self.assertEqual(new_target, ptree.get_symlink_target(
 
329
            ptree.id2path(b'foo-id')))
324
330
 
325
331
    def test_shelve_symlink_target_change(self):
326
332
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
348
354
                         sorted(list(creator.iter_shelvable())))
349
355
        creator.shelve_creation(b'foo-id')
350
356
        creator.transform()
351
 
        self.assertRaises(StopIteration,
352
 
                          next, tree.iter_entries_by_dir(specific_files=['foo']))
 
357
        self.assertRaises(
 
358
            StopIteration, next,
 
359
            tree.iter_entries_by_dir(specific_files=['foo']))
353
360
        self.assertShelvedFileEqual('', creator, b'foo-id')
354
361
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
355
362
        self.assertEqual(b'foo-id',
370
377
        self.addCleanup(creator.finalize)
371
378
        self.assertEqual([('delete file', b'bar-id', 'file', 'foo/bar'),
372
379
                          ('delete file', b'foo-id', 'directory', 'foo')],
373
 
                          sorted(list(creator.iter_shelvable())))
 
380
                         sorted(list(creator.iter_shelvable())))
374
381
        return creator, tree
375
382
 
376
383
    def check_shelve_deletion(self, tree):
394
401
 
395
402
    def test_shelve_delete_contents(self):
396
403
        tree = self.make_branch_and_tree('tree')
397
 
        self.build_tree(['tree/foo',])
 
404
        self.build_tree(['tree/foo', ])
398
405
        tree.add('foo', b'foo-id')
399
406
        tree.commit('Added file and directory')
400
407
        os.unlink('tree/foo')
453
460
 
454
461
    def test_shelve_unversion(self):
455
462
        tree = self.make_branch_and_tree('tree')
456
 
        self.build_tree(['tree/foo',])
 
463
        self.build_tree(['tree/foo', ])
457
464
        tree.add('foo', b'foo-id')
458
465
        tree.commit('Added file and directory')
459
466
        tree.unversion(['foo'])
499
506
        tt = transform.TransformPreview(tree)
500
507
        self.addCleanup(tt.finalize)
501
508
        records = iter(parser.read_pending_records())
502
 
        #skip revision-id
 
509
        # skip revision-id
503
510
        next(records)
504
511
        tt.deserialize(records)
505
512
 
506
513
    def test_shelve_unversioned(self):
507
514
        tree = self.make_branch_and_tree('tree')
508
 
        tree.lock_tree_write()
509
 
        try:
 
515
        with tree.lock_tree_write():
510
516
            self.assertRaises(errors.PathsNotVersionedError,
511
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
512
 
        finally:
513
 
            tree.unlock()
 
517
                              shelf.ShelfCreator, tree, tree.basis_tree(),
 
518
                              ['foo'])
514
519
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
515
520
        # after itself.
516
521
        wt = workingtree.WorkingTree.open('tree')
518
523
        wt.unlock()
519
524
        # And a second tentative should raise the same error (no
520
525
        # limbo/pending_deletion leftovers).
521
 
        tree.lock_tree_write()
522
 
        try:
 
526
        with tree.lock_tree_write():
523
527
            self.assertRaises(errors.PathsNotVersionedError,
524
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
525
 
        finally:
526
 
            tree.unlock()
 
528
                              shelf.ShelfCreator, tree, tree.basis_tree(),
 
529
                              ['foo'])
527
530
 
528
531
    def test_shelve_skips_added_root(self):
529
532
        """Skip adds of the root when iterating through shelvable changes."""