/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-11-16 23:19:12 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7294.
  • Revision ID: jelmer@jelmer.uk-20181116231912-e043vpq22bdkxa6q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_branchbuilder.py
1
 
# Copyright (C) 2007, 2009 Canonical Ltd
 
1
# Copyright (C) 2007-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
 
    errors,
22
21
    revision as _mod_revision,
23
22
    tests,
24
23
    )
25
 
from bzrlib.branchbuilder import BranchBuilder
 
24
from ..bzr import (
 
25
    branch as _mod_bzrbranch,
 
26
    )
 
27
from ..branchbuilder import BranchBuilder
26
28
 
27
29
 
28
30
class TestBranchBuilder(tests.TestCaseWithMemoryTransport):
38
40
        branch = builder.get_branch()
39
41
        self.assertIsInstance(branch, _mod_branch.Branch)
40
42
        self.assertEqual(self.get_transport().clone('foo').base,
41
 
            branch.base)
 
43
                         branch.base)
42
44
        self.assertEqual(
43
45
            (0, _mod_revision.NULL_REVISION),
44
46
            branch.last_revision_info())
47
49
        """Making a BranchBuilder with a format option sets the branch type."""
48
50
        builder = BranchBuilder(self.get_transport(), format='dirstate-tags')
49
51
        branch = builder.get_branch()
50
 
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
 
52
        self.assertIsInstance(branch, _mod_bzrbranch.BzrBranch6)
51
53
 
52
54
    def test_build_one_commit(self):
53
55
        """doing build_commit causes a commit to happen."""
87
89
            [rev_id1],
88
90
            branch.repository.get_revision(branch.last_revision()).parent_ids)
89
91
 
 
92
    def test_build_commit_parent_ids(self):
 
93
        """build_commit() takes a parent_ids argument."""
 
94
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
95
        rev_id1 = builder.build_commit(
 
96
            parent_ids=[b"ghost"], allow_leftmost_as_ghost=True)
 
97
        rev_id2 = builder.build_commit(parent_ids=[])
 
98
        branch = builder.get_branch()
 
99
        self.assertEqual((1, rev_id2), branch.last_revision_info())
 
100
        self.assertEqual(
 
101
            [b"ghost"],
 
102
            branch.repository.get_revision(rev_id1).parent_ids)
 
103
 
90
104
 
91
105
class TestBranchBuilderBuildSnapshot(tests.TestCaseWithMemoryTransport):
92
106
 
102
116
 
103
117
    def build_a_rev(self):
104
118
        builder = BranchBuilder(self.get_transport().clone('foo'))
105
 
        rev_id1 = builder.build_snapshot('A-id', None,
106
 
            [('add', ('', 'a-root-id', 'directory', None)),
107
 
             ('add', ('a', 'a-id', 'file', 'contents'))])
108
 
        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)
109
124
        return builder
110
125
 
111
126
    def test_add_one_file(self):
112
127
        builder = self.build_a_rev()
113
128
        branch = builder.get_branch()
114
 
        self.assertEqual((1, 'A-id'), branch.last_revision_info())
115
 
        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')
116
131
        rev_tree.lock_read()
117
132
        self.addCleanup(rev_tree.unlock)
118
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
119
 
                              (u'a', 'a-id', 'file')], rev_tree)
120
 
        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'))
121
136
 
122
137
    def test_add_second_file(self):
123
138
        builder = self.build_a_rev()
124
 
        rev_id2 = builder.build_snapshot('B-id', None,
125
 
            [('add', ('b', 'b-id', 'file', 'content_b'))])
126
 
        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)
127
143
        branch = builder.get_branch()
128
144
        self.assertEqual((2, rev_id2), branch.last_revision_info())
129
145
        rev_tree = branch.repository.revision_tree(rev_id2)
130
146
        rev_tree.lock_read()
131
147
        self.addCleanup(rev_tree.unlock)
132
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
133
 
                              (u'a', 'a-id', 'file'),
134
 
                              (u'b', 'b-id', 'file')], rev_tree)
135
 
        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'))
136
152
 
137
153
    def test_add_empty_dir(self):
138
154
        builder = self.build_a_rev()
139
 
        rev_id2 = builder.build_snapshot('B-id', None,
140
 
            [('add', ('b', 'b-id', 'directory', None))])
141
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
142
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
143
 
                              (u'a', 'a-id', 'file'),
144
 
                              (u'b', 'b-id', 'directory'),
145
 
                             ], 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)
146
163
 
147
164
    def test_commit_timestamp(self):
148
165
        builder = self.make_branch_builder('foo')
149
 
        rev_id = builder.build_snapshot(None, None,
150
 
            [('add', (u'', None, 'directory', None))],
151
 
            timestamp=1234567890)
 
166
        rev_id = builder.build_snapshot(None,
 
167
                                        [('add', (u'', None, 'directory', None))],
 
168
                                        timestamp=1234567890)
152
169
        rev = builder.get_branch().repository.get_revision(rev_id)
153
170
        self.assertEqual(
154
171
            1234567890,
156
173
 
157
174
    def test_commit_message_default(self):
158
175
        builder = BranchBuilder(self.get_transport().clone('foo'))
159
 
        rev_id = builder.build_snapshot(None, None,
160
 
            [('add', (u'', None, 'directory', None))])
 
176
        rev_id = builder.build_snapshot(None,
 
177
                                        [('add', (u'', None, 'directory', None))])
161
178
        branch = builder.get_branch()
162
179
        rev = branch.repository.get_revision(rev_id)
163
180
        self.assertEqual(u'commit 1', rev.message)
164
181
 
165
182
    def test_commit_message_supplied(self):
166
183
        builder = BranchBuilder(self.get_transport().clone('foo'))
167
 
        rev_id = builder.build_snapshot(None, None,
168
 
            [('add', (u'', None, 'directory', None))],
169
 
            message=u'Foo')
 
184
        rev_id = builder.build_snapshot(None,
 
185
                                        [('add', (u'', None, 'directory', None))],
 
186
                                        message=u'Foo')
170
187
        branch = builder.get_branch()
171
188
        rev = branch.repository.get_revision(rev_id)
172
189
        self.assertEqual(u'Foo', rev.message)
173
190
 
174
191
    def test_commit_message_callback(self):
175
192
        builder = BranchBuilder(self.get_transport().clone('foo'))
176
 
        rev_id = builder.build_snapshot(None, None,
177
 
            [('add', (u'', None, 'directory', None))],
178
 
            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')
179
196
        branch = builder.get_branch()
180
197
        rev = branch.repository.get_revision(rev_id)
181
198
        self.assertEqual(u'Foo', rev.message)
182
199
 
183
200
    def test_modify_file(self):
184
201
        builder = self.build_a_rev()
185
 
        rev_id2 = builder.build_snapshot('B-id', None,
186
 
            [('modify', ('a-id', 'new\ncontent\n'))])
187
 
        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)
188
206
        branch = builder.get_branch()
189
207
        rev_tree = branch.repository.revision_tree(rev_id2)
190
208
        rev_tree.lock_read()
191
209
        self.addCleanup(rev_tree.unlock)
192
 
        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(rev_tree.id2path(b'a-id')))
193
212
 
194
213
    def test_delete_file(self):
195
214
        builder = self.build_a_rev()
196
 
        rev_id2 = builder.build_snapshot('B-id', None,
197
 
            [('unversion', 'a-id')])
198
 
        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)
199
218
        branch = builder.get_branch()
200
219
        rev_tree = branch.repository.revision_tree(rev_id2)
201
220
        rev_tree.lock_read()
202
221
        self.addCleanup(rev_tree.unlock)
203
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory')], rev_tree)
 
222
        self.assertTreeShape([(u'', b'a-root-id', 'directory')], rev_tree)
204
223
 
205
224
    def test_delete_directory(self):
206
225
        builder = self.build_a_rev()
207
 
        rev_id2 = builder.build_snapshot('B-id', None,
208
 
            [('add', ('b', 'b-id', 'directory', None)),
209
 
             ('add', ('b/c', 'c-id', 'file', 'foo\n')),
210
 
             ('add', ('b/d', 'd-id', 'directory', None)),
211
 
             ('add', ('b/d/e', 'e-id', 'file', 'eff\n')),
212
 
            ])
213
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
214
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
215
 
                              (u'a', 'a-id', 'file'),
216
 
                              (u'b', 'b-id', 'directory'),
217
 
                              (u'b/c', 'c-id', 'file'),
218
 
                              (u'b/d', 'd-id', 'directory'),
219
 
                              (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)
220
241
        # Removing a directory removes all child dirs
221
 
        builder.build_snapshot('C-id', None, [('unversion', 'b-id')])
222
 
        rev_tree = builder.get_branch().repository.revision_tree('C-id')
223
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
224
 
                              (u'a', 'a-id', 'file'),
225
 
                             ], 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)
226
249
 
227
250
    def test_unknown_action(self):
228
251
        builder = self.build_a_rev()
229
252
        e = self.assertRaises(ValueError,
230
 
            builder.build_snapshot, 'B-id', None, [('weirdo', ('foo',))])
 
253
                              builder.build_snapshot, None, [
 
254
                                  ('weirdo', ('foo',))],
 
255
                              revision_id=b'B-id')
231
256
        self.assertEqual('Unknown build action: "weirdo"', str(e))
232
257
 
233
258
    def test_rename(self):
234
259
        builder = self.build_a_rev()
235
 
        builder.build_snapshot('B-id', None,
236
 
            [('rename', ('a', 'b'))])
237
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
238
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
239
 
                              (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)
240
265
 
241
266
    def test_rename_into_subdir(self):
242
267
        builder = self.build_a_rev()
243
 
        builder.build_snapshot('B-id', None,
244
 
            [('add', ('dir', 'dir-id', 'directory', None)),
245
 
             ('rename', ('a', 'dir/a'))])
246
 
        rev_tree = builder.get_branch().repository.revision_tree('B-id')
247
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
248
 
                              (u'dir', 'dir-id', 'directory'),
249
 
                              (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)
 
275
 
 
276
    def test_rename_out_of_unversioned_subdir(self):
 
277
        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)
250
288
 
251
289
    def test_set_parent(self):
252
290
        builder = self.build_a_rev()
253
291
        builder.start_series()
254
292
        self.addCleanup(builder.finish_series)
255
 
        builder.build_snapshot('B-id', ['A-id'],
256
 
            [('modify', ('a-id', 'new\ncontent\n'))])
257
 
        builder.build_snapshot('C-id', ['A-id'],
258
 
            [('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')
259
299
        # We should now have a graph:
260
300
        #   A
261
301
        #   |\
262
302
        #   C B
263
303
        # And not A => B => C
264
304
        repo = builder.get_branch().repository
265
 
        self.assertEqual({'B-id': ('A-id',), 'C-id': ('A-id',)},
266
 
                         repo.get_parent_map(['B-id', 'C-id']))
267
 
        b_tree = repo.revision_tree('B-id')
268
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
269
 
                              (u'a', 'a-id', 'file'),
270
 
                             ], b_tree)
271
 
        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'))
272
312
 
273
313
        # We should still be using the content from A in C, not from B
274
 
        c_tree = repo.revision_tree('C-id')
275
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
276
 
                              (u'a', 'a-id', 'file'),
277
 
                              (u'c', 'c-id', 'file'),
278
 
                             ], c_tree)
279
 
        self.assertEqual('contents', c_tree.get_file_text('a-id'))
280
 
        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'))
281
321
 
282
322
    def test_set_merge_parent(self):
283
323
        builder = self.build_a_rev()
284
324
        builder.start_series()
285
325
        self.addCleanup(builder.finish_series)
286
 
        builder.build_snapshot('B-id', ['A-id'],
287
 
            [('add', ('b', 'b-id', 'file', 'b\ncontent\n'))])
288
 
        builder.build_snapshot('C-id', ['A-id'],
289
 
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
290
 
        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')
291
333
        repo = builder.get_branch().repository
292
 
        self.assertEqual({'B-id': ('A-id',), 'C-id': ('A-id',),
293
 
                          'D-id': ('B-id', 'C-id')},
294
 
                         repo.get_parent_map(['B-id', 'C-id', 'D-id']))
295
 
        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')
296
338
        # Note: by default a merge node does *not* pull in the changes from the
297
339
        #       merged tree, you have to supply it yourself.
298
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
299
 
                              (u'a', 'a-id', 'file'),
300
 
                              (u'b', 'b-id', 'file'),
301
 
                             ], 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)
302
344
 
303
345
    def test_set_merge_parent_and_contents(self):
304
346
        builder = self.build_a_rev()
305
347
        builder.start_series()
306
348
        self.addCleanup(builder.finish_series)
307
 
        builder.build_snapshot('B-id', ['A-id'],
308
 
            [('add', ('b', 'b-id', 'file', 'b\ncontent\n'))])
309
 
        builder.build_snapshot('C-id', ['A-id'],
310
 
            [('add', ('c', 'c-id', 'file', 'alt\ncontent\n'))])
311
 
        builder.build_snapshot('D-id', ['B-id', 'C-id'],
312
 
            [('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')
313
358
        repo = builder.get_branch().repository
314
 
        self.assertEqual({'B-id': ('A-id',), 'C-id': ('A-id',),
315
 
                          'D-id': ('B-id', 'C-id')},
316
 
                         repo.get_parent_map(['B-id', 'C-id', 'D-id']))
317
 
        d_tree = repo.revision_tree('D-id')
318
 
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
319
 
                              (u'a', 'a-id', 'file'),
320
 
                              (u'b', 'b-id', 'file'),
321
 
                              (u'c', 'c-id', 'file'),
322
 
                             ], 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)
323
368
        # Because we copied the exact text into *this* tree, the 'c' file
324
369
        # should look like it was not modified in the merge
325
 
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
 
370
        self.assertEqual(b'C-id', d_tree.get_file_revision('c'))
 
371
 
 
372
    def test_set_parent_to_null(self):
 
373
        builder = self.build_a_rev()
 
374
        builder.start_series()
 
375
        self.addCleanup(builder.finish_series)
 
376
        builder.build_snapshot([],
 
377
                               [('add', ('', None, 'directory', None))],
 
378
                               revision_id=b'B-id')
 
379
        # We should now have a graph:
 
380
        #   A B
 
381
        # And not A => B
 
382
        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']))
326
386
 
327
387
    def test_start_finish_series(self):
328
388
        builder = BranchBuilder(self.get_transport().clone('foo'))
340
400
        builder = BranchBuilder(self.get_transport().clone('foo'))
341
401
        builder.start_series()
342
402
        try:
343
 
            builder.build_snapshot('tip', ['ghost'],
344
 
                [('add', ('', 'ROOT_ID', 'directory', ''))],
345
 
                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')
346
406
        finally:
347
407
            builder.finish_series()
348
408
        b = builder.get_branch()
349
409
        b.lock_read()
350
410
        self.addCleanup(b.unlock)
351
 
        self.assertEqual(('ghost',),
352
 
            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'])
 
413
 
 
414
    def test_unversion_root_add_new_root(self):
 
415
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
416
        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')
 
424
        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)
 
427
 
 
428
    def test_empty_flush(self):
 
429
        """A flush with no actions before it is a no-op."""
 
430
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
431
        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')
 
436
        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)
 
439
 
 
440
    def test_kind_change(self):
 
441
        """It's possible to change the kind of an entry in a single snapshot
 
442
        with a bit of help from the 'flush' action.
 
443
        """
 
444
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
445
        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')
 
455
        builder.finish_series()
 
456
        rev_tree = builder.get_branch().repository.revision_tree(b'B-id')
 
457
        self.assertTreeShape(
 
458
            [(u'', b'a-root-id', 'directory'), (u'a', b'a-id', 'directory')],
 
459
            rev_tree)
 
460
 
 
461
    def test_pivot_root(self):
 
462
        """It's possible (albeit awkward) to move an existing dir to the root
 
463
        in a single snapshot by using unversion then flush then add.
 
464
        """
 
465
        builder = BranchBuilder(self.get_transport().clone('foo'))
 
466
        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')
 
476
        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)