/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: 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_shelf.py
1
 
# Copyright (C) 2008-2011 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 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
import os
18
18
 
19
 
from .. import (
 
19
from bzrlib import (
20
20
    errors,
21
 
    ignores,
22
21
    osutils,
 
22
    pack,
23
23
    shelf,
24
24
    tests,
25
25
    transform,
26
26
    workingtree,
27
27
    )
28
 
from ..bzr import (
29
 
    pack,
30
 
    )
31
 
from . import (
32
 
    features,
33
 
    KnownFailure,
34
 
    )
35
 
 
36
 
 
37
 
EMPTY_SHELF = (b"Bazaar pack format 1 (introduced in 0.18)\n"
38
 
               b"B23\n"
39
 
               b"metadata\n\n"
40
 
               b"d11:revision_id5:null:e"
41
 
               b"B159\n"
42
 
               b"attribs\n\n"
43
 
               b"d10:_id_numberi0e18:_new_executabilityde7:_new_idde"
44
 
               b"9:_new_namede11:_new_parentde16:_non_present_idsde"
45
 
               b"17:_removed_contentsle11:_removed_idle14:_tree_path_idsdeeE")
46
 
 
47
 
 
48
 
class TestErrors(tests.TestCase):
49
 
 
50
 
    def test_invalid_shelf_id(self):
51
 
        invalid_id = "foo"
52
 
        err = shelf.InvalidShelfId(invalid_id)
53
 
        self.assertEqual('"foo" is not a valid shelf id, '
54
 
                         'try a number instead.', str(err))
 
28
 
 
29
 
 
30
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
 
31
               "B23\n"
 
32
               "metadata\n\n"
 
33
               "d11:revision_id5:null:e"
 
34
               "B159\n"
 
35
               "attribs\n\n"
 
36
               "d10:_id_numberi0e18:_new_executabilityde7:_new_idde"
 
37
               "9:_new_namede11:_new_parentde16:_non_present_idsde"
 
38
               "17:_removed_contentsle11:_removed_idle14:_tree_path_idsdeeE")
55
39
 
56
40
 
57
41
class TestPrepareShelf(tests.TestCaseWithTransport):
59
43
    def prepare_shelve_rename(self):
60
44
        tree = self.make_branch_and_tree('.')
61
45
        self.build_tree(['foo'])
62
 
        tree.add(['foo'], [b'foo-id'])
 
46
        tree.add(['foo'], ['foo-id'])
63
47
        tree.commit('foo')
64
48
        tree.rename_one('foo', 'bar')
65
49
        tree.lock_tree_write()
66
50
        self.addCleanup(tree.unlock)
67
51
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
68
52
        self.addCleanup(creator.finalize)
69
 
        self.assertEqual([('rename', b'foo-id', 'foo', 'bar')],
70
 
                         list(creator.iter_shelvable()))
 
53
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
 
54
                          list(creator.iter_shelvable()))
71
55
        return creator
72
56
 
73
57
    def check_shelve_rename(self, creator):
74
 
        work_trans_id = creator.work_transform.trans_id_file_id(b'foo-id')
 
58
        work_trans_id = creator.work_transform.trans_id_file_id('foo-id')
75
59
        self.assertEqual('foo', creator.work_transform.final_name(
76
60
                         work_trans_id))
77
 
        shelf_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
61
        shelf_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
78
62
        self.assertEqual('bar', creator.shelf_transform.final_name(
79
63
                         shelf_trans_id))
80
64
 
81
65
    def test_shelve_rename(self):
82
66
        creator = self.prepare_shelve_rename()
83
 
        creator.shelve_rename(b'foo-id')
 
67
        creator.shelve_rename('foo-id')
84
68
        self.check_shelve_rename(creator)
85
69
 
86
70
    def test_shelve_change_handles_rename(self):
87
71
        creator = self.prepare_shelve_rename()
88
 
        creator.shelve_change(('rename', b'foo-id', 'foo', 'bar'))
 
72
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
89
73
        self.check_shelve_rename(creator)
90
74
 
91
75
    def prepare_shelve_move(self):
92
76
        tree = self.make_branch_and_tree('.')
93
77
        self.build_tree(['foo/', 'bar/', 'foo/baz'])
94
 
        tree.add(['foo', 'bar', 'foo/baz'], [b'foo-id', b'bar-id', b'baz-id'])
 
78
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
95
79
        tree.commit('foo')
96
80
        tree.rename_one('foo/baz', 'bar/baz')
97
81
        tree.lock_tree_write()
98
82
        self.addCleanup(tree.unlock)
99
83
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
100
84
        self.addCleanup(creator.finalize)
101
 
        self.assertEqual([('rename', b'baz-id', 'foo/baz', 'bar/baz')],
 
85
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
102
86
                         list(creator.iter_shelvable()))
103
87
        return creator, tree
104
88
 
105
89
    def check_shelve_move(self, creator, tree):
106
 
        work_trans_id = creator.work_transform.trans_id_file_id(b'baz-id')
107
 
        work_foo = creator.work_transform.trans_id_file_id(b'foo-id')
 
90
        work_trans_id = creator.work_transform.trans_id_file_id('baz-id')
 
91
        work_foo = creator.work_transform.trans_id_file_id('foo-id')
108
92
        self.assertEqual(work_foo, creator.work_transform.final_parent(
109
93
                         work_trans_id))
110
 
        shelf_trans_id = creator.shelf_transform.trans_id_file_id(b'baz-id')
111
 
        shelf_bar = creator.shelf_transform.trans_id_file_id(b'bar-id')
 
94
        shelf_trans_id = creator.shelf_transform.trans_id_file_id('baz-id')
 
95
        shelf_bar = creator.shelf_transform.trans_id_file_id('bar-id')
112
96
        self.assertEqual(shelf_bar, creator.shelf_transform.final_parent(
113
97
                         shelf_trans_id))
114
98
        creator.transform()
115
 
        self.assertEqual('foo/baz', tree.id2path(b'baz-id'))
 
99
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
116
100
 
117
101
    def test_shelve_move(self):
118
102
        creator, tree = self.prepare_shelve_move()
119
 
        creator.shelve_rename(b'baz-id')
 
103
        creator.shelve_rename('baz-id')
120
104
        self.check_shelve_move(creator, tree)
121
105
 
122
106
    def test_shelve_change_handles_move(self):
123
107
        creator, tree = self.prepare_shelve_move()
124
 
        creator.shelve_change(('rename', b'baz-id', 'foo/baz', 'bar/baz'))
 
108
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
125
109
        self.check_shelve_move(creator, tree)
126
110
 
127
111
    def test_shelve_changed_root_id(self):
128
112
        tree = self.make_branch_and_tree('.')
129
113
        self.build_tree(['foo'])
130
 
        tree.set_root_id(b'first-root-id')
131
 
        tree.add(['foo'], [b'foo-id'])
 
114
        tree.set_root_id('first-root-id')
 
115
        tree.add(['foo'], ['foo-id'])
132
116
        tree.commit('foo')
133
 
        tree.set_root_id(b'second-root-id')
 
117
        tree.set_root_id('second-root-id')
134
118
        tree.lock_tree_write()
135
119
        self.addCleanup(tree.unlock)
136
120
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
137
121
        self.addCleanup(creator.finalize)
138
 
        self.expectFailure(
139
 
            'shelf doesn\'t support shelving root changes yet',
 
122
        self.expectFailure('shelf doesn\'t support shelving root changes yet',
140
123
            self.assertEqual, [
141
 
                ('delete file', b'first-root-id', 'directory', ''),
142
 
                ('add file', b'second-root-id', 'directory', ''),
143
 
                ('rename', b'foo-id', u'foo', u'foo'),
 
124
                ('delete file', 'first-root-id', 'directory', ''),
 
125
                ('add file', 'second-root-id', 'directory', ''),
 
126
                ('rename', 'foo-id', u'foo', u'foo'),
144
127
                ], list(creator.iter_shelvable()))
145
128
 
146
 
        self.assertEqual([('delete file', b'first-root-id', 'directory', ''),
147
 
                          ('add file', b'second-root-id', 'directory', ''),
148
 
                          ('rename', b'foo-id', u'foo', u'foo'),
149
 
                          ], list(creator.iter_shelvable()))
 
129
        self.assertEqual([('delete file', 'first-root-id', 'directory', ''),
 
130
                          ('add file', 'second-root-id', 'directory', ''),
 
131
                          ('rename', 'foo-id', u'foo', u'foo'),
 
132
                         ], list(creator.iter_shelvable()))
150
133
 
151
134
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
152
135
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
157
140
        tree = self.make_branch_and_tree('.')
158
141
        tree.lock_write()
159
142
        self.addCleanup(tree.unlock)
160
 
        self.build_tree_contents([('foo', b'a\n')])
161
 
        tree.add('foo', b'foo-id')
 
143
        self.build_tree_contents([('foo', 'a\n')])
 
144
        tree.add('foo', 'foo-id')
162
145
        tree.commit('Committed foo')
163
 
        self.build_tree_contents([('foo', b'b\na\nc\n')])
 
146
        self.build_tree_contents([('foo', 'b\na\nc\n')])
164
147
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
165
148
        self.addCleanup(creator.finalize)
166
149
        return creator
167
150
 
168
151
    def test_shelve_content_change(self):
169
152
        creator = self.prepare_content_change()
170
 
        self.assertEqual([('modify text', b'foo-id')],
 
153
        self.assertEqual([('modify text', 'foo-id')],
171
154
                         list(creator.iter_shelvable()))
172
 
        creator.shelve_lines(b'foo-id', [b'a\n', b'c\n'])
 
155
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
173
156
        creator.transform()
174
 
        self.assertFileEqual(b'a\nc\n', 'foo')
175
 
        self.assertShelvedFileEqual(b'b\na\n', creator, b'foo-id')
 
157
        self.assertFileEqual('a\nc\n', 'foo')
 
158
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
176
159
 
177
160
    def test_shelve_change_handles_modify_text(self):
178
161
        creator = self.prepare_content_change()
179
 
        creator.shelve_change(('modify text', b'foo-id'))
 
162
        creator.shelve_change(('modify text', 'foo-id'))
180
163
        creator.transform()
181
 
        self.assertFileEqual(b'a\n', 'foo')
182
 
        self.assertShelvedFileEqual(b'b\na\nc\n', creator, b'foo-id')
 
164
        self.assertFileEqual('a\n', 'foo')
 
165
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
183
166
 
184
167
    def test_shelve_all(self):
185
168
        creator = self.prepare_content_change()
186
169
        creator.shelve_all()
187
170
        creator.transform()
188
 
        self.assertFileEqual(b'a\n', 'foo')
189
 
        self.assertShelvedFileEqual(b'b\na\nc\n', creator, b'foo-id')
 
171
        self.assertFileEqual('a\n', 'foo')
 
172
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
190
173
 
191
174
    def prepare_shelve_creation(self):
192
175
        tree = self.make_branch_and_tree('.')
193
176
        tree.lock_write()
194
177
        self.addCleanup(tree.unlock)
195
178
        tree.commit('Empty tree')
196
 
        self.build_tree_contents([('foo', b'a\n'), ('bar/',)])
197
 
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
 
179
        self.build_tree_contents([('foo', 'a\n'), ('bar/',)])
 
180
        tree.add(['foo', 'bar'], ['foo-id', 'bar-id'])
198
181
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
199
182
        self.addCleanup(creator.finalize)
200
 
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
201
 
                          ('add file', b'foo-id', 'file', 'foo')],
202
 
                         sorted(list(creator.iter_shelvable())))
 
183
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
 
184
                          ('add file', 'foo-id', 'file', 'foo')],
 
185
                          sorted(list(creator.iter_shelvable())))
203
186
        return creator, tree
204
187
 
205
188
    def check_shelve_creation(self, creator, tree):
206
 
        self.assertRaises(
207
 
            StopIteration, next,
208
 
            tree.iter_entries_by_dir(specific_files=['foo']))
209
 
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
210
 
        self.assertEqual(b'foo-id',
 
189
        self.assertRaises(StopIteration,
 
190
                          tree.iter_entries_by_dir(['foo-id']).next)
 
191
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
192
        self.assertEqual('foo-id',
211
193
                         creator.shelf_transform.final_file_id(s_trans_id))
212
 
        self.assertPathDoesNotExist('foo')
213
 
        self.assertPathDoesNotExist('bar')
214
 
        self.assertShelvedFileEqual('a\n', creator, b'foo-id')
215
 
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id(b'bar-id')
 
194
        self.failIfExists('foo')
 
195
        self.failIfExists('bar')
 
196
        self.assertShelvedFileEqual('a\n', creator, 'foo-id')
 
197
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id('bar-id')
216
198
        self.assertEqual('directory',
217
 
                         creator.shelf_transform.final_kind(s_bar_trans_id))
 
199
            creator.shelf_transform.final_kind(s_bar_trans_id))
218
200
 
219
201
    def test_shelve_creation(self):
220
202
        creator, tree = self.prepare_shelve_creation()
221
 
        creator.shelve_creation(b'foo-id')
222
 
        creator.shelve_creation(b'bar-id')
 
203
        creator.shelve_creation('foo-id')
 
204
        creator.shelve_creation('bar-id')
223
205
        creator.transform()
224
206
        self.check_shelve_creation(creator, tree)
225
207
 
226
208
    def test_shelve_change_handles_creation(self):
227
209
        creator, tree = self.prepare_shelve_creation()
228
 
        creator.shelve_change(('add file', b'foo-id', 'file', 'foo'))
229
 
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
 
210
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
 
211
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
230
212
        creator.transform()
231
213
        self.check_shelve_creation(creator, tree)
232
214
 
233
 
    def test_shelve_directory_with_ignored(self):
234
 
        tree = self.make_branch_and_tree('.')
235
 
        tree.lock_write()
236
 
        self.addCleanup(tree.unlock)
237
 
        tree.commit('Empty tree')
238
 
        self.build_tree_contents(
239
 
            [('foo', b'a\n'), ('bar/',), ('bar/ignored', b'ign\n')])
240
 
        tree.add(['foo', 'bar'], [b'foo-id', b'bar-id'])
241
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
242
 
        self.addCleanup(creator.finalize)
243
 
        self.assertEqual([('add file', b'bar-id', 'directory', 'bar'),
244
 
                          ('add file', b'foo-id', 'file', 'foo')],
245
 
                         sorted(list(creator.iter_shelvable())))
246
 
        ignores._set_user_ignores([])
247
 
        in_patterns = ['ignored', ]
248
 
        ignores.add_unique_user_ignores(in_patterns)
249
 
 
250
 
        creator.shelve_change(('add file', b'bar-id', 'directory', 'bar'))
251
 
        try:
252
 
            creator.transform()
253
 
            self.check_shelve_creation(creator, tree)
254
 
        except transform.MalformedTransform:
255
 
            raise KnownFailure(
256
 
                'shelving directory with ignored file: see bug #611739')
257
 
 
258
215
    def _test_shelve_symlink_creation(self, link_name, link_target,
259
216
                                      shelve_change=False):
260
 
        self.requireFeature(features.SymlinkFeature)
 
217
        self.requireFeature(tests.SymlinkFeature)
261
218
        tree = self.make_branch_and_tree('.')
262
219
        tree.lock_write()
263
220
        self.addCleanup(tree.unlock)
264
221
        tree.commit('Empty tree')
265
222
        os.symlink(link_target, link_name)
266
 
        tree.add(link_name, b'foo-id')
 
223
        tree.add(link_name, 'foo-id')
267
224
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
268
225
        self.addCleanup(creator.finalize)
269
 
        self.assertEqual([('add file', b'foo-id', 'symlink', link_name)],
 
226
        self.assertEqual([('add file', 'foo-id', 'symlink', link_name)],
270
227
                         list(creator.iter_shelvable()))
271
228
        if shelve_change:
272
 
            creator.shelve_change(
273
 
                ('add file', b'foo-id', 'symlink', link_name))
 
229
            creator.shelve_change(('add file', 'foo-id', 'symlink', link_name))
274
230
        else:
275
 
            creator.shelve_creation(b'foo-id')
 
231
            creator.shelve_creation('foo-id')
276
232
        creator.transform()
277
 
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
278
 
        self.assertPathDoesNotExist(link_name)
 
233
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
234
        self.failIfExists(link_name)
279
235
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
280
236
        self.assertEqual(link_target, osutils.readlink(limbo_name))
281
237
        ptree = creator.shelf_transform.get_preview_tree()
282
 
        self.assertEqual(
283
 
            link_target,
284
 
            ptree.get_symlink_target(ptree.id2path(b'foo-id')))
 
238
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
285
239
 
286
240
    def test_shelve_symlink_creation(self):
287
241
        self._test_shelve_symlink_creation('foo', 'bar')
288
242
 
289
243
    def test_shelve_unicode_symlink_creation(self):
290
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
244
        self.requireFeature(tests.UnicodeFilenameFeature)
291
245
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
292
246
                                           u'b\N{Euro Sign}ar')
293
247
 
297
251
    def _test_shelve_symlink_target_change(self, link_name,
298
252
                                           old_target, new_target,
299
253
                                           shelve_change=False):
300
 
        self.requireFeature(features.SymlinkFeature)
 
254
        self.requireFeature(tests.SymlinkFeature)
301
255
        tree = self.make_branch_and_tree('.')
302
256
        tree.lock_write()
303
257
        self.addCleanup(tree.unlock)
304
258
        os.symlink(old_target, link_name)
305
 
        tree.add(link_name, b'foo-id')
 
259
        tree.add(link_name, 'foo-id')
306
260
        tree.commit("commit symlink")
307
261
        os.unlink(link_name)
308
262
        os.symlink(new_target, link_name)
309
263
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
310
264
        self.addCleanup(creator.finalize)
311
 
        self.assertEqual([('modify target', b'foo-id', link_name,
 
265
        self.assertEqual([('modify target', 'foo-id', link_name,
312
266
                           old_target, new_target)],
313
267
                         list(creator.iter_shelvable()))
314
268
        if shelve_change:
315
 
            creator.shelve_change(('modify target', b'foo-id', link_name,
 
269
            creator.shelve_change(('modify target', 'foo-id', link_name,
316
270
                                   old_target, new_target))
317
271
        else:
318
 
            creator.shelve_modify_target(b'foo-id')
 
272
            creator.shelve_modify_target('foo-id')
319
273
        creator.transform()
320
274
        self.assertEqual(old_target, osutils.readlink(link_name))
321
 
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
275
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
322
276
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
323
277
        self.assertEqual(new_target, osutils.readlink(limbo_name))
324
278
        ptree = creator.shelf_transform.get_preview_tree()
325
 
        self.assertEqual(new_target, ptree.get_symlink_target(
326
 
            ptree.id2path(b'foo-id')))
 
279
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
327
280
 
328
281
    def test_shelve_symlink_target_change(self):
329
282
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
330
283
 
331
284
    def test_shelve_unicode_symlink_target_change(self):
332
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
285
        self.requireFeature(tests.UnicodeFilenameFeature)
333
286
        self._test_shelve_symlink_target_change(
334
287
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
335
288
 
343
296
        self.addCleanup(tree.unlock)
344
297
        tree.commit('Empty tree')
345
298
        self.build_tree(['foo'])
346
 
        tree.add('foo', b'foo-id')
 
299
        tree.add('foo', 'foo-id')
347
300
        os.unlink('foo')
348
301
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
349
302
        self.addCleanup(creator.finalize)
350
 
        self.assertEqual([('add file', b'foo-id', None, 'foo')],
 
303
        self.assertEqual([('add file', 'foo-id', None, 'foo')],
351
304
                         sorted(list(creator.iter_shelvable())))
352
 
        creator.shelve_creation(b'foo-id')
 
305
        creator.shelve_creation('foo-id')
353
306
        creator.transform()
354
 
        self.assertRaises(
355
 
            StopIteration, next,
356
 
            tree.iter_entries_by_dir(specific_files=['foo']))
357
 
        self.assertShelvedFileEqual('', creator, b'foo-id')
358
 
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
359
 
        self.assertEqual(b'foo-id',
 
307
        self.assertRaises(StopIteration,
 
308
                          tree.iter_entries_by_dir(['foo-id']).next)
 
309
        self.assertShelvedFileEqual('', creator, 'foo-id')
 
310
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
311
        self.assertEqual('foo-id',
360
312
                         creator.shelf_transform.final_file_id(s_trans_id))
361
 
        self.assertPathDoesNotExist('foo')
 
313
        self.failIfExists('foo')
362
314
 
363
315
    def prepare_shelve_deletion(self):
364
316
        tree = self.make_branch_and_tree('tree')
365
317
        tree.lock_write()
366
318
        self.addCleanup(tree.unlock)
367
 
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
368
 
        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
 
319
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
 
320
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
369
321
        tree.commit('Added file and directory')
370
 
        tree.unversion(['foo', 'foo/bar'])
 
322
        tree.unversion(['foo-id', 'bar-id'])
371
323
        os.unlink('tree/foo/bar')
372
324
        os.rmdir('tree/foo')
373
325
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
374
326
        self.addCleanup(creator.finalize)
375
 
        self.assertEqual([('delete file', b'bar-id', 'file', 'foo/bar'),
376
 
                          ('delete file', b'foo-id', 'directory', 'foo')],
377
 
                         sorted(list(creator.iter_shelvable())))
 
327
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
 
328
                          ('delete file', 'foo-id', 'directory', 'foo')],
 
329
                          sorted(list(creator.iter_shelvable())))
378
330
        return creator, tree
379
331
 
380
332
    def check_shelve_deletion(self, tree):
381
 
        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
382
 
        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
383
 
        self.assertFileEqual(b'baz', 'tree/foo/bar')
 
333
        self.assertTrue('foo-id' in tree)
 
334
        self.assertTrue('bar-id' in tree)
 
335
        self.assertFileEqual('baz', 'tree/foo/bar')
384
336
 
385
337
    def test_shelve_deletion(self):
386
338
        creator, tree = self.prepare_shelve_deletion()
387
 
        creator.shelve_deletion(b'foo-id')
388
 
        creator.shelve_deletion(b'bar-id')
 
339
        creator.shelve_deletion('foo-id')
 
340
        creator.shelve_deletion('bar-id')
389
341
        creator.transform()
390
342
        self.check_shelve_deletion(tree)
391
343
 
392
344
    def test_shelve_change_handles_deletion(self):
393
345
        creator, tree = self.prepare_shelve_deletion()
394
 
        creator.shelve_change(('delete file', b'foo-id', 'directory', 'foo'))
395
 
        creator.shelve_change(('delete file', b'bar-id', 'file', 'foo/bar'))
 
346
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
 
347
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
396
348
        creator.transform()
397
349
        self.check_shelve_deletion(tree)
398
350
 
399
351
    def test_shelve_delete_contents(self):
400
352
        tree = self.make_branch_and_tree('tree')
401
 
        self.build_tree(['tree/foo', ])
402
 
        tree.add('foo', b'foo-id')
 
353
        self.build_tree(['tree/foo',])
 
354
        tree.add('foo', 'foo-id')
403
355
        tree.commit('Added file and directory')
404
356
        os.unlink('tree/foo')
405
357
        tree.lock_tree_write()
406
358
        self.addCleanup(tree.unlock)
407
359
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
408
360
        self.addCleanup(creator.finalize)
409
 
        self.assertEqual([('delete file', b'foo-id', 'file', 'foo')],
 
361
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
410
362
                         sorted(list(creator.iter_shelvable())))
411
 
        creator.shelve_deletion(b'foo-id')
 
363
        creator.shelve_deletion('foo-id')
412
364
        creator.transform()
413
 
        self.assertPathExists('tree/foo')
 
365
        self.failUnlessExists('tree/foo')
414
366
 
415
367
    def prepare_shelve_change_kind(self):
416
368
        tree = self.make_branch_and_tree('tree')
417
 
        self.build_tree_contents([('tree/foo', b'bar')])
418
 
        tree.add('foo', b'foo-id')
 
369
        self.build_tree_contents([('tree/foo', 'bar')])
 
370
        tree.add('foo', 'foo-id')
419
371
        tree.commit('Added file and directory')
420
372
        os.unlink('tree/foo')
421
373
        os.mkdir('tree/foo')
423
375
        self.addCleanup(tree.unlock)
424
376
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
425
377
        self.addCleanup(creator.finalize)
426
 
        self.assertEqual([('change kind', b'foo-id', 'file', 'directory',
 
378
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
427
379
                           'foo')], sorted(list(creator.iter_shelvable())))
428
380
        return creator
429
381
 
430
382
    def check_shelve_change_kind(self, creator):
431
 
        self.assertFileEqual(b'bar', 'tree/foo')
432
 
        s_trans_id = creator.shelf_transform.trans_id_file_id(b'foo-id')
 
383
        self.assertFileEqual('bar', 'tree/foo')
 
384
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
433
385
        self.assertEqual('directory',
434
386
                         creator.shelf_transform._new_contents[s_trans_id])
435
387
 
436
388
    def test_shelve_change_kind(self):
437
389
        creator = self.prepare_shelve_change_kind()
438
 
        creator.shelve_content_change(b'foo-id')
 
390
        creator.shelve_content_change('foo-id')
439
391
        creator.transform()
440
392
        self.check_shelve_change_kind(creator)
441
393
 
442
394
    def test_shelve_change_handles_change_kind(self):
443
395
        creator = self.prepare_shelve_change_kind()
444
 
        creator.shelve_change(('change kind', b'foo-id', 'file', 'directory',
 
396
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
445
397
                               'foo'))
446
398
        creator.transform()
447
399
        self.check_shelve_change_kind(creator)
457
409
 
458
410
    def test_shelve_unversion(self):
459
411
        tree = self.make_branch_and_tree('tree')
460
 
        self.build_tree(['tree/foo', ])
461
 
        tree.add('foo', b'foo-id')
 
412
        self.build_tree(['tree/foo',])
 
413
        tree.add('foo', 'foo-id')
462
414
        tree.commit('Added file and directory')
463
 
        tree.unversion(['foo'])
 
415
        tree.unversion(['foo-id'])
464
416
        tree.lock_tree_write()
465
417
        self.addCleanup(tree.unlock)
466
418
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
467
419
        self.addCleanup(creator.finalize)
468
 
        self.assertEqual([('delete file', b'foo-id', 'file', 'foo')],
 
420
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
469
421
                         sorted(list(creator.iter_shelvable())))
470
 
        creator.shelve_deletion(b'foo-id')
 
422
        creator.shelve_deletion('foo-id')
471
423
        creator.transform()
472
 
        self.assertPathExists('tree/foo')
 
424
        self.failUnlessExists('tree/foo')
473
425
 
474
426
    def test_shelve_serialization(self):
475
427
        tree = self.make_branch_and_tree('.')
488
440
    def test_write_shelf(self):
489
441
        tree = self.make_branch_and_tree('tree')
490
442
        self.build_tree(['tree/foo'])
491
 
        tree.add('foo', b'foo-id')
 
443
        tree.add('foo', 'foo-id')
492
444
        tree.lock_tree_write()
493
445
        self.addCleanup(tree.unlock)
494
446
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
495
447
        self.addCleanup(creator.finalize)
496
448
        list(creator.iter_shelvable())
497
 
        creator.shelve_creation(b'foo-id')
498
 
        with open('shelf', 'wb') as shelf_file:
 
449
        creator.shelve_creation('foo-id')
 
450
        shelf_file = open('shelf', 'wb')
 
451
        try:
499
452
            creator.write_shelf(shelf_file)
 
453
        finally:
 
454
            shelf_file.close()
500
455
        parser = pack.ContainerPushParser()
501
 
        with open('shelf', 'rb') as shelf_file:
 
456
        shelf_file = open('shelf', 'rb')
 
457
        try:
502
458
            parser.accept_bytes(shelf_file.read())
503
 
        tt = tree.preview_transform()
 
459
        finally:
 
460
            shelf_file.close()
 
461
        tt = transform.TransformPreview(tree)
504
462
        self.addCleanup(tt.finalize)
505
463
        records = iter(parser.read_pending_records())
506
 
        # skip revision-id
507
 
        next(records)
 
464
        #skip revision-id
 
465
        records.next()
508
466
        tt.deserialize(records)
509
467
 
510
468
    def test_shelve_unversioned(self):
511
469
        tree = self.make_branch_and_tree('tree')
512
 
        with tree.lock_tree_write():
 
470
        tree.lock_tree_write()
 
471
        try:
513
472
            self.assertRaises(errors.PathsNotVersionedError,
514
 
                              shelf.ShelfCreator, tree, tree.basis_tree(),
515
 
                              ['foo'])
 
473
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
 
474
        finally:
 
475
            tree.unlock()
516
476
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
517
477
        # after itself.
518
478
        wt = workingtree.WorkingTree.open('tree')
520
480
        wt.unlock()
521
481
        # And a second tentative should raise the same error (no
522
482
        # limbo/pending_deletion leftovers).
523
 
        with tree.lock_tree_write():
 
483
        tree.lock_tree_write()
 
484
        try:
524
485
            self.assertRaises(errors.PathsNotVersionedError,
525
 
                              shelf.ShelfCreator, tree, tree.basis_tree(),
526
 
                              ['foo'])
 
486
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
 
487
        finally:
 
488
            tree.unlock()
527
489
 
528
490
    def test_shelve_skips_added_root(self):
529
491
        """Skip adds of the root when iterating through shelvable changes."""
549
511
    def test_make_merger(self):
550
512
        tree = self.make_branch_and_tree('tree')
551
513
        tree.commit('first commit')
552
 
        self.build_tree_contents([('tree/foo', b'bar')])
 
514
        self.build_tree_contents([('tree/foo', 'bar')])
553
515
        tree.lock_write()
554
516
        self.addCleanup(tree.unlock)
555
 
        tree.add('foo', b'foo-id')
 
517
        tree.add('foo', 'foo-id')
556
518
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
557
519
        self.addCleanup(creator.finalize)
558
520
        list(creator.iter_shelvable())
559
 
        creator.shelve_creation(b'foo-id')
560
 
        with open('shelf-file', 'w+b') as shelf_file:
 
521
        creator.shelve_creation('foo-id')
 
522
        shelf_file = open('shelf-file', 'w+b')
 
523
        try:
561
524
            creator.write_shelf(shelf_file)
562
525
            creator.transform()
563
526
            shelf_file.seek(0)
564
527
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
565
528
            unshelver.make_merger().do_merge()
566
529
            self.addCleanup(unshelver.finalize)
567
 
            self.assertFileEqual(b'bar', 'tree/foo')
 
530
            self.assertFileEqual('bar', 'tree/foo')
 
531
        finally:
 
532
            shelf_file.close()
568
533
 
569
534
    def test_unshelve_changed(self):
570
535
        tree = self.make_branch_and_tree('tree')
571
536
        tree.lock_write()
572
537
        self.addCleanup(tree.unlock)
573
 
        self.build_tree_contents([('tree/foo', b'a\nb\nc\n')])
574
 
        tree.add('foo', b'foo-id')
 
538
        self.build_tree_contents([('tree/foo', 'a\nb\nc\n')])
 
539
        tree.add('foo', 'foo-id')
575
540
        tree.commit('first commit')
576
 
        self.build_tree_contents([('tree/foo', b'a\nb\nd\n')])
 
541
        self.build_tree_contents([('tree/foo', 'a\nb\nd\n')])
577
542
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
578
543
        self.addCleanup(creator.finalize)
579
544
        list(creator.iter_shelvable())
580
 
        creator.shelve_lines(b'foo-id', [b'a\n', b'b\n', b'c\n'])
 
545
        creator.shelve_lines('foo-id', ['a\n', 'b\n', 'c\n'])
581
546
        shelf_file = open('shelf', 'w+b')
582
547
        self.addCleanup(shelf_file.close)
583
548
        creator.write_shelf(shelf_file)
584
549
        creator.transform()
585
 
        self.build_tree_contents([('tree/foo', b'z\na\nb\nc\n')])
 
550
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
586
551
        shelf_file.seek(0)
587
552
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
588
553
        self.addCleanup(unshelver.finalize)
589
554
        unshelver.make_merger().do_merge()
590
 
        self.assertFileEqual(b'z\na\nb\nd\n', 'tree/foo')
 
555
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
591
556
 
592
557
    def test_unshelve_deleted(self):
593
558
        tree = self.make_branch_and_tree('tree')
594
559
        tree.lock_write()
595
560
        self.addCleanup(tree.unlock)
596
 
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', b'baz')])
597
 
        tree.add(['foo', 'foo/bar'], [b'foo-id', b'bar-id'])
 
561
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
 
562
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
598
563
        tree.commit('Added file and directory')
599
 
        tree.unversion(['foo', 'foo/bar'])
 
564
        tree.unversion(['foo-id', 'bar-id'])
600
565
        os.unlink('tree/foo/bar')
601
566
        os.rmdir('tree/foo')
602
567
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
603
568
        list(creator.iter_shelvable())
604
 
        creator.shelve_deletion(b'foo-id')
605
 
        creator.shelve_deletion(b'bar-id')
606
 
        with open('shelf', 'w+b') as shelf_file:
607
 
            creator.write_shelf(shelf_file)
608
 
            creator.transform()
609
 
            creator.finalize()
 
569
        creator.shelve_deletion('foo-id')
 
570
        creator.shelve_deletion('bar-id')
 
571
        shelf_file = open('shelf', 'w+b')
 
572
        self.addCleanup(shelf_file.close)
 
573
        creator.write_shelf(shelf_file)
 
574
        creator.transform()
 
575
        creator.finalize()
610
576
        # validate the test setup
611
 
        self.assertEqual(tree.id2path(b'foo-id'), 'foo')
612
 
        self.assertEqual(tree.id2path(b'bar-id'), 'foo/bar')
613
 
        self.assertFileEqual(b'baz', 'tree/foo/bar')
614
 
        with open('shelf', 'r+b') as shelf_file:
615
 
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
616
 
            self.addCleanup(unshelver.finalize)
617
 
            unshelver.make_merger().do_merge()
618
 
        self.assertRaises(errors.NoSuchId, tree.id2path, b'foo-id')
619
 
        self.assertRaises(errors.NoSuchId, tree.id2path, b'bar-id')
 
577
        self.assertTrue('foo-id' in tree)
 
578
        self.assertTrue('bar-id' in tree)
 
579
        self.assertFileEqual('baz', 'tree/foo/bar')
 
580
        shelf_file.seek(0)
 
581
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
582
        self.addCleanup(unshelver.finalize)
 
583
        unshelver.make_merger().do_merge()
 
584
        self.assertFalse('foo-id' in tree)
 
585
        self.assertFalse('bar-id' in tree)
620
586
 
621
587
    def test_unshelve_base(self):
622
588
        tree = self.make_branch_and_tree('tree')
623
589
        tree.lock_write()
624
590
        self.addCleanup(tree.unlock)
625
 
        tree.commit('rev1', rev_id=b'rev1')
 
591
        tree.commit('rev1', rev_id='rev1')
626
592
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
627
593
        self.addCleanup(creator.finalize)
628
594
        manager = tree.get_shelf_manager()
631
597
            creator.write_shelf(shelf_file)
632
598
        finally:
633
599
            shelf_file.close()
634
 
        tree.commit('rev2', rev_id=b'rev2')
 
600
        tree.commit('rev2', rev_id='rev2')
635
601
        shelf_file = manager.read_shelf(1)
636
602
        self.addCleanup(shelf_file.close)
637
603
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
638
604
        self.addCleanup(unshelver.finalize)
639
 
        self.assertEqual(b'rev1', unshelver.base_tree.get_revision_id())
 
605
        self.assertEqual('rev1', unshelver.base_tree.get_revision_id())
640
606
 
641
607
    def test_unshelve_serialization(self):
642
608
        tree = self.make_branch_and_tree('.')
648
614
 
649
615
    def test_corrupt_shelf(self):
650
616
        tree = self.make_branch_and_tree('.')
651
 
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace(b'metadata',
652
 
                                                                b'foo'))])
 
617
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace('metadata',
 
618
                                                                'foo'))])
653
619
        shelf_file = open('shelf', 'rb')
654
620
        self.addCleanup(shelf_file.close)
655
 
        e = self.assertRaises(shelf.ShelfCorrupt,
 
621
        e = self.assertRaises(errors.ShelfCorrupt,
656
622
                              shelf.Unshelver.from_tree_and_shelf, tree,
657
623
                              shelf_file)
658
624
        self.assertEqual('Shelf corrupt.', str(e))
659
625
 
660
 
    def test_unshelve_subdir_in_now_removed_dir(self):
661
 
        tree = self.make_branch_and_tree('.')
662
 
        self.addCleanup(tree.lock_write().unlock)
663
 
        self.build_tree(['dir/', 'dir/subdir/', 'dir/subdir/foo'])
664
 
        tree.add(['dir'], [b'dir-id'])
665
 
        tree.commit('versioned dir')
666
 
        tree.add(['dir/subdir', 'dir/subdir/foo'], [b'subdir-id', b'foo-id'])
667
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
668
 
        self.addCleanup(creator.finalize)
669
 
        for change in creator.iter_shelvable():
670
 
            creator.shelve_change(change)
671
 
        shelf_manager = tree.get_shelf_manager()
672
 
        shelf_id = shelf_manager.shelve_changes(creator)
673
 
        self.assertPathDoesNotExist('dir/subdir')
674
 
        tree.remove(['dir'])
675
 
        unshelver = shelf_manager.get_unshelver(shelf_id)
676
 
        self.addCleanup(unshelver.finalize)
677
 
        unshelver.make_merger().do_merge()
678
 
        self.assertPathExists('dir/subdir/foo')
679
 
        self.assertEqual(b'dir-id', tree.path2id('dir'))
680
 
        self.assertEqual(b'subdir-id', tree.path2id('dir/subdir'))
681
 
        self.assertEqual(b'foo-id', tree.path2id('dir/subdir/foo'))
682
 
 
683
626
 
684
627
class TestShelfManager(tests.TestCaseWithTransport):
685
628
 
742
685
        manager = self.get_manager()
743
686
        shelf_id, shelf_file = manager.new_shelf()
744
687
        try:
745
 
            shelf_file.write(b'foo')
 
688
            shelf_file.write('foo')
746
689
        finally:
747
690
            shelf_file.close()
748
691
        shelf_id, shelf_file = manager.new_shelf()
749
692
        try:
750
 
            shelf_file.write(b'bar')
 
693
            shelf_file.write('bar')
751
694
        finally:
752
695
            shelf_file.close()
753
696
        shelf_file = manager.read_shelf(1)
754
697
        try:
755
 
            self.assertEqual(b'foo', shelf_file.read())
 
698
            self.assertEqual('foo', shelf_file.read())
756
699
        finally:
757
700
            shelf_file.close()
758
701
        shelf_file = manager.read_shelf(2)
759
702
        try:
760
 
            self.assertEqual(b'bar', shelf_file.read())
 
703
            self.assertEqual('bar', shelf_file.read())
761
704
        finally:
762
705
            shelf_file.close()
763
706
 
764
707
    def test_read_non_existant(self):
765
708
        manager = self.get_manager()
766
 
        e = self.assertRaises(shelf.NoSuchShelfId, manager.read_shelf, 1)
 
709
        e = self.assertRaises(errors.NoSuchShelfId, manager.read_shelf, 1)
767
710
        self.assertEqual('No changes are shelved with id "1".', str(e))
768
711
 
769
712
    def test_shelve_changes(self):
771
714
        tree.commit('no-change commit')
772
715
        tree.lock_write()
773
716
        self.addCleanup(tree.unlock)
774
 
        self.build_tree_contents([('tree/foo', b'bar')])
775
 
        self.assertFileEqual(b'bar', 'tree/foo')
776
 
        tree.add('foo', b'foo-id')
 
717
        self.build_tree_contents([('tree/foo', 'bar')])
 
718
        self.assertFileEqual('bar', 'tree/foo')
 
719
        tree.add('foo', 'foo-id')
777
720
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
778
721
        self.addCleanup(creator.finalize)
779
722
        list(creator.iter_shelvable())
780
 
        creator.shelve_creation(b'foo-id')
 
723
        creator.shelve_creation('foo-id')
781
724
        shelf_manager = tree.get_shelf_manager()
782
725
        shelf_id = shelf_manager.shelve_changes(creator)
783
 
        self.assertPathDoesNotExist('tree/foo')
 
726
        self.failIfExists('tree/foo')
784
727
        unshelver = shelf_manager.get_unshelver(shelf_id)
785
728
        self.addCleanup(unshelver.finalize)
786
729
        unshelver.make_merger().do_merge()
787
 
        self.assertFileEqual(b'bar', 'tree/foo')
 
730
        self.assertFileEqual('bar', 'tree/foo')
788
731
 
789
732
    def test_get_metadata(self):
790
733
        tree = self.make_branch_and_tree('.')
795
738
        shelf_manager = tree.get_shelf_manager()
796
739
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
797
740
        metadata = shelf_manager.get_metadata(shelf_id)
798
 
        self.assertEqual('foo', metadata[b'message'])
799
 
        self.assertEqual(b'null:', metadata[b'revision_id'])
 
741
        self.assertEqual('foo', metadata['message'])
 
742
        self.assertEqual('null:', metadata['revision_id'])