/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_tree/test_annotate_iter.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6928 work)
  • mto: (6940.2.6 base)
  • mto: This revision was merged to the branch mainline in revision 6941.
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_annotate_iter.py
23
23
 
24
24
    def get_simple_tree(self):
25
25
        tree = self.make_branch_and_tree('tree')
26
 
        self.build_tree_contents([('tree/one', 'first\ncontent\n')])
 
26
        self.build_tree_contents([('tree/one', b'first\ncontent\n')])
27
27
        tree.add(['one'])
28
28
        rev_1 = tree.commit('one')
29
 
        self.build_tree_contents([('tree/one', 'second\ncontent\n')])
 
29
        self.build_tree_contents([('tree/one', b'second\ncontent\n')])
30
30
        rev_2 = tree.commit('two')
31
31
        return self._convert_tree(tree), [rev_1, rev_2]
32
32
 
34
34
        tree = self.make_branch_and_tree('tree')
35
35
        if not tree.branch.repository._format.supports_ghosts:
36
36
            self.skipTest('repository format does not support ghosts')
37
 
        self.build_tree_contents([('tree/one', 'first\ncontent\n')])
 
37
        self.build_tree_contents([('tree/one', b'first\ncontent\n')])
38
38
        tree.add(['one'])
39
39
        rev_1 = tree.commit('one')
40
40
        tree.set_parent_ids([rev_1, 'ghost-one'])
41
 
        self.build_tree_contents([('tree/one', 'second\ncontent\n')])
 
41
        self.build_tree_contents([('tree/one', b'second\ncontent\n')])
42
42
        rev_2 = tree.commit('two')
43
43
        return self._convert_tree(tree), [rev_1, rev_2]
44
44