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

  • Committer: Marius Kruger
  • Date: 2010-07-10 21:28:56 UTC
  • mto: (5384.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5385.
  • Revision ID: marius.kruger@enerweb.co.za-20100710212856-uq4ji3go0u5se7hx
* Update documentation
* add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
1
 
# Copyright (C) 2007-2011 Canonical Ltd
 
1
# Copyright (C) 2007, 2009 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 .. import (
 
19
from bzrlib import (
20
20
    branch as _mod_branch,
 
21
    errors,
21
22
    revision as _mod_revision,
22
23
    tests,
23
24
    )
24
 
from ..bzr import (
25
 
    branch as _mod_bzrbranch,
26
 
    )
27
 
from ..branchbuilder import BranchBuilder
 
25
from bzrlib.branchbuilder import BranchBuilder
28
26
 
29
27
 
30
28
class TestBranchBuilder(tests.TestCaseWithMemoryTransport):
40
38
        branch = builder.get_branch()
41
39
        self.assertIsInstance(branch, _mod_branch.Branch)
42
40
        self.assertEqual(self.get_transport().clone('foo').base,
43
 
                         branch.base)
 
41
            branch.base)
44
42
        self.assertEqual(
45
43
            (0, _mod_revision.NULL_REVISION),
46
44
            branch.last_revision_info())
49
47
        """Making a BranchBuilder with a format option sets the branch type."""
50
48
        builder = BranchBuilder(self.get_transport(), format='dirstate-tags')
51
49
        branch = builder.get_branch()
52
 
        self.assertIsInstance(branch, _mod_bzrbranch.BzrBranch6)
 
50
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
53
51
 
54
52
    def test_build_one_commit(self):
55
53
        """doing build_commit causes a commit to happen."""
89
87
            [rev_id1],
90
88
            branch.repository.get_revision(branch.last_revision()).parent_ids)
91
89
 
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
 
 
104
90
 
105
91
class TestBranchBuilderBuildSnapshot(tests.TestCaseWithMemoryTransport):
106
92
 
116
102
 
117
103
    def build_a_rev(self):
118
104
        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)
 
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)
124
109
        return builder
125
110
 
126
111
    def test_add_one_file(self):
127
112
        builder = self.build_a_rev()
128
113
        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')
 
114
        self.assertEqual((1, 'A-id'), branch.last_revision_info())
 
115
        rev_tree = branch.repository.revision_tree('A-id')
131
116
        rev_tree.lock_read()
132
117
        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'))
 
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'))
136
121
 
137
122
    def test_add_second_file(self):
138
123
        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)
 
124
        rev_id2 = builder.build_snapshot('B-id', None,
 
125
            [('add', ('b', 'b-id', 'file', 'content_b'))])
 
126
        self.assertEqual('B-id', rev_id2)
143
127
        branch = builder.get_branch()
144
128
        self.assertEqual((2, rev_id2), branch.last_revision_info())
145
129
        rev_tree = branch.repository.revision_tree(rev_id2)
146
130
        rev_tree.lock_read()
147
131
        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'))
 
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'))
152
136
 
153
137
    def test_add_empty_dir(self):
154
138
        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)
 
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)
163
146
 
164
147
    def test_commit_timestamp(self):
165
148
        builder = self.make_branch_builder('foo')
166
 
        rev_id = builder.build_snapshot(None,
167
 
                                        [('add', (u'', None, 'directory', None))],
168
 
                                        timestamp=1234567890)
 
149
        rev_id = builder.build_snapshot(None, None,
 
150
            [('add', (u'', None, 'directory', None))],
 
151
            timestamp=1234567890)
169
152
        rev = builder.get_branch().repository.get_revision(rev_id)
170
153
        self.assertEqual(
171
154
            1234567890,
173
156
 
174
157
    def test_commit_message_default(self):
175
158
        builder = BranchBuilder(self.get_transport().clone('foo'))
176
 
        rev_id = builder.build_snapshot(None,
177
 
                                        [('add', (u'', None, 'directory', None))])
 
159
        rev_id = builder.build_snapshot(None, None,
 
160
            [('add', (u'', None, 'directory', None))])
178
161
        branch = builder.get_branch()
179
162
        rev = branch.repository.get_revision(rev_id)
180
163
        self.assertEqual(u'commit 1', rev.message)
181
164
 
182
165
    def test_commit_message_supplied(self):
183
166
        builder = BranchBuilder(self.get_transport().clone('foo'))
184
 
        rev_id = builder.build_snapshot(None,
185
 
                                        [('add', (u'', None, 'directory', None))],
186
 
                                        message=u'Foo')
 
167
        rev_id = builder.build_snapshot(None, None,
 
168
            [('add', (u'', None, 'directory', None))],
 
169
            message=u'Foo')
187
170
        branch = builder.get_branch()
188
171
        rev = branch.repository.get_revision(rev_id)
189
172
        self.assertEqual(u'Foo', rev.message)
190
173
 
191
174
    def test_commit_message_callback(self):
192
175
        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')
 
176
        rev_id = builder.build_snapshot(None, None,
 
177
            [('add', (u'', None, 'directory', None))],
 
178
            message_callback=lambda x:u'Foo')
196
179
        branch = builder.get_branch()
197
180
        rev = branch.repository.get_revision(rev_id)
198
181
        self.assertEqual(u'Foo', rev.message)
199
182
 
200
183
    def test_modify_file(self):
201
184
        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)
 
185
        rev_id2 = builder.build_snapshot('B-id', None,
 
186
            [('modify', ('a-id', 'new\ncontent\n'))])
 
187
        self.assertEqual('B-id', rev_id2)
206
188
        branch = builder.get_branch()
207
189
        rev_tree = branch.repository.revision_tree(rev_id2)
208
190
        rev_tree.lock_read()
209
191
        self.addCleanup(rev_tree.unlock)
210
 
        self.assertEqual(b'new\ncontent\n',
211
 
                         rev_tree.get_file_text('a'))
 
192
        self.assertEqual('new\ncontent\n', rev_tree.get_file_text('a-id'))
212
193
 
213
194
    def test_delete_file(self):
214
195
        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)
 
196
        rev_id2 = builder.build_snapshot('B-id', None,
 
197
            [('unversion', 'a-id')])
 
198
        self.assertEqual('B-id', rev_id2)
218
199
        branch = builder.get_branch()
219
200
        rev_tree = branch.repository.revision_tree(rev_id2)
220
201
        rev_tree.lock_read()
221
202
        self.addCleanup(rev_tree.unlock)
222
 
        self.assertTreeShape([(u'', b'a-root-id', 'directory')], rev_tree)
 
203
        self.assertTreeShape([(u'', 'a-root-id', 'directory')], rev_tree)
223
204
 
224
205
    def test_delete_directory(self):
225
206
        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)
 
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)
241
220
        # 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)
 
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)
249
226
 
250
227
    def test_unknown_action(self):
251
228
        builder = self.build_a_rev()
252
229
        e = self.assertRaises(ValueError,
253
 
                              builder.build_snapshot, None, [
254
 
                                  ('weirdo', ('foo',))],
255
 
                              revision_id=b'B-id')
 
230
            builder.build_snapshot, 'B-id', None, [('weirdo', ('foo',))])
256
231
        self.assertEqual('Unknown build action: "weirdo"', str(e))
257
232
 
258
233
    def test_rename(self):
259
234
        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)
 
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)
265
240
 
266
241
    def test_rename_into_subdir(self):
267
242
        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)
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)
 
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)
288
250
 
289
251
    def test_set_parent(self):
290
252
        builder = self.build_a_rev()
291
253
        builder.start_series()
292
254
        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')
 
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'))])
299
259
        # We should now have a graph:
300
260
        #   A
301
261
        #   |\
302
262
        #   C B
303
263
        # And not A => B => C
304
264
        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'))
 
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'))
312
272
 
313
273
        # 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'))
 
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'))
321
281
 
322
282
    def test_set_merge_parent(self):
323
283
        builder = self.build_a_rev()
324
284
        builder.start_series()
325
285
        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')
 
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'], [])
333
291
        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')
 
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')
338
296
        # Note: by default a merge node does *not* pull in the changes from the
339
297
        #       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)
 
298
        self.assertTreeShape([(u'', 'a-root-id', 'directory'),
 
299
                              (u'a', 'a-id', 'file'),
 
300
                              (u'b', 'b-id', 'file'),
 
301
                             ], d_tree)
344
302
 
345
303
    def test_set_merge_parent_and_contents(self):
346
304
        builder = self.build_a_rev()
347
305
        builder.start_series()
348
306
        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')
 
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'))])
358
313
        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)
 
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)
368
323
        # Because we copied the exact text into *this* tree, the 'c' file
369
324
        # should look like it was not modified in the merge
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']))
 
325
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
386
326
 
387
327
    def test_start_finish_series(self):
388
328
        builder = BranchBuilder(self.get_transport().clone('foo'))
400
340
        builder = BranchBuilder(self.get_transport().clone('foo'))
401
341
        builder.start_series()
402
342
        try:
403
 
            builder.build_snapshot([b'ghost'],
404
 
                                   [('add', ('', b'ROOT_ID', 'directory', ''))],
405
 
                                   allow_leftmost_as_ghost=True, revision_id=b'tip')
 
343
            builder.build_snapshot('tip', ['ghost'],
 
344
                [('add', ('', 'ROOT_ID', 'directory', ''))],
 
345
                allow_leftmost_as_ghost=True)
406
346
        finally:
407
347
            builder.finish_series()
408
348
        b = builder.get_branch()
409
349
        b.lock_read()
410
350
        self.addCleanup(b.unlock)
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)
 
351
        self.assertEqual(('ghost',),
 
352
            b.repository.get_graph().get_parent_map(['tip'])['tip'])