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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-25 11:54:30 UTC
  • mfrom: (6855.4.10 more-bees)
  • Revision ID: breezy.the.bot@gmail.com-20180325115430-75xnlbrmzjoomd83
Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

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

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revert.py
28
28
        source_tree.commit('empty tree')
29
29
        target_tree = source_tree.controldir.sprout('target').open_workingtree()
30
30
        self.build_tree(['source/dir/', 'source/dir/contents'])
31
 
        source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
 
31
        source_tree.add(['dir', 'dir/contents'], [b'dir-id', b'contents-id'])
32
32
        source_tree.commit('added dir')
33
33
        target_tree.lock_write()
34
34
        self.addCleanup(target_tree.unlock)
77
77
        # files should not be deleted if changed after a merge
78
78
        merge_target.merge_from_branch(tree.branch)
79
79
        self.assertPathExists('merge_target/new_file')
80
 
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
 
80
        self.build_tree_contents([('merge_target/new_file', b'new_contents')])
81
81
        merge_target.revert()
82
82
        self.assertPathExists('merge_target/new_file')
83
83
 
124
124
        tree = self.make_branch_and_tree('.')
125
125
        self.build_tree(['file'])
126
126
        tree.add('file')
127
 
        tree.commit('added file', rev_id='rev1')
 
127
        tree.commit('added file', rev_id=b'rev1')
128
128
        os.unlink('file')
129
129
        tree.commit('removed file')
130
130
        self.assertPathDoesNotExist('file')
151
151
 
152
152
    def test_revert_root_id_change(self):
153
153
        tree = self.make_branch_and_tree('.')
154
 
        tree.set_root_id('initial-root-id')
 
154
        tree.set_root_id(b'initial-root-id')
155
155
        self.build_tree(['file1'])
156
156
        tree.add(['file1'])
157
157
        tree.commit('first')
158
 
        tree.set_root_id('temp-root-id')
 
158
        tree.set_root_id(b'temp-root-id')
159
159
        self.assertEqual('temp-root-id', tree.get_root_id())
160
160
        tree.revert()
161
161
        self.assertEqual('initial-root-id', tree.get_root_id())