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

  • Committer: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_branchbuilder.py
16
16
 
17
17
"""Tests for the BranchBuilder class."""
18
18
 
19
 
from bzrlib import (
 
19
from .. import (
20
20
    branch as _mod_branch,
21
21
    revision as _mod_revision,
22
22
    tests,
23
23
    )
24
 
from bzrlib.branchbuilder import BranchBuilder
 
24
from ..bzr import (
 
25
    branch as _mod_bzrbranch,
 
26
    )
 
27
from ..branchbuilder import BranchBuilder
25
28
 
26
29
 
27
30
class TestBranchBuilder(tests.TestCaseWithMemoryTransport):
37
40
        branch = builder.get_branch()
38
41
        self.assertIsInstance(branch, _mod_branch.Branch)
39
42
        self.assertEqual(self.get_transport().clone('foo').base,
40
 
            branch.base)
 
43
                         branch.base)
41
44
        self.assertEqual(
42
45
            (0, _mod_revision.NULL_REVISION),
43
46
            branch.last_revision_info())
46
49
        """Making a BranchBuilder with a format option sets the branch type."""
47
50
        builder = BranchBuilder(self.get_transport(), format='dirstate-tags')
48
51
        branch = builder.get_branch()
49
 
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
 
52
        self.assertIsInstance(branch, _mod_bzrbranch.BzrBranch6)
50
53
 
51
54
    def test_build_one_commit(self):
52
55
        """doing build_commit causes a commit to happen."""
90
93
        """build_commit() takes a parent_ids argument."""
91
94
        builder = BranchBuilder(self.get_transport().clone('foo'))
92
95
        rev_id1 = builder.build_commit(
93
 
            parent_ids=["ghost"], allow_leftmost_as_ghost=True)
 
96
            parent_ids=[b"ghost"], allow_leftmost_as_ghost=True)
94
97
        rev_id2 = builder.build_commit(parent_ids=[])
95
98
        branch = builder.get_branch()
96
99
        self.assertEqual((1, rev_id2), branch.last_revision_info())
97
100
        self.assertEqual(
98
 
            ["ghost"],
 
101
            [b"ghost"],
99
102
            branch.repository.get_revision(rev_id1).parent_ids)
100
103
 
101
104
 
113
116
 
114
117
    def build_a_rev(self):
115
118
        builder = BranchBuilder(self.get_transport().clone('foo'))
116
 
        rev_id1 = builder.build_snapshot('A-id', None,
117
 
            [('add', ('', 'a-root-id', 'directory', None)),
118
 
             ('add', ('a', 'a-id', 'file', 'contents'))])
119
 
        self.assertEqual('A-id', rev_id1)
 
119
        rev_id1 = builder.build_snapshot(None,
 
120
                                         [('add', ('', b'a-root-id', 'directory', None)),
 
121
                                          ('add', ('a', b'a-id', 'file', b'contents'))],
 
122
                                         revision_id=b'A-id')
 
123
        self.assertEqual(b'A-id', rev_id1)
120
124
        return builder
121
125
 
122
126
    def test_add_one_file(self):
123
127
        builder = self.build_a_rev()
124
128
        branch = builder.get_branch()
125
 
        self.assertEqual((1, 'A-id'), branch.last_revision_info())
126
 
        rev_tree = branch.repository.revision_tree('A-id')
 
129
        self.assertEqual((1, b'A-id'), branch.last_revision_info())
 
130
        rev_tree = branch.repository.revision_tree(b'A-id')
127
131
        rev_tree.lock_read()
128
132
        self.addCleanup(rev_tree.unlock)
129
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
130
 
                              (u'a', 'a-id', 'file')], rev_tree)
131
 
        self.assertEqual('contents', rev_tree.get_file_text('a-id'))
 
133
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
134
                              (u'a', b'a-id', 'file')], rev_tree)
 
135
        self.assertEqual(b'contents', rev_tree.get_file_text('a'))
132
136
 
133
137
    def test_add_second_file(self):
134
138
        builder = self.build_a_rev()
135
 
        rev_id2 = builder.build_snapshot('B-id', None,
136
 
            [('add', ('b', 'b-id', 'file', 'content_b'))])
137
 
        self.assertEqual('B-id', rev_id2)
 
139
        rev_id2 = builder.build_snapshot(None,
 
140
                                         [('add', ('b', b'b-id', 'file', b'content_b'))],
 
141
                                         revision_id=b'B-id')
 
142
        self.assertEqual(b'B-id', rev_id2)
138
143
        branch = builder.get_branch()
139
144
        self.assertEqual((2, rev_id2), branch.last_revision_info())
140
145
        rev_tree = branch.repository.revision_tree(rev_id2)
141
146
        rev_tree.lock_read()
142
147
        self.addCleanup(rev_tree.unlock)
143
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
144
 
                              (u'a', 'a-id', 'file'),
145
 
                              (u'b', 'b-id', 'file')], rev_tree)
146
 
        self.assertEqual('content_b', rev_tree.get_file_text('b-id'))
 
148
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
149
                              (u'a', b'a-id', 'file'),
 
150
                              (u'b', b'b-id', 'file')], rev_tree)
 
151
        self.assertEqual(b'content_b', rev_tree.get_file_text('b'))
147
152
 
148
153
    def test_add_empty_dir(self):
149
154
        builder = self.build_a_rev()
150
 
        rev_id2 = builder.build_snapshot('B-id', None,
151
 
            [('add', ('b', 'b-id', 'directory', None))])
152
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
153
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
154
 
                              (u'a', 'a-id', 'file'),
155
 
                              (u'b', 'b-id', 'directory'),
156
 
                             ], rev_tree)
 
155
        rev_id2 = builder.build_snapshot(None,
 
156
                                         [('add', ('b', b'b-id', 'directory', None))],
 
157
                                         revision_id=b'B-id')
 
158
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
 
159
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
160
                              (u'a', b'a-id', 'file'),
 
161
                              (u'b', b'b-id', 'directory'),
 
162
                              ], rev_tree)
157
163
 
158
164
    def test_commit_timestamp(self):
159
165
        builder = self.make_branch_builder('foo')
160
 
        rev_id = builder.build_snapshot(None, None,
161
 
            [('add', (u'', None, 'directory', None))],
162
 
            timestamp=1234567890)
 
166
        rev_id = builder.build_snapshot(None,
 
167
                                        [('add', (u'', None, 'directory', None))],
 
168
                                        timestamp=1234567890)
163
169
        rev = builder.get_branch().repository.get_revision(rev_id)
164
170
        self.assertEqual(
165
171
            1234567890,
167
173
 
168
174
    def test_commit_message_default(self):
169
175
        builder = BranchBuilder(self.get_transport().clone('foo'))
170
 
        rev_id = builder.build_snapshot(None, None,
171
 
            [('add', (u'', None, 'directory', None))])
 
176
        rev_id = builder.build_snapshot(None,
 
177
                                        [('add', (u'', None, 'directory', None))])
172
178
        branch = builder.get_branch()
173
179
        rev = branch.repository.get_revision(rev_id)
174
180
        self.assertEqual(u'commit 1', rev.message)
175
181
 
176
182
    def test_commit_message_supplied(self):
177
183
        builder = BranchBuilder(self.get_transport().clone('foo'))
178
 
        rev_id = builder.build_snapshot(None, None,
179
 
            [('add', (u'', None, 'directory', None))],
180
 
            message=u'Foo')
 
184
        rev_id = builder.build_snapshot(None,
 
185
                                        [('add', (u'', None, 'directory', None))],
 
186
                                        message=u'Foo')
181
187
        branch = builder.get_branch()
182
188
        rev = branch.repository.get_revision(rev_id)
183
189
        self.assertEqual(u'Foo', rev.message)
184
190
 
185
191
    def test_commit_message_callback(self):
186
192
        builder = BranchBuilder(self.get_transport().clone('foo'))
187
 
        rev_id = builder.build_snapshot(None, None,
188
 
            [('add', (u'', None, 'directory', None))],
189
 
            message_callback=lambda x:u'Foo')
 
193
        rev_id = builder.build_snapshot(None,
 
194
                                        [('add', (u'', None, 'directory', None))],
 
195
                                        message_callback=lambda x: u'Foo')
190
196
        branch = builder.get_branch()
191
197
        rev = branch.repository.get_revision(rev_id)
192
198
        self.assertEqual(u'Foo', rev.message)
193
199
 
194
200
    def test_modify_file(self):
195
201
        builder = self.build_a_rev()
196
 
        rev_id2 = builder.build_snapshot('B-id', None,
197
 
            [('modify', ('a-id', 'new\ncontent\n'))])
198
 
        self.assertEqual('B-id', rev_id2)
 
202
        rev_id2 = builder.build_snapshot(None,
 
203
                                         [('modify', ('a', b'new\ncontent\n'))],
 
204
                                         revision_id=b'B-id')
 
205
        self.assertEqual(b'B-id', rev_id2)
199
206
        branch = builder.get_branch()
200
207
        rev_tree = branch.repository.revision_tree(rev_id2)
201
208
        rev_tree.lock_read()
202
209
        self.addCleanup(rev_tree.unlock)
203
 
        self.assertEqual('new\ncontent\n', rev_tree.get_file_text('a-id'))
 
210
        self.assertEqual(b'new\ncontent\n',
 
211
                         rev_tree.get_file_text('a'))
204
212
 
205
213
    def test_delete_file(self):
206
214
        builder = self.build_a_rev()
207
 
        rev_id2 = builder.build_snapshot('B-id', None,
208
 
            [('unversion', 'a-id')])
209
 
        self.assertEqual('B-id', rev_id2)
 
215
        rev_id2 = builder.build_snapshot(None,
 
216
                                         [('unversion', 'a')], revision_id=b'B-id')
 
217
        self.assertEqual(b'B-id', rev_id2)
210
218
        branch = builder.get_branch()
211
219
        rev_tree = branch.repository.revision_tree(rev_id2)
212
220
        rev_tree.lock_read()
213
221
        self.addCleanup(rev_tree.unlock)
214
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory')], rev_tree)
 
222
        self.assertTreeShape([(u'', b'a-root-id', 'directory')], rev_tree)
215
223
 
216
224
    def test_delete_directory(self):
217
225
        builder = self.build_a_rev()
218
 
        rev_id2 = builder.build_snapshot('B-id', None,
219
 
            [('add', ('b', 'b-id', 'directory', None)),
220
 
             ('add', ('b/c', 'c-id', 'file', 'foo\n')),
221
 
             ('add', ('b/d', 'd-id', 'directory', None)),
222
 
             ('add', ('b/d/e', 'e-id', 'file', 'eff\n')),
223
 
            ])
224
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
225
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
226
 
                              (u'a', 'a-id', 'file'),
227
 
                              (u'b', 'b-id', 'directory'),
228
 
                              (u'b/c', 'c-id', 'file'),
229
 
                              (u'b/d', 'd-id', 'directory'),
230
 
                              (u'b/d/e', 'e-id', 'file')], rev_tree)
 
226
        rev_id2 = builder.build_snapshot(None,
 
227
                                         [('add', ('b', b'b-id', 'directory', None)),
 
228
                                          ('add', ('b/c', b'c-id', 'file', b'foo\n')),
 
229
                                             ('add', ('b/d', b'd-id',
 
230
                                                      'directory', None)),
 
231
                                             ('add', ('b/d/e', b'e-id',
 
232
                                                      'file', b'eff\n')),
 
233
                                          ], revision_id=b'B-id')
 
234
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
 
235
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
236
                              (u'a', b'a-id', 'file'),
 
237
                              (u'b', b'b-id', 'directory'),
 
238
                              (u'b/c', b'c-id', 'file'),
 
239
                              (u'b/d', b'd-id', 'directory'),
 
240
                              (u'b/d/e', b'e-id', 'file')], rev_tree)
231
241
        # Removing a directory removes all child dirs
232
 
        builder.build_snapshot('C-id', None, [('unversion', 'b-id')])
233
 
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
234
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
235
 
                              (u'a', 'a-id', 'file'),
236
 
                             ], rev_tree)
 
242
        builder.build_snapshot(
 
243
            None, [('unversion', 'b')],
 
244
            revision_id=b'C-id')
 
245
        rev_tree = builder.get_branch().repository.revision_tree(b'C-id')
 
246
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
247
                              (u'a', b'a-id', 'file'),
 
248
                              ], rev_tree)
237
249
 
238
250
    def test_unknown_action(self):
239
251
        builder = self.build_a_rev()
240
252
        e = self.assertRaises(ValueError,
241
 
            builder.build_snapshot, 'B-id', None, [('weirdo', ('foo',))])
 
253
                              builder.build_snapshot, None, [
 
254
                                  ('weirdo', ('foo',))],
 
255
                              revision_id=b'B-id')
242
256
        self.assertEqual('Unknown build action: "weirdo"', str(e))
243
257
 
244
258
    def test_rename(self):
245
259
        builder = self.build_a_rev()
246
 
        builder.build_snapshot('B-id', None,
247
 
            [('rename', ('a', 'b'))])
248
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
249
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
250
 
                              (u'b', 'a-id', 'file')], rev_tree)
 
260
        builder.build_snapshot(None,
 
261
                               [('rename', ('a', 'b'))], revision_id=b'B-id')
 
262
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
 
263
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
264
                              (u'b', b'a-id', 'file')], rev_tree)
251
265
 
252
266
    def test_rename_into_subdir(self):
253
267
        builder = self.build_a_rev()
254
 
        builder.build_snapshot('B-id', None,
255
 
            [('add', ('dir', 'dir-id', 'directory', None)),
256
 
             ('rename', ('a', 'dir/a'))])
257
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
258
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
259
 
                              (u'dir', 'dir-id', 'directory'),
260
 
                              (u'dir/a', 'a-id', 'file')], rev_tree)
 
268
        builder.build_snapshot(None,
 
269
                               [('add', ('dir', b'dir-id', 'directory', None)),
 
270
                                ('rename', ('a', 'dir/a'))], revision_id=b'B-id')
 
271
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
 
272
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
273
                              (u'dir', b'dir-id', 'directory'),
 
274
                              (u'dir/a', b'a-id', 'file')], rev_tree)
261
275
 
262
276
    def test_rename_out_of_unversioned_subdir(self):
263
277
        builder = self.build_a_rev()
264
 
        builder.build_snapshot('B-id', None,
265
 
            [('add', ('dir', 'dir-id', 'directory', None)),
266
 
             ('rename', ('a', 'dir/a'))])
267
 
        builder.build_snapshot('C-id', None,
268
 
            [('rename', ('dir/a', 'a')),
269
 
             ('unversion', 'dir-id')])
270
 
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
271
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
272
 
                              (u'a', 'a-id', 'file')], rev_tree)
 
278
        builder.build_snapshot(None,
 
279
                               [('add', ('dir', b'dir-id', 'directory', None)),
 
280
                                ('rename', ('a', 'dir/a'))],
 
281
                               revision_id=b'B-id')
 
282
        builder.build_snapshot(None,
 
283
                               [('rename', ('dir/a', 'a')),
 
284
                                ('unversion', 'dir')], revision_id=b'C-id')
 
285
        rev_tree = builder.get_branch().repository.revision_tree(b'C-id')
 
286
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
287
                              (u'a', b'a-id', 'file')], rev_tree)
273
288
 
274
289
    def test_set_parent(self):
275
290
        builder = self.build_a_rev()
276
291
        builder.start_series()
277
292
        self.addCleanup(builder.finish_series)
278
 
        builder.build_snapshot('B-id', ['A-id'],
279
 
            [('modify', ('a-id', 'new\ncontent\n'))])
280
 
        builder.build_snapshot('C-id', ['A-id'],
281
 
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
 
293
        builder.build_snapshot([b'A-id'],
 
294
                               [('modify', ('a', b'new\ncontent\n'))],
 
295
                               revision_id=b'B-id')
 
296
        builder.build_snapshot([b'A-id'],
 
297
                               [('add', ('c', b'c-id', 'file', b'alt\ncontent\n'))],
 
298
                               revision_id=b'C-id')
282
299
        # We should now have a graph:
283
300
        #   A
284
301
        #   |\
285
302
        #   C B
286
303
        # And not A => B => C
287
304
        repo = builder.get_branch().repository
288
 
        self.assertEqual({'B-id': ('A-id',), 'C-id': ('A-id',)},
289
 
                         repo.get_parent_map(['B-id', 'C-id']))
290
 
        b_tree = repo.revision_tree('B-id')
291
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
292
 
                              (u'a', 'a-id', 'file'),
293
 
                             ], b_tree)
294
 
        self.assertEqual('new\ncontent\n', b_tree.get_file_text('a-id'))
 
305
        self.assertEqual({b'B-id': (b'A-id',), b'C-id': (b'A-id',)},
 
306
                         repo.get_parent_map([b'B-id', b'C-id']))
 
307
        b_tree = repo.revision_tree(b'B-id')
 
308
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
309
                              (u'a', b'a-id', 'file'),
 
310
                              ], b_tree)
 
311
        self.assertEqual(b'new\ncontent\n', b_tree.get_file_text('a'))
295
312
 
296
313
        # We should still be using the content from A in C, not from B
297
 
        c_tree = repo.revision_tree('C-id')
298
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
299
 
                              (u'a', 'a-id', 'file'),
300
 
                              (u'c', 'c-id', 'file'),
301
 
                             ], c_tree)
302
 
        self.assertEqual('contents', c_tree.get_file_text('a-id'))
303
 
        self.assertEqual('alt\ncontent\n', c_tree.get_file_text('c-id'))
 
314
        c_tree = repo.revision_tree(b'C-id')
 
315
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
316
                              (u'a', b'a-id', 'file'),
 
317
                              (u'c', b'c-id', 'file'),
 
318
                              ], c_tree)
 
319
        self.assertEqual(b'contents', c_tree.get_file_text('a'))
 
320
        self.assertEqual(b'alt\ncontent\n', c_tree.get_file_text('c'))
304
321
 
305
322
    def test_set_merge_parent(self):
306
323
        builder = self.build_a_rev()
307
324
        builder.start_series()
308
325
        self.addCleanup(builder.finish_series)
309
 
        builder.build_snapshot('B-id', ['A-id'],
310
 
            [('add', ('b', 'b-id', 'file', 'b\ncontent\n'))])
311
 
        builder.build_snapshot('C-id', ['A-id'],
312
 
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
313
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'], [])
 
326
        builder.build_snapshot([b'A-id'],
 
327
                               [('add', ('b', b'b-id', 'file', b'b\ncontent\n'))],
 
328
                               revision_id=b'B-id')
 
329
        builder.build_snapshot([b'A-id'],
 
330
                               [('add', ('c', b'c-id', 'file', b'alt\ncontent\n'))],
 
331
                               revision_id=b'C-id')
 
332
        builder.build_snapshot([b'B-id', b'C-id'], [], revision_id=b'D-id')
314
333
        repo = builder.get_branch().repository
315
 
        self.assertEqual({'B-id': ('A-id',), 'C-id': ('A-id',),
316
 
                          'D-id': ('B-id', 'C-id')},
317
 
                         repo.get_parent_map(['B-id', 'C-id', 'D-id']))
318
 
        d_tree = repo.revision_tree('D-id')
 
334
        self.assertEqual({b'B-id': (b'A-id',), b'C-id': (b'A-id',),
 
335
                          b'D-id': (b'B-id', b'C-id')},
 
336
                         repo.get_parent_map([b'B-id', b'C-id', b'D-id']))
 
337
        d_tree = repo.revision_tree(b'D-id')
319
338
        # Note: by default a merge node does *not* pull in the changes from the
320
339
        #       merged tree, you have to supply it yourself.
321
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
322
 
                              (u'a', 'a-id', 'file'),
323
 
                              (u'b', 'b-id', 'file'),
324
 
                             ], d_tree)
 
340
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
341
                              (u'a', b'a-id', 'file'),
 
342
                              (u'b', b'b-id', 'file'),
 
343
                              ], d_tree)
325
344
 
326
345
    def test_set_merge_parent_and_contents(self):
327
346
        builder = self.build_a_rev()
328
347
        builder.start_series()
329
348
        self.addCleanup(builder.finish_series)
330
 
        builder.build_snapshot('B-id', ['A-id'],
331
 
            [('add', ('b', 'b-id', 'file', 'b\ncontent\n'))])
332
 
        builder.build_snapshot('C-id', ['A-id'],
333
 
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
334
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
335
 
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
 
349
        builder.build_snapshot([b'A-id'],
 
350
                               [('add', ('b', b'b-id', 'file', b'b\ncontent\n'))],
 
351
                               revision_id=b'B-id')
 
352
        builder.build_snapshot([b'A-id'],
 
353
                               [('add', ('c', b'c-id', 'file', b'alt\ncontent\n'))],
 
354
                               revision_id=b'C-id')
 
355
        builder.build_snapshot([b'B-id', b'C-id'],
 
356
                               [('add', ('c', b'c-id', 'file', b'alt\ncontent\n'))],
 
357
                               revision_id=b'D-id')
336
358
        repo = builder.get_branch().repository
337
 
        self.assertEqual({'B-id': ('A-id',), 'C-id': ('A-id',),
338
 
                          'D-id': ('B-id', 'C-id')},
339
 
                         repo.get_parent_map(['B-id', 'C-id', 'D-id']))
340
 
        d_tree = repo.revision_tree('D-id')
341
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
342
 
                              (u'a', 'a-id', 'file'),
343
 
                              (u'b', 'b-id', 'file'),
344
 
                              (u'c', 'c-id', 'file'),
345
 
                             ], d_tree)
 
359
        self.assertEqual({b'B-id': (b'A-id',), b'C-id': (b'A-id',),
 
360
                          b'D-id': (b'B-id', b'C-id')},
 
361
                         repo.get_parent_map([b'B-id', b'C-id', b'D-id']))
 
362
        d_tree = repo.revision_tree(b'D-id')
 
363
        self.assertTreeShape([(u'', b'a-root-id', 'directory'),
 
364
                              (u'a', b'a-id', 'file'),
 
365
                              (u'b', b'b-id', 'file'),
 
366
                              (u'c', b'c-id', 'file'),
 
367
                              ], d_tree)
346
368
        # Because we copied the exact text into *this* tree, the 'c' file
347
369
        # should look like it was not modified in the merge
348
 
        self.assertEqual('C-id', d_tree.get_file_revision('c-id'))
 
370
        self.assertEqual(b'C-id', d_tree.get_file_revision('c'))
349
371
 
350
372
    def test_set_parent_to_null(self):
351
373
        builder = self.build_a_rev()
352
374
        builder.start_series()
353
375
        self.addCleanup(builder.finish_series)
354
 
        builder.build_snapshot('B-id', [],
355
 
            [('add', ('', None, 'directory', None))])
 
376
        builder.build_snapshot([],
 
377
                               [('add', ('', None, 'directory', None))],
 
378
                               revision_id=b'B-id')
356
379
        # We should now have a graph:
357
380
        #   A B
358
381
        # And not A => B
359
382
        repo = builder.get_branch().repository
360
 
        self.assertEqual({'A-id': (_mod_revision.NULL_REVISION,),
361
 
                          'B-id': (_mod_revision.NULL_REVISION,),},
362
 
                         repo.get_parent_map(['A-id', 'B-id']))
 
383
        self.assertEqual({b'A-id': (_mod_revision.NULL_REVISION,),
 
384
                          b'B-id': (_mod_revision.NULL_REVISION,), },
 
385
                         repo.get_parent_map([b'A-id', b'B-id']))
363
386
 
364
 
    
365
387
    def test_start_finish_series(self):
366
388
        builder = BranchBuilder(self.get_transport().clone('foo'))
367
389
        builder.start_series()
378
400
        builder = BranchBuilder(self.get_transport().clone('foo'))
379
401
        builder.start_series()
380
402
        try:
381
 
            builder.build_snapshot('tip', ['ghost'],
382
 
                [('add', ('', 'ROOT_ID', 'directory', ''))],
383
 
                allow_leftmost_as_ghost=True)
 
403
            builder.build_snapshot([b'ghost'],
 
404
                                   [('add', ('', b'ROOT_ID', 'directory', ''))],
 
405
                                   allow_leftmost_as_ghost=True, revision_id=b'tip')
384
406
        finally:
385
407
            builder.finish_series()
386
408
        b = builder.get_branch()
387
409
        b.lock_read()
388
410
        self.addCleanup(b.unlock)
389
 
        self.assertEqual(('ghost',),
390
 
            b.repository.get_graph().get_parent_map(['tip'])['tip'])
 
411
        self.assertEqual((b'ghost',),
 
412
                         b.repository.get_graph().get_parent_map([b'tip'])[b'tip'])
391
413
 
392
414
    def test_unversion_root_add_new_root(self):
393
415
        builder = BranchBuilder(self.get_transport().clone('foo'))
394
416
        builder.start_series()
395
 
        builder.build_snapshot('rev-1', None,
396
 
            [('add', ('', 'TREE_ROOT', 'directory', ''))])
397
 
        builder.build_snapshot('rev-2', None,
398
 
            [('unversion', 'TREE_ROOT'),
399
 
             ('add', ('', 'my-root', 'directory', ''))])
 
417
        builder.build_snapshot(None,
 
418
                               [('add', ('', b'TREE_ROOT', 'directory', ''))],
 
419
                               revision_id=b'rev-1')
 
420
        builder.build_snapshot(None,
 
421
                               [('unversion', ''),
 
422
                                ('add', ('', b'my-root', 'directory', ''))],
 
423
                               revision_id=b'rev-2')
400
424
        builder.finish_series()
401
 
        rev_tree = builder.get_branch().repository.revision_tree('rev-2')
402
 
        self.assertTreeShape([(u'', 'my-root', 'directory')], rev_tree)
 
425
        rev_tree = builder.get_branch().repository.revision_tree(b'rev-2')
 
426
        self.assertTreeShape([(u'', b'my-root', 'directory')], rev_tree)
403
427
 
404
428
    def test_empty_flush(self):
405
429
        """A flush with no actions before it is a no-op."""
406
430
        builder = BranchBuilder(self.get_transport().clone('foo'))
407
431
        builder.start_series()
408
 
        builder.build_snapshot('rev-1', None,
409
 
            [('add', ('', 'TREE_ROOT', 'directory', ''))])
410
 
        builder.build_snapshot('rev-2', None, [('flush', None)])
 
432
        builder.build_snapshot(None,
 
433
                               [('add', ('', b'TREE_ROOT', 'directory', ''))],
 
434
                               revision_id=b'rev-1')
 
435
        builder.build_snapshot(None, [('flush', None)], revision_id=b'rev-2')
411
436
        builder.finish_series()
412
 
        rev_tree = builder.get_branch().repository.revision_tree('rev-2')
413
 
        self.assertTreeShape([(u'', 'TREE_ROOT', 'directory')], rev_tree)
 
437
        rev_tree = builder.get_branch().repository.revision_tree(b'rev-2')
 
438
        self.assertTreeShape([(u'', b'TREE_ROOT', 'directory')], rev_tree)
414
439
 
415
440
    def test_kind_change(self):
416
441
        """It's possible to change the kind of an entry in a single snapshot
418
443
        """
419
444
        builder = BranchBuilder(self.get_transport().clone('foo'))
420
445
        builder.start_series()
421
 
        builder.build_snapshot('A-id', None,
422
 
            [('add', (u'', 'a-root-id', 'directory', None)),
423
 
             ('add', (u'a', 'a-id', 'file', 'content\n'))])
424
 
        builder.build_snapshot('B-id', None,
425
 
            [('unversion', 'a-id'),
426
 
             ('flush', None),
427
 
             ('add', (u'a', 'a-id', 'directory', None))])
 
446
        builder.build_snapshot(None,
 
447
                               [('add', (u'', b'a-root-id', 'directory', None)),
 
448
                                ('add', (u'a', b'a-id', 'file', b'content\n'))],
 
449
                               revision_id=b'A-id')
 
450
        builder.build_snapshot(None,
 
451
                               [('unversion', 'a'),
 
452
                                ('flush', None),
 
453
                                   ('add', (u'a', b'a-id', 'directory', None))],
 
454
                               revision_id=b'B-id')
428
455
        builder.finish_series()
429
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
 
456
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
430
457
        self.assertTreeShape(
431
 
            [(u'', 'a-root-id', 'directory'), (u'a', 'a-id', 'directory')],
 
458
            [(u'', b'a-root-id', 'directory'), (u'a', b'a-id', 'directory')],
432
459
            rev_tree)
433
460
 
434
461
    def test_pivot_root(self):
437
464
        """
438
465
        builder = BranchBuilder(self.get_transport().clone('foo'))
439
466
        builder.start_series()
440
 
        builder.build_snapshot('A-id', None,
441
 
            [('add', (u'', 'orig-root', 'directory', None)),
442
 
             ('add', (u'dir', 'dir-id', 'directory', None))])
443
 
        builder.build_snapshot('B-id', None,
444
 
            [('unversion', 'orig-root'),  # implicitly unversions all children
445
 
             ('flush', None),
446
 
             ('add', (u'', 'dir-id', 'directory', None))])
 
467
        builder.build_snapshot(None,
 
468
                               [('add', (u'', b'orig-root', 'directory', None)),
 
469
                                ('add', (u'dir', b'dir-id', 'directory', None))],
 
470
                               revision_id=b'A-id')
 
471
        builder.build_snapshot(None,
 
472
                               [('unversion', ''),  # implicitly unversions all children
 
473
                                ('flush', None),
 
474
                                   ('add', (u'', b'dir-id', 'directory', None))],
 
475
                               revision_id=b'B-id')
447
476
        builder.finish_series()
448
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
449
 
        self.assertTreeShape([(u'', 'dir-id', 'directory')], rev_tree)
450
 
 
 
477
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
 
478
        self.assertTreeShape([(u'', b'dir-id', 'directory')], rev_tree)