/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: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

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