/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/per_workingtree/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
390
390
        sub_basis = subtree.basis_tree()
391
391
        sub_basis.lock_read()
392
392
        self.addCleanup(sub_basis.unlock)
393
 
        self.assertEqual(subsubtree.last_revision(),
394
 
            sub_basis.get_reference_revision(sub_basis.path2id('subtree')))
 
393
        self.assertEqual(
 
394
                subsubtree.last_revision(),
 
395
                sub_basis.get_reference_revision('subtree'))
395
396
        # the intermediate tree has changed, so should have had a commit
396
397
        # take place.
397
398
        self.assertNotEqual(None, subtree.last_revision())
401
402
        basis.lock_read()
402
403
        self.addCleanup(basis.unlock)
403
404
        self.assertEqual(subtree.last_revision(),
404
 
            basis.get_reference_revision(basis.path2id('subtree')))
 
405
            basis.get_reference_revision('subtree'))
405
406
        # the outer tree must have have changed too.
406
407
        self.assertNotEqual(None, rev_id)
407
408
 
417
418
        self.build_tree(['subtree/file'])
418
419
        subtree.add(['file'])
419
420
        rev_id = tree.commit('added reference', allow_pointless=False)
420
 
        tree.get_reference_revision(tree.path2id('subtree'))
 
421
        tree.get_reference_revision('subtree')
421
422
        child_revid = subtree.last_revision()
422
423
        # now change the child tree
423
424
        self.build_tree_contents([('subtree/file', 'new-content')])
435
436
        basis.lock_read()
436
437
        self.addCleanup(basis.unlock)
437
438
        self.assertEqual(subtree.last_revision(),
438
 
            basis.get_reference_revision(basis.path2id('subtree')))
 
439
            basis.get_reference_revision('subtree'))
439
440
        self.assertNotEqual(rev_id, rev_id2)
440
441
 
441
442
    def test_nested_pointless_commits_are_pointless(self):