/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 brzlib/tests/test_branchbuilder.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

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