/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_branch/test_reconcile.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_reconcile.py
48
48
        # Now, try to set an invalid history
49
49
        try:
50
50
            self.applyDeprecated(deprecated_in((2, 4, 0)),
51
 
                tree.branch.set_revision_history, [r1, r2b, r5])
 
51
                                 tree.branch.set_revision_history, [r1, r2b, r5])
52
52
            if tree.branch.last_revision_info() != (3, r5):
53
53
                # RemoteBranch silently corrects an impossible revision
54
54
                # history given to set_revision_history.  It can be tricked
80
80
    def test_reconcile_handles_ghosts_in_revhistory(self):
81
81
        tree = self.make_branch_and_tree('test')
82
82
        if not tree.branch.repository._format.supports_ghosts:
83
 
            raise TestNotApplicable("repository format does not support ghosts")
 
83
            raise TestNotApplicable(
 
84
                "repository format does not support ghosts")
84
85
        tree.set_parent_ids([b"spooky"], allow_leftmost_as_ghost=True)
85
86
        r1 = tree.commit('one')
86
87
        r2 = tree.commit('two')