/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: Andrew Bennetts
  • Date: 2010-01-12 03:53:21 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4964.
  • Revision ID: andrew.bennetts@canonical.com-20100112035321-hofpz5p10224ryj3
Merge lp:bzr, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import errors, pack, shelf, tests, transform
 
19
from bzrlib import (
 
20
    errors,
 
21
    osutils,
 
22
    pack,
 
23
    shelf,
 
24
    tests,
 
25
    transform,
 
26
    workingtree,
 
27
    )
20
28
 
21
29
 
22
30
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
32
40
 
33
41
class TestPrepareShelf(tests.TestCaseWithTransport):
34
42
 
35
 
    def test_shelve_rename(self):
 
43
    def prepare_shelve_rename(self):
36
44
        tree = self.make_branch_and_tree('.')
37
45
        self.build_tree(['foo'])
38
46
        tree.add(['foo'], ['foo-id'])
39
47
        tree.commit('foo')
40
48
        tree.rename_one('foo', 'bar')
 
49
        tree.lock_tree_write()
 
50
        self.addCleanup(tree.unlock)
41
51
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
42
52
        self.addCleanup(creator.finalize)
43
53
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
44
54
                          list(creator.iter_shelvable()))
45
 
        creator.shelve_rename('foo-id')
 
55
        return creator
 
56
 
 
57
    def check_shelve_rename(self, creator):
46
58
        work_trans_id = creator.work_transform.trans_id_file_id('foo-id')
47
59
        self.assertEqual('foo', creator.work_transform.final_name(
48
60
                         work_trans_id))
50
62
        self.assertEqual('bar', creator.shelf_transform.final_name(
51
63
                         shelf_trans_id))
52
64
 
53
 
    def test_shelve_move(self):
 
65
    def test_shelve_rename(self):
 
66
        creator = self.prepare_shelve_rename()
 
67
        creator.shelve_rename('foo-id')
 
68
        self.check_shelve_rename(creator)
 
69
 
 
70
    def test_shelve_change_handles_rename(self):
 
71
        creator = self.prepare_shelve_rename()
 
72
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
 
73
        self.check_shelve_rename(creator)
 
74
 
 
75
    def prepare_shelve_move(self):
54
76
        tree = self.make_branch_and_tree('.')
55
77
        self.build_tree(['foo/', 'bar/', 'foo/baz'])
56
78
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
57
79
        tree.commit('foo')
58
80
        tree.rename_one('foo/baz', 'bar/baz')
 
81
        tree.lock_tree_write()
 
82
        self.addCleanup(tree.unlock)
59
83
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
60
84
        self.addCleanup(creator.finalize)
61
85
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
62
86
                         list(creator.iter_shelvable()))
63
 
        creator.shelve_rename('baz-id')
 
87
        return creator, tree
 
88
 
 
89
    def check_shelve_move(self, creator, tree):
64
90
        work_trans_id = creator.work_transform.trans_id_file_id('baz-id')
65
91
        work_foo = creator.work_transform.trans_id_file_id('foo-id')
66
92
        self.assertEqual(work_foo, creator.work_transform.final_parent(
72
98
        creator.transform()
73
99
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
74
100
 
 
101
    def test_shelve_move(self):
 
102
        creator, tree = self.prepare_shelve_move()
 
103
        creator.shelve_rename('baz-id')
 
104
        self.check_shelve_move(creator, tree)
 
105
 
 
106
    def test_shelve_change_handles_move(self):
 
107
        creator, tree = self.prepare_shelve_move()
 
108
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
 
109
        self.check_shelve_move(creator, tree)
 
110
 
75
111
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
76
112
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
77
113
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
78
114
        self.assertFileEqual(expected_content, shelf_file)
79
115
 
80
 
    def test_shelve_content_change(self):
 
116
    def prepare_content_change(self):
81
117
        tree = self.make_branch_and_tree('.')
82
118
        tree.lock_write()
83
119
        self.addCleanup(tree.unlock)
87
123
        self.build_tree_contents([('foo', 'b\na\nc\n')])
88
124
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
89
125
        self.addCleanup(creator.finalize)
 
126
        return creator
 
127
 
 
128
    def test_shelve_content_change(self):
 
129
        creator = self.prepare_content_change()
90
130
        self.assertEqual([('modify text', 'foo-id')],
91
131
                         list(creator.iter_shelvable()))
92
132
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
94
134
        self.assertFileEqual('a\nc\n', 'foo')
95
135
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
96
136
 
97
 
    def test_shelve_creation(self):
 
137
    def test_shelve_change_handles_modify_text(self):
 
138
        creator = self.prepare_content_change()
 
139
        creator.shelve_change(('modify text', 'foo-id'))
 
140
        creator.transform()
 
141
        self.assertFileEqual('a\n', 'foo')
 
142
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
143
 
 
144
    def test_shelve_all(self):
 
145
        creator = self.prepare_content_change()
 
146
        creator.shelve_all()
 
147
        creator.transform()
 
148
        self.assertFileEqual('a\n', 'foo')
 
149
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
 
150
 
 
151
    def prepare_shelve_creation(self):
98
152
        tree = self.make_branch_and_tree('.')
99
153
        tree.lock_write()
100
154
        self.addCleanup(tree.unlock)
106
160
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
107
161
                          ('add file', 'foo-id', 'file', 'foo')],
108
162
                          sorted(list(creator.iter_shelvable())))
109
 
        creator.shelve_creation('foo-id')
110
 
        creator.shelve_creation('bar-id')
111
 
        creator.transform()
 
163
        return creator, tree
 
164
 
 
165
    def check_shelve_creation(self, creator, tree):
112
166
        self.assertRaises(StopIteration,
113
167
                          tree.iter_entries_by_dir(['foo-id']).next)
114
168
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
121
175
        self.assertEqual('directory',
122
176
            creator.shelf_transform.final_kind(s_bar_trans_id))
123
177
 
 
178
    def test_shelve_creation(self):
 
179
        creator, tree = self.prepare_shelve_creation()
 
180
        creator.shelve_creation('foo-id')
 
181
        creator.shelve_creation('bar-id')
 
182
        creator.transform()
 
183
        self.check_shelve_creation(creator, tree)
 
184
 
 
185
    def test_shelve_change_handles_creation(self):
 
186
        creator, tree = self.prepare_shelve_creation()
 
187
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
 
188
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
 
189
        creator.transform()
 
190
        self.check_shelve_creation(creator, tree)
 
191
 
 
192
    def _test_shelve_symlink_creation(self, link_name, link_target,
 
193
                                      shelve_change=False):
 
194
        self.requireFeature(tests.SymlinkFeature)
 
195
        tree = self.make_branch_and_tree('.')
 
196
        tree.lock_write()
 
197
        self.addCleanup(tree.unlock)
 
198
        tree.commit('Empty tree')
 
199
        os.symlink(link_target, link_name)
 
200
        tree.add(link_name, 'foo-id')
 
201
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
202
        self.addCleanup(creator.finalize)
 
203
        self.assertEqual([('add file', 'foo-id', 'symlink', link_name)],
 
204
                         list(creator.iter_shelvable()))
 
205
        if shelve_change:
 
206
            creator.shelve_change(('add file', 'foo-id', 'symlink', link_name))
 
207
        else:
 
208
            creator.shelve_creation('foo-id')
 
209
        creator.transform()
 
210
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
211
        self.failIfExists(link_name)
 
212
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
 
213
        self.assertEqual(link_target, osutils.readlink(limbo_name))
 
214
        ptree = creator.shelf_transform.get_preview_tree()
 
215
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
 
216
 
124
217
    def test_shelve_symlink_creation(self):
 
218
        self._test_shelve_symlink_creation('foo', 'bar')
 
219
 
 
220
    def test_shelve_unicode_symlink_creation(self):
 
221
        self.requireFeature(tests.UnicodeFilenameFeature)
 
222
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
 
223
                                           u'b\N{Euro Sign}ar')
 
224
 
 
225
    def test_shelve_change_handles_symlink_creation(self):
 
226
        self._test_shelve_symlink_creation('foo', 'bar', shelve_change=True)
 
227
 
 
228
    def _test_shelve_symlink_target_change(self, link_name,
 
229
                                           old_target, new_target,
 
230
                                           shelve_change=False):
125
231
        self.requireFeature(tests.SymlinkFeature)
126
232
        tree = self.make_branch_and_tree('.')
127
233
        tree.lock_write()
128
234
        self.addCleanup(tree.unlock)
129
 
        tree.commit('Empty tree')
130
 
        os.symlink('bar', 'foo')
131
 
        tree.add('foo', 'foo-id')
 
235
        os.symlink(old_target, link_name)
 
236
        tree.add(link_name, 'foo-id')
 
237
        tree.commit("commit symlink")
 
238
        os.unlink(link_name)
 
239
        os.symlink(new_target, link_name)
132
240
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
133
241
        self.addCleanup(creator.finalize)
134
 
        self.assertEqual([('add file', 'foo-id', 'symlink', 'foo')],
 
242
        self.assertEqual([('modify target', 'foo-id', link_name,
 
243
                           old_target, new_target)],
135
244
                         list(creator.iter_shelvable()))
136
 
        creator.shelve_creation('foo-id')
 
245
        if shelve_change:
 
246
            creator.shelve_change(('modify target', 'foo-id', link_name,
 
247
                                   old_target, new_target))
 
248
        else:
 
249
            creator.shelve_modify_target('foo-id')
137
250
        creator.transform()
 
251
        self.assertEqual(old_target, osutils.readlink(link_name))
138
252
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
139
 
        self.failIfExists('foo')
140
253
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
141
 
        self.assertEqual('bar', os.readlink(limbo_name))
 
254
        self.assertEqual(new_target, osutils.readlink(limbo_name))
 
255
        ptree = creator.shelf_transform.get_preview_tree()
 
256
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
 
257
 
 
258
    def test_shelve_symlink_target_change(self):
 
259
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
 
260
 
 
261
    def test_shelve_unicode_symlink_target_change(self):
 
262
        self.requireFeature(tests.UnicodeFilenameFeature)
 
263
        self._test_shelve_symlink_target_change(
 
264
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
 
265
 
 
266
    def test_shelve_change_handles_symlink_target_change(self):
 
267
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz',
 
268
                                                shelve_change=True)
142
269
 
143
270
    def test_shelve_creation_no_contents(self):
144
271
        tree = self.make_branch_and_tree('.')
162
289
                         creator.shelf_transform.final_file_id(s_trans_id))
163
290
        self.failIfExists('foo')
164
291
 
165
 
    def test_shelve_deletion(self):
 
292
    def prepare_shelve_deletion(self):
166
293
        tree = self.make_branch_and_tree('tree')
167
294
        tree.lock_write()
168
295
        self.addCleanup(tree.unlock)
177
304
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
178
305
                          ('delete file', 'foo-id', 'directory', 'foo')],
179
306
                          sorted(list(creator.iter_shelvable())))
180
 
        creator.shelve_deletion('foo-id')
181
 
        creator.shelve_deletion('bar-id')
182
 
        creator.transform()
 
307
        return creator, tree
 
308
 
 
309
    def check_shelve_deletion(self, tree):
183
310
        self.assertTrue('foo-id' in tree)
184
311
        self.assertTrue('bar-id' in tree)
185
312
        self.assertFileEqual('baz', 'tree/foo/bar')
186
313
 
 
314
    def test_shelve_deletion(self):
 
315
        creator, tree = self.prepare_shelve_deletion()
 
316
        creator.shelve_deletion('foo-id')
 
317
        creator.shelve_deletion('bar-id')
 
318
        creator.transform()
 
319
        self.check_shelve_deletion(tree)
 
320
 
 
321
    def test_shelve_change_handles_deletion(self):
 
322
        creator, tree = self.prepare_shelve_deletion()
 
323
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
 
324
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
 
325
        creator.transform()
 
326
        self.check_shelve_deletion(tree)
 
327
 
187
328
    def test_shelve_delete_contents(self):
188
329
        tree = self.make_branch_and_tree('tree')
189
330
        self.build_tree(['tree/foo',])
190
331
        tree.add('foo', 'foo-id')
191
332
        tree.commit('Added file and directory')
192
333
        os.unlink('tree/foo')
 
334
        tree.lock_tree_write()
 
335
        self.addCleanup(tree.unlock)
193
336
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
194
337
        self.addCleanup(creator.finalize)
195
338
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
198
341
        creator.transform()
199
342
        self.failUnlessExists('tree/foo')
200
343
 
201
 
    def test_shelve_change_kind(self):
 
344
    def prepare_shelve_change_kind(self):
202
345
        tree = self.make_branch_and_tree('tree')
203
346
        self.build_tree_contents([('tree/foo', 'bar')])
204
347
        tree.add('foo', 'foo-id')
205
348
        tree.commit('Added file and directory')
206
349
        os.unlink('tree/foo')
207
350
        os.mkdir('tree/foo')
 
351
        tree.lock_tree_write()
 
352
        self.addCleanup(tree.unlock)
208
353
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
209
354
        self.addCleanup(creator.finalize)
210
355
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
211
356
                           'foo')], sorted(list(creator.iter_shelvable())))
 
357
        return creator
 
358
 
 
359
    def check_shelve_change_kind(self, creator):
 
360
        self.assertFileEqual('bar', 'tree/foo')
 
361
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
362
        self.assertEqual('directory',
 
363
                         creator.shelf_transform._new_contents[s_trans_id])
 
364
 
 
365
    def test_shelve_change_kind(self):
 
366
        creator = self.prepare_shelve_change_kind()
212
367
        creator.shelve_content_change('foo-id')
213
368
        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])
 
369
        self.check_shelve_change_kind(creator)
 
370
 
 
371
    def test_shelve_change_handles_change_kind(self):
 
372
        creator = self.prepare_shelve_change_kind()
 
373
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
 
374
                               'foo'))
 
375
        creator.transform()
 
376
        self.check_shelve_change_kind(creator)
 
377
 
 
378
    def test_shelve_change_unknown_change(self):
 
379
        tree = self.make_branch_and_tree('tree')
 
380
        tree.lock_tree_write()
 
381
        self.addCleanup(tree.unlock)
 
382
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
383
        self.addCleanup(creator.finalize)
 
384
        e = self.assertRaises(ValueError, creator.shelve_change, ('unknown',))
 
385
        self.assertEqual('Unknown change kind: "unknown"', str(e))
218
386
 
219
387
    def test_shelve_unversion(self):
220
388
        tree = self.make_branch_and_tree('tree')
222
390
        tree.add('foo', 'foo-id')
223
391
        tree.commit('Added file and directory')
224
392
        tree.unversion(['foo-id'])
 
393
        tree.lock_tree_write()
 
394
        self.addCleanup(tree.unlock)
225
395
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
226
396
        self.addCleanup(creator.finalize)
227
397
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
232
402
 
233
403
    def test_shelve_serialization(self):
234
404
        tree = self.make_branch_and_tree('.')
 
405
        tree.lock_tree_write()
 
406
        self.addCleanup(tree.unlock)
235
407
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
236
408
        self.addCleanup(creator.finalize)
237
409
        shelf_file = open('shelf', 'wb')
246
418
        tree = self.make_branch_and_tree('tree')
247
419
        self.build_tree(['tree/foo'])
248
420
        tree.add('foo', 'foo-id')
 
421
        tree.lock_tree_write()
 
422
        self.addCleanup(tree.unlock)
249
423
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
250
424
        self.addCleanup(creator.finalize)
251
425
        list(creator.iter_shelvable())
268
442
        records.next()
269
443
        tt.deserialize(records)
270
444
 
 
445
    def test_shelve_unversioned(self):
 
446
        tree = self.make_branch_and_tree('tree')
 
447
        tree.lock_tree_write()
 
448
        try:
 
449
            self.assertRaises(errors.PathsNotVersionedError,
 
450
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
 
451
        finally:
 
452
            tree.unlock()
 
453
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
 
454
        # after itself.
 
455
        wt = workingtree.WorkingTree.open('tree')
 
456
        wt.lock_tree_write()
 
457
        wt.unlock()
 
458
        # And a second tentative should raise the same error (no
 
459
        # limbo/pending_deletion leftovers).
 
460
        tree.lock_tree_write()
 
461
        try:
 
462
            self.assertRaises(errors.PathsNotVersionedError,
 
463
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
 
464
        finally:
 
465
            tree.unlock()
 
466
 
 
467
    def test_shelve_skips_added_root(self):
 
468
        """Skip adds of the root when iterating through shelvable changes."""
 
469
        tree = self.make_branch_and_tree('tree')
 
470
        tree.lock_tree_write()
 
471
        self.addCleanup(tree.unlock)
 
472
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
473
        self.addCleanup(creator.finalize)
 
474
        self.assertEqual([], list(creator.iter_shelvable()))
 
475
 
 
476
    def test_shelve_skips_added_root(self):
 
477
        """Skip adds of the root when iterating through shelvable changes."""
 
478
        tree = self.make_branch_and_tree('tree')
 
479
        tree.lock_tree_write()
 
480
        self.addCleanup(tree.unlock)
 
481
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
482
        self.addCleanup(creator.finalize)
 
483
        self.assertEqual([], list(creator.iter_shelvable()))
 
484
 
271
485
 
272
486
class TestUnshelver(tests.TestCaseWithTransport):
273
487
 
289
503
            shelf_file.seek(0)
290
504
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
291
505
            unshelver.make_merger().do_merge()
 
506
            self.addCleanup(unshelver.finalize)
292
507
            self.assertFileEqual('bar', 'tree/foo')
293
508
        finally:
294
509
            shelf_file.close()
312
527
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
313
528
        shelf_file.seek(0)
314
529
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
530
        self.addCleanup(unshelver.finalize)
315
531
        unshelver.make_merger().do_merge()
316
532
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
317
533
 
340
556
        self.assertFileEqual('baz', 'tree/foo/bar')
341
557
        shelf_file.seek(0)
342
558
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
559
        self.addCleanup(unshelver.finalize)
343
560
        unshelver.make_merger().do_merge()
344
561
        self.assertFalse('foo-id' in tree)
345
562
        self.assertFalse('bar-id' in tree)
370
587
        shelf_file = open('shelf', 'rb')
371
588
        self.addCleanup(shelf_file.close)
372
589
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
590
        unshelver.finalize()
373
591
 
374
592
    def test_corrupt_shelf(self):
375
593
        tree = self.make_branch_and_tree('.')
484
702
        shelf_id = shelf_manager.shelve_changes(creator)
485
703
        self.failIfExists('tree/foo')
486
704
        unshelver = shelf_manager.get_unshelver(shelf_id)
 
705
        self.addCleanup(unshelver.finalize)
487
706
        unshelver.make_merger().do_merge()
488
707
        self.assertFileEqual('bar', 'tree/foo')
489
708
 
490
709
    def test_get_metadata(self):
491
710
        tree = self.make_branch_and_tree('.')
 
711
        tree.lock_tree_write()
 
712
        self.addCleanup(tree.unlock)
492
713
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
714
        self.addCleanup(creator.finalize)
493
715
        shelf_manager = tree.get_shelf_manager()
494
716
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
495
717
        metadata = shelf_manager.get_metadata(shelf_id)