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

  • Committer: Aaron Bentley
  • Date: 2008-10-27 12:00:10 UTC
  • mfrom: (0.15.42 unshelve)
  • mto: (0.16.87 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081027120010-fpa14fhqw1fhjg8u
Merge unshelve into shelf-manager

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
 
1
# Copyright (C) 2008 Canonical Ltd
 
2
#
 
3
#    This program is free software; you can redistribute it and/or modify
 
4
#    it under the terms of the GNU General Public License as published by
 
5
#    the Free Software Foundation; either version 2 of the License, or
 
6
#    (at your option) any later version.
 
7
#
 
8
#    This program is distributed in the hope that it will be useful,
 
9
#    but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
#    GNU General Public License for more details.
 
12
#
 
13
#    You should have received a copy of the GNU General Public License
 
14
#    along with this program; if not, write to the Free Software
 
15
#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
import os
 
18
 
 
19
from bzrlib import errors, pack, shelf, tests, transform
 
20
 
 
21
 
 
22
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
 
23
               "B23\n"
 
24
               "metadata\n\n"
 
25
               "d11:revision_id5:null:e"
 
26
               "B159\n"
 
27
               "attribs\n\n"
 
28
               "d10:_id_numberi0e18:_new_executabilityde7:_new_idde"
 
29
               "9:_new_namede11:_new_parentde16:_non_present_idsde"
 
30
               "17:_removed_contentsle11:_removed_idle14:_tree_path_idsdeeE")
 
31
 
 
32
 
 
33
class TestPrepareShelf(tests.TestCaseWithTransport):
 
34
 
 
35
    def test_shelve_rename(self):
 
36
        tree = self.make_branch_and_tree('.')
 
37
        self.build_tree(['foo'])
 
38
        tree.add(['foo'], ['foo-id'])
 
39
        tree.commit('foo')
 
40
        tree.rename_one('foo', 'bar')
 
41
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
42
        self.addCleanup(creator.finalize)
 
43
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
 
44
                          list(creator.iter_shelvable()))
 
45
        creator.shelve_rename('foo-id')
 
46
        work_trans_id = creator.work_transform.trans_id_file_id('foo-id')
 
47
        self.assertEqual('foo', creator.work_transform.final_name(
 
48
                         work_trans_id))
 
49
        shelf_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
50
        self.assertEqual('bar', creator.shelf_transform.final_name(
 
51
                         shelf_trans_id))
 
52
 
 
53
    def test_shelve_move(self):
 
54
        tree = self.make_branch_and_tree('.')
 
55
        self.build_tree(['foo/', 'bar/', 'foo/baz'])
 
56
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
 
57
        tree.commit('foo')
 
58
        tree.rename_one('foo/baz', 'bar/baz')
 
59
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
60
        self.addCleanup(creator.finalize)
 
61
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
 
62
                         list(creator.iter_shelvable()))
 
63
        creator.shelve_rename('baz-id')
 
64
        work_trans_id = creator.work_transform.trans_id_file_id('baz-id')
 
65
        work_foo = creator.work_transform.trans_id_file_id('foo-id')
 
66
        self.assertEqual(work_foo, creator.work_transform.final_parent(
 
67
                         work_trans_id))
 
68
        shelf_trans_id = creator.shelf_transform.trans_id_file_id('baz-id')
 
69
        shelf_bar = creator.shelf_transform.trans_id_file_id('bar-id')
 
70
        self.assertEqual(shelf_bar, creator.shelf_transform.final_parent(
 
71
                         shelf_trans_id))
 
72
        creator.transform()
 
73
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
 
74
 
 
75
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
 
76
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
 
77
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
 
78
        self.assertFileEqual(expected_content, shelf_file)
 
79
 
 
80
    def test_shelve_content_change(self):
 
81
        tree = self.make_branch_and_tree('.')
 
82
        tree.lock_write()
 
83
        self.addCleanup(tree.unlock)
 
84
        self.build_tree_contents([('foo', 'a\n')])
 
85
        tree.add('foo', 'foo-id')
 
86
        tree.commit('Committed foo')
 
87
        self.build_tree_contents([('foo', 'b\na\nc\n')])
 
88
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
89
        self.addCleanup(creator.finalize)
 
90
        self.assertEqual([('modify text', 'foo-id')],
 
91
                         list(creator.iter_shelvable()))
 
92
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
 
93
        creator.transform()
 
94
        self.assertFileEqual('a\nc\n', 'foo')
 
95
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
 
96
 
 
97
    def test_shelve_creation(self):
 
98
        tree = self.make_branch_and_tree('.')
 
99
        tree.lock_write()
 
100
        self.addCleanup(tree.unlock)
 
101
        tree.commit('Empty tree')
 
102
        self.build_tree_contents([('foo', 'a\n'), ('bar/',)])
 
103
        tree.add(['foo', 'bar'], ['foo-id', 'bar-id'])
 
104
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
105
        self.addCleanup(creator.finalize)
 
106
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
 
107
                          ('add file', 'foo-id', 'file', 'foo')],
 
108
                          sorted(list(creator.iter_shelvable())))
 
109
        creator.shelve_creation('foo-id')
 
110
        creator.shelve_creation('bar-id')
 
111
        creator.transform()
 
112
        self.assertRaises(StopIteration,
 
113
                          tree.iter_entries_by_dir(['foo-id']).next)
 
114
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
115
        self.assertEqual('foo-id',
 
116
                         creator.shelf_transform.final_file_id(s_trans_id))
 
117
        self.failIfExists('foo')
 
118
        self.failIfExists('bar')
 
119
        self.assertShelvedFileEqual('a\n', creator, 'foo-id')
 
120
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id('bar-id')
 
121
        self.assertEqual('directory',
 
122
            creator.shelf_transform.final_kind(s_bar_trans_id))
 
123
 
 
124
    def test_shelve_symlink_creation(self):
 
125
        self.requireFeature(tests.SymlinkFeature)
 
126
        tree = self.make_branch_and_tree('.')
 
127
        tree.lock_write()
 
128
        self.addCleanup(tree.unlock)
 
129
        tree.commit('Empty tree')
 
130
        os.symlink('bar', 'foo')
 
131
        tree.add('foo', 'foo-id')
 
132
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
133
        self.addCleanup(creator.finalize)
 
134
        self.assertEqual([('add file', 'foo-id', 'symlink', 'foo')],
 
135
                         list(creator.iter_shelvable()))
 
136
        creator.shelve_creation('foo-id')
 
137
        creator.transform()
 
138
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
139
        self.failIfExists('foo')
 
140
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
 
141
        self.assertEqual('bar', os.readlink(limbo_name))
 
142
 
 
143
    def test_shelve_creation_no_contents(self):
 
144
        tree = self.make_branch_and_tree('.')
 
145
        tree.lock_write()
 
146
        self.addCleanup(tree.unlock)
 
147
        tree.commit('Empty tree')
 
148
        self.build_tree(['foo'])
 
149
        tree.add('foo', 'foo-id')
 
150
        os.unlink('foo')
 
151
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
152
        self.addCleanup(creator.finalize)
 
153
        self.assertEqual([('add file', 'foo-id', None, 'foo')],
 
154
                         sorted(list(creator.iter_shelvable())))
 
155
        creator.shelve_creation('foo-id')
 
156
        creator.transform()
 
157
        self.assertRaises(StopIteration,
 
158
                          tree.iter_entries_by_dir(['foo-id']).next)
 
159
        self.assertShelvedFileEqual('', creator, 'foo-id')
 
160
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
161
        self.assertEqual('foo-id',
 
162
                         creator.shelf_transform.final_file_id(s_trans_id))
 
163
        self.failIfExists('foo')
 
164
 
 
165
    def test_shelve_deletion(self):
 
166
        tree = self.make_branch_and_tree('tree')
 
167
        tree.lock_write()
 
168
        self.addCleanup(tree.unlock)
 
169
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
 
170
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
 
171
        tree.commit('Added file and directory')
 
172
        tree.unversion(['foo-id', 'bar-id'])
 
173
        os.unlink('tree/foo/bar')
 
174
        os.rmdir('tree/foo')
 
175
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
176
        self.addCleanup(creator.finalize)
 
177
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
 
178
                          ('delete file', 'foo-id', 'directory', 'foo')],
 
179
                          sorted(list(creator.iter_shelvable())))
 
180
        creator.shelve_deletion('foo-id')
 
181
        creator.shelve_deletion('bar-id')
 
182
        creator.transform()
 
183
        self.assertTrue('foo-id' in tree)
 
184
        self.assertTrue('bar-id' in tree)
 
185
        self.assertFileEqual('baz', 'tree/foo/bar')
 
186
 
 
187
    def test_shelve_delete_contents(self):
 
188
        tree = self.make_branch_and_tree('tree')
 
189
        self.build_tree(['tree/foo',])
 
190
        tree.add('foo', 'foo-id')
 
191
        tree.commit('Added file and directory')
 
192
        os.unlink('tree/foo')
 
193
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
194
        self.addCleanup(creator.finalize)
 
195
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
196
                         sorted(list(creator.iter_shelvable())))
 
197
        creator.shelve_deletion('foo-id')
 
198
        creator.transform()
 
199
        self.failUnlessExists('tree/foo')
 
200
 
 
201
    def test_shelve_change_kind(self):
 
202
        tree = self.make_branch_and_tree('tree')
 
203
        self.build_tree_contents([('tree/foo', 'bar')])
 
204
        tree.add('foo', 'foo-id')
 
205
        tree.commit('Added file and directory')
 
206
        os.unlink('tree/foo')
 
207
        os.mkdir('tree/foo')
 
208
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
209
        self.addCleanup(creator.finalize)
 
210
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
 
211
                           'foo')], sorted(list(creator.iter_shelvable())))
 
212
        creator.shelve_content_change('foo-id')
 
213
        creator.transform()
 
214
        self.assertFileEqual('bar', 'tree/foo')
 
215
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
216
        self.assertEqual('directory',
 
217
                         creator.shelf_transform._new_contents[s_trans_id])
 
218
 
 
219
    def test_shelve_unversion(self):
 
220
        tree = self.make_branch_and_tree('tree')
 
221
        self.build_tree(['tree/foo',])
 
222
        tree.add('foo', 'foo-id')
 
223
        tree.commit('Added file and directory')
 
224
        tree.unversion(['foo-id'])
 
225
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
226
        self.addCleanup(creator.finalize)
 
227
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
228
                         sorted(list(creator.iter_shelvable())))
 
229
        creator.shelve_deletion('foo-id')
 
230
        creator.transform()
 
231
        self.failUnlessExists('tree/foo')
 
232
 
 
233
    def test_shelve_serialization(self):
 
234
        tree = self.make_branch_and_tree('.')
 
235
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
236
        self.addCleanup(creator.finalize)
 
237
        filename = creator.write_shelf()
 
238
        self.assertFileEqual(EMPTY_SHELF, filename)
 
239
 
 
240
    def test_write_shelf(self):
 
241
        tree = self.make_branch_and_tree('tree')
 
242
        self.build_tree(['tree/foo'])
 
243
        tree.add('foo', 'foo-id')
 
244
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
245
        self.addCleanup(creator.finalize)
 
246
        list(creator.iter_shelvable())
 
247
        creator.shelve_creation('foo-id')
 
248
        shelf_file = open('shelf', 'wb')
 
249
        try:
 
250
            creator.write_shelf(shelf_file)
 
251
        finally:
 
252
            shelf_file.close()
 
253
        parser = pack.ContainerPushParser()
 
254
        shelf_file = open('shelf', 'rb')
 
255
        try:
 
256
            parser.accept_bytes(shelf_file.read())
 
257
        finally:
 
258
            shelf_file.close()
 
259
        tt = transform.TransformPreview(tree)
 
260
        self.addCleanup(tt.finalize)
 
261
        records = iter(parser.read_pending_records())
 
262
        #skip revision-id
 
263
        records.next()
 
264
        tt.deserialize(records)
 
265
 
 
266
 
 
267
class TestUnshelver(tests.TestCaseWithTransport):
 
268
 
 
269
    def test_make_merger(self):
 
270
        tree = self.make_branch_and_tree('tree')
 
271
        tree.commit('first commit')
 
272
        self.build_tree_contents([('tree/foo', 'bar')])
 
273
        tree.lock_write()
 
274
        self.addCleanup(tree.unlock)
 
275
        tree.add('foo', 'foo-id')
 
276
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
277
        self.addCleanup(creator.finalize)
 
278
        list(creator.iter_shelvable())
 
279
        creator.shelve_creation('foo-id')
 
280
        shelf_file = open('shelf-file', 'w+b')
 
281
        try:
 
282
            creator.write_shelf(shelf_file)
 
283
            creator.transform()
 
284
            shelf_file.seek(0)
 
285
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
286
            unshelver.make_merger().do_merge()
 
287
            self.assertFileEqual('bar', 'tree/foo')
 
288
        finally:
 
289
            shelf_file.close()
 
290
 
 
291
    def test_unshelve_changed(self):
 
292
        tree = self.make_branch_and_tree('tree')
 
293
        tree.lock_write()
 
294
        self.addCleanup(tree.unlock)
 
295
        self.build_tree_contents([('tree/foo', 'a\nb\nc\n')])
 
296
        tree.add('foo', 'foo-id')
 
297
        tree.commit('first commit')
 
298
        self.build_tree_contents([('tree/foo', 'a\nb\nd\n')])
 
299
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
300
        self.addCleanup(creator.finalize)
 
301
        list(creator.iter_shelvable())
 
302
        creator.shelve_lines('foo-id', ['a\n', 'b\n', 'c\n'])
 
303
        shelf_file = open('shelf', 'w+b')
 
304
        self.addCleanup(shelf_file.close)
 
305
        creator.write_shelf(shelf_file)
 
306
        creator.transform()
 
307
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
 
308
        shelf_file.seek(0)
 
309
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
310
        unshelver.make_merger().do_merge()
 
311
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
 
312
 
 
313
    def test_unshelve_base(self):
 
314
        tree = self.make_branch_and_tree('tree')
 
315
        tree.lock_write()
 
316
        self.addCleanup(tree.unlock)
 
317
        tree.commit('rev1', rev_id='rev1')
 
318
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
319
        self.addCleanup(creator.finalize)
 
320
        manager = tree.get_shelf_manager()
 
321
        shelf_id, shelf_file = manager.new_shelf()
 
322
        try:
 
323
            creator.write_shelf(shelf_file)
 
324
        finally:
 
325
            shelf_file.close()
 
326
        tree.commit('rev2', rev_id='rev2')
 
327
        shelf_file = manager.read_shelf(1)
 
328
        self.addCleanup(shelf_file.close)
 
329
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
330
        self.addCleanup(unshelver.finalize)
 
331
        self.assertEqual('rev1', unshelver.base_tree.get_revision_id())
 
332
 
 
333
    def test_unshelve_serialization(self):
 
334
        tree = self.make_branch_and_tree('.')
 
335
        self.build_tree_contents([('shelf', EMPTY_SHELF)])
 
336
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, 'shelf')
 
337
 
 
338
    def test_corrupt_shelf(self):
 
339
        tree = self.make_branch_and_tree('.')
 
340
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace('metadata',
 
341
                                                                'foo'))])
 
342
        e = self.assertRaises(errors.ShelfCorrupt,
 
343
                              shelf.Unshelver.from_tree_and_shelf, tree,
 
344
                              'shelf')
 
345
        self.assertEqual('Shelf corrupt.', str(e))
 
346
 
 
347
 
 
348
class TestShelfManager(tests.TestCaseWithTransport):
 
349
 
 
350
    def test_get_shelf_manager(self):
 
351
        tree = self.make_branch_and_tree('.')
 
352
        manager = tree.get_shelf_manager()
 
353
        self.assertEqual(tree._transport.base + 'shelf/',
 
354
                         manager.transport.base)
 
355
 
 
356
    def get_manager(self):
 
357
        return self.make_branch_and_tree('.').get_shelf_manager()
 
358
 
 
359
    def test_new_shelf(self):
 
360
        manager = self.get_manager()
 
361
        shelf_id, shelf_file = manager.new_shelf()
 
362
        shelf_file.close()
 
363
        self.assertEqual(1, shelf_id)
 
364
        shelf_id, shelf_file = manager.new_shelf()
 
365
        shelf_file.close()
 
366
        self.assertEqual(2, shelf_id)
 
367
        manager.delete_shelf(1)
 
368
        shelf_id, shelf_file = manager.new_shelf()
 
369
        shelf_file.close()
 
370
        self.assertEqual(3, shelf_id)
 
371
 
 
372
    def test_active_shelves(self):
 
373
        manager = self.get_manager()
 
374
        self.assertEqual([], manager.active_shelves())
 
375
        shelf_id, shelf_file = manager.new_shelf()
 
376
        shelf_file.close()
 
377
        self.assertEqual([1], manager.active_shelves())
 
378
 
 
379
    def test_delete_shelf(self):
 
380
        manager = self.get_manager()
 
381
        shelf_id, shelf_file = manager.new_shelf()
 
382
        shelf_file.close()
 
383
        self.assertEqual([1], manager.active_shelves())
 
384
        manager.delete_shelf(1)
 
385
        self.assertEqual([], manager.active_shelves())
 
386
 
 
387
    def test_last_shelf(self):
 
388
        manager = self.get_manager()
 
389
        self.assertIs(None, manager.last_shelf())
 
390
        shelf_id, shelf_file = manager.new_shelf()
 
391
        shelf_file.close()
 
392
        self.assertEqual(1, manager.last_shelf())
 
393
 
 
394
    def test_read_shelf(self):
 
395
        manager = self.get_manager()
 
396
        shelf_id, shelf_file = manager.new_shelf()
 
397
        try:
 
398
            shelf_file.write('foo')
 
399
        finally:
 
400
            shelf_file.close()
 
401
        shelf_id, shelf_file = manager.new_shelf()
 
402
        try:
 
403
            shelf_file.write('bar')
 
404
        finally:
 
405
            shelf_file.close()
 
406
        shelf_file = manager.read_shelf(1)
 
407
        try:
 
408
            self.assertEqual('foo', shelf_file.read())
 
409
        finally:
 
410
            shelf_file.close()
 
411
        shelf_file = manager.read_shelf(2)
 
412
        try:
 
413
            self.assertEqual('bar', shelf_file.read())
 
414
        finally:
 
415
            shelf_file.close()
 
416
 
 
417
    def test_read_non_existant(self):
 
418
        manager = self.get_manager()
 
419
        e = self.assertRaises(errors.NoSuchShelfId, manager.read_shelf, 1)
 
420
        self.assertEqual('No changes are shelved with id "1".', str(e))
 
421
 
 
422
    def test_shelve_changes(self):
 
423
        tree = self.make_branch_and_tree('tree')
 
424
        tree.commit('no-change commit')
 
425
        tree.lock_write()
 
426
        self.addCleanup(tree.unlock)
 
427
        self.build_tree_contents([('tree/foo', 'bar')])
 
428
        self.assertFileEqual('bar', 'tree/foo')
 
429
        tree.add('foo', 'foo-id')
 
430
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
431
        self.addCleanup(creator.finalize)
 
432
        list(creator.iter_shelvable())
 
433
        creator.shelve_creation('foo-id')
 
434
        shelf_manager = tree.get_shelf_manager()
 
435
        shelf_id = shelf_manager.shelve_changes(creator)
 
436
        self.failIfExists('tree/foo')
 
437
        unshelver = shelf_manager.get_unshelver(shelf_id)
 
438
        unshelver.make_merger().do_merge()
 
439
        self.assertFileEqual('bar', 'tree/foo')