← Back to branch summary

~jelmer/brz/tree-reference-fixes

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_revno.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-25 12:47:13 UTC
  • mfrom: (6926.1.2 work)
  • Revision ID: jelmer@jelmer.uk-20180325124713-dq64vm9bhch1gjow
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_revno.py
86
86
        builder.build_snapshot(None, [
87
87
            ('add', ('', 'root-id', 'directory', None)),
88
88
            ('add', ('file', 'file-id', 'file', 'content\n'))],
89
 
            revision_id='A-id')
90
 
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
91
 
        builder.build_snapshot(['A-id', 'B-id'], [], revision_id='C-id')
 
89
            revision_id=b'A-id')
 
90
        builder.build_snapshot(['A-id'], [], revision_id=b'B-id')
 
91
        builder.build_snapshot(['A-id', 'B-id'], [], revision_id=b'C-id')
92
92
        builder.finish_series()
93
93
        b = builder.get_branch()
94
94
        co_b = b.create_checkout('checkout_b', lightweight=True,
95
 
                                 revision_id='B-id')
 
95
                                 revision_id=b'B-id')
96
96
        out, err = self.run_bzr('revno checkout_b')
97
97
        self.assertEqual('', err)
98
98
        self.assertEqual('2\n', out)
104
104
        builder = self.make_branch_builder('branch')
105
105
        builder.start_series()
106
106
        builder.build_snapshot(None, [
107
 
            ('add', ('', 'root-id', 'directory', None)),
108
 
            ('add', ('file', 'file-id', 'file', 'content\n'))],
109
 
            revision_id='A-id')
110
 
        builder.build_snapshot(['A-id'], [], revision_id='B-id')
111
 
        builder.build_snapshot(['A-id'], [], revision_id='C-id')
 
107
            ('add', ('', b'root-id', 'directory', None)),
 
108
            ('add', ('file', b'file-id', 'file', 'content\n'))],
 
109
            revision_id=b'A-id')
 
110
        builder.build_snapshot(['A-id'], [], revision_id=b'B-id')
 
111
        builder.build_snapshot(['A-id'], [], revision_id=b'C-id')
112
112
        builder.finish_series()
113
113
        b = builder.get_branch()
114
114
        # The branch is now at "C-id", but the checkout is still at "B-id"
115
115
        # which is no longer in the history
116
116
        co_b = b.create_checkout('checkout_b', lightweight=True,
117
 
                                 revision_id='B-id')
 
117
                                 revision_id=b'B-id')
118
118
        out, err = self.run_bzr('revno checkout_b')
119
119
        self.assertEqual('', err)
120
120
        self.assertEqual('2\n', out)
147
147
    def test_simple_branch_revno(self):
148
148
        self.setup_smart_server_with_call_log()
149
149
        t = self.make_branch_and_tree('branch')
150
 
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
150
        self.build_tree_contents([('branch/foo', b'thecontents')])
151
151
        t.add("foo")
152
152
        revid = t.commit("message")
153
153
        self.reset_smart_call_log()
164
164
    def test_simple_branch_revno_lookup(self):
165
165
        self.setup_smart_server_with_call_log()
166
166
        t = self.make_branch_and_tree('branch')
167
 
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
167
        self.build_tree_contents([('branch/foo', b'thecontents')])
168
168
        t.add("foo")
169
169
        revid1 = t.commit("message")
170
170
        revid2 = t.commit("message")