/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_revision_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_revision_tree.py
73
73
        if not tree.branch.repository._format.supports_ghosts:
74
74
            self.skipTest('format does not support ghosts')
75
75
        tree.set_parent_ids([b'a-ghost'], allow_leftmost_as_ghost=True)
76
 
        self.assertRaises(errors.NoSuchRevision, tree.revision_tree, b'a-ghost')
 
76
        self.assertRaises(errors.NoSuchRevision,
 
77
                          tree.revision_tree, b'a-ghost')
77
78
 
78
79
    def test_revision_tree_different_root_id(self):
79
80
        """A revision tree might have a very different root."""
115
116
        return tree, [base_revid, this_revid, other_revid]
116
117
 
117
118
    def test_kind_parent_tree(self):
118
 
        tree, [base_revid, this_revid, other_revid] = self.make_branch_with_merged_deletions()
 
119
        tree, [base_revid, this_revid,
 
120
               other_revid] = self.make_branch_with_merged_deletions()
119
121
        tree.lock_read()
120
122
        self.addCleanup(tree.unlock)
121
123
        parents = tree.get_parent_ids()